From voroskoi at frugalware.org Wed Oct 1 00:46:49 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Oct 1 00:46:50 2008 Subject: [Frugalware-git] frugalware-current: ghostscript-8.63-1-x86_64 Message-ID: <20080930224649.77B401190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1110fd5976f6460df99e6fb176f613f531eb2205 commit 1110fd5976f6460df99e6fb176f613f531eb2205 Author: voroskoi Date: Wed Oct 1 00:46:29 2008 +0200 ghostscript-8.63-1-x86_64 version bump diff --git a/source/apps/ghostscript/FrugalBuild b/source/apps/ghostscript/FrugalBuild index 956c270..e847d22 100644 --- a/source/apps/ghostscript/FrugalBuild +++ b/source/apps/ghostscript/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=ghostscript -pkgver=8.62 +pkgver=8.63 pkgrel=1 pkgdesc="An interpreter for the PostScript language." depends=('cups') @@ -14,7 +14,7 @@ license="GPLv2" Finclude sourceforge url="http://www.ghostscript.com/awki" up2date="lynx -dump http://www.ghostscript.com/awki/Releases |grep latest |sed -ne 's/.*pt \(.*\) (.*/\1/;1p'" -sha1sums=('93633326e08e8e02a279ea87ead91b10b2c430f3') +sha1sums=('58b648e0383d6167e5ea93b2dde033eceb366491') subpkgs=('xghostscript') subdescs=('A graphical interpreter for the PostScript language.') From voroskoi at frugalware.org Wed Oct 1 00:51:08 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Oct 1 00:51:09 2008 Subject: [Frugalware-git] frugalware-current: terminus-font-4.28-1-i686 Message-ID: <20080930225108.8841E1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a3579215233079291c35146daaddcbb98d010bd4 commit a3579215233079291c35146daaddcbb98d010bd4 Author: voroskoi Date: Wed Oct 1 00:50:45 2008 +0200 terminus-font-4.28-1-i686 version bump diff --git a/source/xlib-extra/terminus-font/FrugalBuild b/source/xlib-extra/terminus-font/FrugalBuild index 98e4e2b..55d43a0 100644 --- a/source/xlib-extra/terminus-font/FrugalBuild +++ b/source/xlib-extra/terminus-font/FrugalBuild @@ -2,25 +2,27 @@ # Maintainer: voroskoi pkgname=terminus-font -pkgver=4.26 +pkgver=4.28 pkgrel=1 -pkgdesc="Terminus is a clean fixed width font for long (8 and more hours per day) work" -url="http://www.is-vn.bg/hamster/jimmy-en.html" +pkgdesc="Terminus is a clean fixed width font for long (8 and more hours per day) work." +url="http://www.is-vn.bg/hamster" depends=() -makedepends=('bdftopcf') +makedepends=('bdftopcf' 'perl' 'gawk') groups=('xlib-extra') archs=('i686' 'x86_64') -up2date="lynx -dump $url |grep terminus |sed -ne 's/.*t-\(.*\).t.*/\1/;1 p'" +up2date="lynx -dump $url |Flasttar" source=(http://www.is-vn.bg/hamster/$pkgname-$pkgver.tar.gz \ http://www.is-vn.bg/hamster/$pkgname-$pkgver-dv1.diff.gz \ http://www.is-vn.bg/hamster/$pkgname-$pkgver-ge1.diff.gz) -sha1sums=('19ab13e1f2b4b6d284c2d4a0e1982df2a79f4a06' \ - 'ab8c32090996eeb48b349fde544aeeb744242034' \ - 'c69df1c565a1d1a0ba78e403d46685d0664bb739') +sha1sums=('5134a39dd6f50f07e77d20e0718fe8cd00cc16b4' \ + 'a53b91226ddba21abeefd756b698ac363c43e27d' \ + 'a9f9e9cd5c4d5ef0eebbe73302d6e1a3f127e2b7') build() { - Fbuild --psfdir=/usr/share/kbd/consolefonts --x11dir=/usr/lib/X11/fonts/local - make DESTDIR=$Fdestdir install-uni install-ref || Fdie + Fbuild --psfdir=$Fprefix/share/kbd/consolefonts \ + --unidir=$Fprefix/share/kbd/consoletrans \ + --x11dir=$Fprefix/lib/X11/fonts/local + make DESTDIR=$Fdestdir install-uni install-ref install-pcf || Fdie # these are in kbd package Frm /usr/share/kbd/consoletrans/cp1250_to_uni.trans Frm /usr/share/kbd/consoletrans/cp1251_to_uni.trans From voroskoi at frugalware.org Wed Oct 1 01:02:49 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Oct 1 01:02:51 2008 Subject: [Frugalware-git] frugalware-current: libevent-1.4.8-1-x86_64 Message-ID: <20080930230249.5679C1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8ac44b2041fab54794a014aa115ffc3cfc96cfa6 commit 8ac44b2041fab54794a014aa115ffc3cfc96cfa6 Author: voroskoi Date: Wed Oct 1 01:02:32 2008 +0200 libevent-1.4.8-1-x86_64 version bump diff --git a/source/lib/libevent/FrugalBuild b/source/lib/libevent/FrugalBuild index 4228bda..b976842 100644 --- a/source/lib/libevent/FrugalBuild +++ b/source/lib/libevent/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=libevent -pkgver=1.4.6 +pkgver=1.4.8 pkgrel=1 pkgextraver=-stable pkgdesc="Provides a mechanism to execute a callback function when a specific event occurs on a file descriptor or after a timeout has been reached" From voroskoi at frugalware.org Wed Oct 1 01:07:47 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Oct 1 01:07:48 2008 Subject: [Frugalware-git] frugalware-current: sqlite3-3.6.3-1-x86_64 Message-ID: <20080930230747.44E771190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4a5edd30ddc8b2bcb422eda9e11ba8a6ee6615fe commit 4a5edd30ddc8b2bcb422eda9e11ba8a6ee6615fe Author: voroskoi Date: Wed Oct 1 01:07:35 2008 +0200 sqlite3-3.6.3-1-x86_64 version bump diff --git a/source/lib/sqlite3/FrugalBuild b/source/lib/sqlite3/FrugalBuild index 59efb37..4eef8d4 100644 --- a/source/lib/sqlite3/FrugalBuild +++ b/source/lib/sqlite3/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=sqlite3 -pkgver=3.5.9 +pkgver=3.6.3 pkgrel=1 pkgdesc="A C library that implements an SQL database engine" url="http://www.sqlite.org/" @@ -14,7 +14,7 @@ archs=('i686' 'x86_64' 'ppc') _F_cd_path="sqlite-$pkgver" up2date="lynx -dump http://www.sqlite.org/ |grep Version |sed 's/.*n \(.*\) of.*/\1/'" source=(http://www.sqlite.org/sqlite-$pkgver.tar.gz) -sha1sums=('8d81fb4ff606095734e721e3cf00bc9d3859a055') +sha1sums=('f1f697777f1d2ca2fbc5dbb7d115ad2da26944c5') subpkgs=('lemon') subdescs=('The Lemon program is an LALR(1) parser generator.') From vmiklos at frugalware.org Wed Oct 1 01:08:00 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Oct 1 01:08:02 2008 Subject: [Frugalware-git] frugalware: service: workaround for upstream chkconfig misbehaviour Message-ID: <20080930230800.F03F71190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware.git;a=commitdiff;h=a646d917b736986ce2756dc7616c209b0028e0e4 commit a646d917b736986ce2756dc7616c209b0028e0e4 Author: Miklos Vajna Date: Wed Oct 1 01:07:34 2008 +0200 service: workaround for upstream chkconfig misbehaviour closes #3373 diff --git a/var/service b/var/service index c15a213..1072b04 100644 --- a/var/service +++ b/var/service @@ -81,9 +81,8 @@ else ## exists and is added list it chkconfig --list $service else - ## error , files exists but isn't added - echo $"Use $0 $1 add first." - exit 1 + # we mimic the wished output of chkconfig + echo -e $service'\t\t0:off\t1:off\t2:off\t3:off\t4:off\t5:off\t6:off' fi else $name $2 From voroskoi at frugalware.org Wed Oct 1 01:11:18 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Oct 1 01:11:20 2008 Subject: [Frugalware-git] frugalware-current: slang-2.1.4-1-x86_64 Message-ID: <20080930231118.DB2BD1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ad437861617648cbfc631ddb7934a88e803cbbcc commit ad437861617648cbfc631ddb7934a88e803cbbcc Author: voroskoi Date: Wed Oct 1 01:11:03 2008 +0200 slang-2.1.4-1-x86_64 fixed up2date and url diff --git a/source/lib/slang/FrugalBuild b/source/lib/slang/FrugalBuild index b624d33..250797a 100644 --- a/source/lib/slang/FrugalBuild +++ b/source/lib/slang/FrugalBuild @@ -6,11 +6,11 @@ pkgname=slang pkgver=2.1.4 pkgrel=1 pkgdesc="S-Lang is a powerful interpreted language" -url="http://www.jedsoft.org/slang/" +url="http://www.s-lang.org/" groups=('lib') archs=('i686' 'x86_64' 'ppc') depends=('pcre') -up2date="lynx -dump http://www.jedsoft.org/slang/ |grep Version |sed 's/.*ion \(.*\)/\1/'" +up2date="lynx -dump $url |grep Version |sed 's/.*ion \(.*\)/\1/'" source=(ftp://space.mit.edu/pub/davis/slang/v${pkgver%.?}/$pkgname-$pkgver.tar.gz) signatures=($source.asc) From vmiklos at frugalware.org Wed Oct 1 02:38:43 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Oct 1 02:38:46 2008 Subject: [Frugalware-git] setup: port the usb_img target to ppc Message-ID: <20081001003843.EE5951190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup.git;a=commitdiff;h=923498f5b233b804b43c75fabff5002fde23ff41 commit 923498f5b233b804b43c75fabff5002fde23ff41 Author: Miklos Vajna Date: Wed Oct 1 02:25:43 2008 +0200 port the usb_img target to ppc diff --git a/Makefile b/Makefile index 7e3981a..89ef4e4 100644 --- a/Makefile +++ b/Makefile @@ -203,6 +203,7 @@ initrd_gz: clean config.mak devices initrd gzip -9 -c initrd-$(CARCH).img > initrd-$(CARCH).img.gz usb_img: check_root +ifneq ($(CARCH),ppc) dd if=/dev/zero of=frugalware-$(FWVER)-$(CARCH)-usb.img bs=516096c count=$(CYL_COUNT) echo -e 'n\np\n1\n\n\nw'|/sbin/fdisk -u -C$(CYL_COUNT) -S63 -H16 frugalware-$(FWVER)-$(CARCH)-usb.img || true losetup -o32256 /dev/loop0 frugalware-$(FWVER)-$(CARCH)-usb.img @@ -230,6 +231,33 @@ usb_img: check_root root (hd0,0) \n\ setup (hd0) \n\ quit" | grub --batch --device-map=/dev/null +else + dd if=/dev/zero of=frugalware-$(FWVER)-$(CARCH)-usb.img bs=516096c count=$(CYL_COUNT) + hformat frugalware-$(FWVER)-$(CARCH)-usb.img + hmount frugalware-$(FWVER)-$(CARCH)-usb.img + hcopy -r /usr/lib/yaboot/yaboot : + hattrib -c UNIX -t tbxi :yaboot + hattrib -b : + humount + mkdir i + mount -o loop frugalware-$(FWVER)-$(CARCH)-usb.img i + cp $(VMLINUZ)-$(KERNELV)-fw$(KERNELREL)-$(CARCH) i/$(VMLINUZ)-$(KERNELV)-fw$(KERNELREL) + cp initrd-$(CARCH).img.gz i/ + echo -e "default=install\n\ + root=/dev/ram\n\ + message=/boot.msg\n\ + image=/$(VMLINUZ)-$(KERNELV)-fw$(KERNELREL)\n\ + label=install\n\ + initrd=/initrd-$(CARCH).img.gz\n\ + initrd-size=$(RAMDISK_SIZE)\n\ + read-write" > i/yaboot.conf + echo -e "$(RELEASE) - $(KERNELV)-fw$(KERNELREL) \n\n\ + To boot the kernel, just hit enter, or use 'install'.\n\n\ + If the system fails to boot at all (the typical symptom is a white screen which\n\ + doesn't go away), use 'install video=ofonly'." > i/boot.msg + umount i + rmdir i +endif tftp_img: check_root dd if=/dev/zero of=frugalware-$(FWVER)-$(CARCH)-tftp.img bs=1k count=1440 From vmiklos at frugalware.org Wed Oct 1 02:41:13 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Oct 1 02:41:15 2008 Subject: [Frugalware-git] frugalware-current: docs/install: add ppc usb part Message-ID: <20081001004113.EBA931190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=de2dd69be318a3a7e867553addd877f4dd1dd328 commit de2dd69be318a3a7e867553addd877f4dd1dd328 Author: Miklos Vajna Date: Wed Oct 1 02:40:20 2008 +0200 docs/install: add ppc usb part diff --git a/docs/install.txt b/docs/install.txt index b53ed9e..d3d6e64 100644 --- a/docs/install.txt +++ b/docs/install.txt @@ -60,6 +60,35 @@ dd if=frugalware---usb.img of=\\?\Device\Harddisk1\Partition0 \ bs=1M --size --progress ---- +On PPC, create a partition of type "Apple_Bootstrap" on your USB stick using +`mac-fdisk` and extract the image there. For example: + +---- +# dd if=/dev/zero of=/dev/sda bs=1M count=1 +# mac-fdisk /dev/sda +/dev/sda +Command (? for help): i +size of 'device' is 1014784 blocks: +new size of 'device' is 1014784 blocks +Command (? for help): p +/dev/sda + # type name length base ( size ) system +/dev/sda1 Apple_partition_map Apple 63 @ 1 ( 31.5k) Partition map +/dev/sda2 Apple_Free Extra 1014720 @ 64 (495.5M) Free space + +Block size=512, Number of Blocks=1014784 +DeviceType=0x0, DeviceId=0x0 + +Command (? for help): C +First block: 64 +Length (in blocks, kB (k), MB (M) or GB (G)): 1014720 +Name of partition: boot +Type of partition: Apple_Bootstrap +Command (? for help): w +Command (? for help): q +# cat frugalware-0.9-ppc-usb.img > /dev/sda2 +---- + Pros: No need to burn any CD. Cons: You have to be able to boot from USB. From bouleetbil at frogdev.info Wed Oct 1 08:30:50 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Oct 1 08:30:51 2008 Subject: [Frugalware-git] bouleetbilgnome224: gedit-2.24.0-1-i686 Message-ID: <20081001063050.358B51190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=3cdeeaceda345d8da2bd97545b7c4aae53c2cc64 commit 3cdeeaceda345d8da2bd97545b7c4aae53c2cc64 Author: bouleetbil Date: Wed Oct 1 08:27:21 2008 +0200 gedit-2.24.0-1-i686 *version bump diff --git a/source/gnome/gedit/FrugalBuild b/source/gnome/gedit/FrugalBuild index a9095b2..6e717d6 100644 --- a/source/gnome/gedit/FrugalBuild +++ b/source/gnome/gedit/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Christian Hamar alias krix pkgname=gedit -pkgver=2.22.3 +pkgver=2.24.0 pkgrel=1 pkgdesc="A text editor for GNOME" url="http://www.gnome.org/" depends=('rarian' 'desktop-file-utils' 'python>=2.5' 'gtksourceview>=2.2.1' 'dbus-glib>=0.74' 'enchant' 'iso-codes' 'libgnomeui') -makedepends=('intltool' 'gnome-doc-utils>=0.8.0' 'gnome-python-desktop-gtksourceview>=2.22.0' 'pygtksourceview>=2.2.0' 'gtk-doc') +makedepends=('intltool' 'gnome-doc-utils>=0.8.0' 'gnome-python-desktop-gtksourceview>=2.24.0' 'pygtksourceview>=2.2.0' 'gtk-doc') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') _F_gnome_schemas=('/etc/gconf/schemas/gedit.schemas' \ @@ -15,11 +15,11 @@ _F_gnome_schemas=('/etc/gconf/schemas/gedit.schemas' \ _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" Finclude gnome gnome-scriptlet -sha1sums=('3582e532c6c18f1b49b92878540484693976307b') +sha1sums=('a024a0bd15872628c5045e1093cb079859834b80') subpkgs=("$pkgname-python") subdescs=('gedit python plugins') -subdepends=("$pkgname=$pkgver gnome-python-desktop-gtksourceview>=2.20.0 pygtksourceview") +subdepends=("$pkgname=$pkgver gnome-python-desktop-gtksourceview>=2.24.0 pygtksourceview") subgroups=('gnome') subarchs=('i686 x86_64 ppc') From voroskoi at frugalware.org Wed Oct 1 09:00:21 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Oct 1 09:00:23 2008 Subject: [Frugalware-git] frugalware-current: seamonkey-1.1.12-1-i686 Message-ID: <20081001070021.8C9E71190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=603f79036ca39b8a7a0811b879bcdda7288c609b commit 603f79036ca39b8a7a0811b879bcdda7288c609b Author: voroskoi Date: Wed Oct 1 08:59:15 2008 +0200 seamonkey-1.1.12-1-i686 version bump closes #3376 diff --git a/source/xapps-extra/seamonkey/FrugalBuild b/source/xapps-extra/seamonkey/FrugalBuild index a88326f..e3a1654 100644 --- a/source/xapps-extra/seamonkey/FrugalBuild +++ b/source/xapps-extra/seamonkey/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=seamonkey -pkgver=1.1.11 +pkgver=1.1.12 pkgrel=1 pkgdesc="Seamonkey all-in-one internet application suite" url="http://www.mozilla.org/projects/seamonkey/" @@ -53,7 +53,7 @@ build() # Install menu file. Ffile /usr/share/applications/$pkgname.desktop } -sha1sums=('d185d04590a7b99c5d97faf48c29a27d0c0462d8' \ +sha1sums=('268b7aadc6e116674eb53d1f2068a084347cb53e' \ '0dd4777e87d70eba6834d56813f6a415fe991007' \ 'b0e0bdd676758e19cac4a0429257a92183328f0e') From voroskoi at frugalware.org Wed Oct 1 09:10:10 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Oct 1 09:10:11 2008 Subject: [Frugalware-git] frugalware-current: libraw1394-2.0.0-1-x86_64 Message-ID: <20081001071010.8065E1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8e5b8a9b6b463c002e077a7ce08d31b3ff89a996 commit 8e5b8a9b6b463c002e077a7ce08d31b3ff89a996 Author: voroskoi Date: Wed Oct 1 09:09:54 2008 +0200 libraw1394-2.0.0-1-x86_64 version bump diff --git a/source/lib/libraw1394/FrugalBuild b/source/lib/libraw1394/FrugalBuild index 1138aaf..81fabfe 100644 --- a/source/lib/libraw1394/FrugalBuild +++ b/source/lib/libraw1394/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=libraw1394 -pkgver=1.3.0 +pkgver=2.0.0 pkgrel=1 pkgdesc="Provides an API to the Linux IEEE1394 (FireWire) driver" url="http://www.linux1394.org/" @@ -12,6 +12,6 @@ groups=('lib') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://www.linux1394.org/|grep -m1 Latest|sed 's/.*]v\(.*\) .*(.*)/\1/'" source=(http://www.linux1394.org/dl/libraw1394-${pkgver}.tar.gz) -sha1sums=('30e8e4a4a1ebec5fe6462639bc3fdb75a9000b05') +sha1sums=('6b11d6a5a73e264f28db1be25c3e6ce4da0dacc4') # optimization OK From voroskoi at frugalware.org Wed Oct 1 09:13:37 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Oct 1 09:13:39 2008 Subject: [Frugalware-git] frugalware-current: libiec61883-1.1.0-2-x86_64 Message-ID: <20081001071337.837D91190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=99d105370ce60ccbb6c1e13627fce5d25b077f5a commit 99d105370ce60ccbb6c1e13627fce5d25b077f5a Author: voroskoi Date: Wed Oct 1 09:13:15 2008 +0200 libiec61883-1.1.0-2-x86_64 rebuilt with libraw1394>=2.0 diff --git a/source/lib/libiec61883/FrugalBuild b/source/lib/libiec61883/FrugalBuild index 1f25cd8..1d740f0 100644 --- a/source/lib/libiec61883/FrugalBuild +++ b/source/lib/libiec61883/FrugalBuild @@ -3,10 +3,10 @@ pkgname=libiec61883 pkgver=1.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="libiec61883 provides higher level API for streaming over IEEE 1394." url="http://www.linux1394.org/" -depends=('libraw1394>=1.2.1') +depends=('libraw1394>=2.0.0') groups=('lib') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump $url |grep libiec.*tar.gz |sed -ne 's/.*-\(.*\).t.*/\1/;1p'" From voroskoi at frugalware.org Wed Oct 1 09:20:07 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Oct 1 09:20:08 2008 Subject: [Frugalware-git] frugalware-current: libavc1394-0.5.3-2-x86_64 Message-ID: <20081001072007.697E21190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9cfff16af0afb6f59e6946c3ed8c581142d73e2b commit 9cfff16af0afb6f59e6946c3ed8c581142d73e2b Author: voroskoi Date: Wed Oct 1 09:19:51 2008 +0200 libavc1394-0.5.3-2-x86_64 rebuilt with libraw>=2.0 diff --git a/source/lib/libavc1394/FrugalBuild b/source/lib/libavc1394/FrugalBuild index e7369b5..af00924 100644 --- a/source/lib/libavc1394/FrugalBuild +++ b/source/lib/libavc1394/FrugalBuild @@ -4,11 +4,11 @@ pkgname=libavc1394 pkgver=0.5.3 -pkgrel=1 +pkgrel=2 pkgdesc="A library to control A/V devices using the 1394ta AV/C commands." # url="http://www.linux1394.org/" url="http://sourceforge.net/projects/libavc1394/" -depends=('libraw1394') +depends=('libraw1394>=2.0') groups=('lib') archs=('i686' 'x86_64' 'ppc') Finclude sourceforge From voroskoi at frugalware.org Wed Oct 1 09:24:14 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Oct 1 09:24:16 2008 Subject: [Frugalware-git] frugalware-current: libdc1394-2.0.2-2-x86_64 Message-ID: <20081001072414.5DA831190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=af6ca16903eb3a225c35eddb58d4d56c73032763 commit af6ca16903eb3a225c35eddb58d4d56c73032763 Author: voroskoi Date: Wed Oct 1 09:23:59 2008 +0200 libdc1394-2.0.2-2-x86_64 rebuilt with libraw>=2.0 diff --git a/source/lib/libdc1394/FrugalBuild b/source/lib/libdc1394/FrugalBuild index 9f096b3..7bc0577 100644 --- a/source/lib/libdc1394/FrugalBuild +++ b/source/lib/libdc1394/FrugalBuild @@ -3,11 +3,11 @@ pkgname=libdc1394 pkgver=2.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="libdc1394 provides a high level programming interface to control IEEE 1394 based cameras." Finclude sourceforge url="http://sourceforge.net/projects/libdc1394/" -depends=('libraw1394') +depends=('libraw1394>=2.0') groups=('lib') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=8157 |grep libdc1394-2 |grep tar |sed -n -e 's/.*4-\(.*\).t.*/\1/' -e 's/-/_/' -e '1 p'" From voroskoi at frugalware.org Wed Oct 1 09:29:34 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Oct 1 09:29:35 2008 Subject: [Frugalware-git] frugalware-current: unicap-0.2.19-2-x86_64 Message-ID: <20081001072934.157BB1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0d218913fe40deb72e4381a276d96babdd3dc872 commit 0d218913fe40deb72e4381a276d96babdd3dc872 Author: voroskoi Date: Wed Oct 1 09:28:52 2008 +0200 unicap-0.2.19-2-x86_64 rebuilt with libraw1394>=2.0 diff --git a/source/xlib-extra/unicap/FrugalBuild b/source/xlib-extra/unicap/FrugalBuild index f9a49d1..7140d5a 100644 --- a/source/xlib-extra/unicap/FrugalBuild +++ b/source/xlib-extra/unicap/FrugalBuild @@ -3,9 +3,9 @@ pkgname=unicap pkgver=0.2.19 -pkgrel=1 +pkgrel=2 pkgdesc="unicap provides a uniform API for all kinds of video capture devices." -depends=('libxv' 'gtk+2' 'freetype2>=2.3.3' 'libraw1394') +depends=('libxv' 'gtk+2' 'freetype2>=2.3.3' 'libraw1394>=2.0') makedepends=('perl-xml-parser') options=('scriptlet') groups=('xlib-extra') From voroskoi at frugalware.org Wed Oct 1 09:35:47 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Oct 1 09:35:49 2008 Subject: [Frugalware-git] frugalware-current: coriander-2.0.0_rc6-2-x86_64 Message-ID: <20081001073547.8E9BA1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=606f0492f0f99cfcbf7a9567bf92d2f4b81a10e5 commit 606f0492f0f99cfcbf7a9567bf92d2f4b81a10e5 Author: voroskoi Date: Wed Oct 1 09:35:29 2008 +0200 coriander-2.0.0_rc6-2-x86_64 rebuilt with libraw1394>=2.0 diff --git a/source/gnome-extra/coriander/FrugalBuild b/source/gnome-extra/coriander/FrugalBuild index fa93427..99a77e5 100644 --- a/source/gnome-extra/coriander/FrugalBuild +++ b/source/gnome-extra/coriander/FrugalBuild @@ -3,11 +3,11 @@ pkgname=coriander pkgver=2.0.0_rc6 -pkgrel=1 +pkgrel=2 pkgdesc="A library to control A/V devices using the 1394ta AV/C commands." Finclude sourceforge url="http://damien.douxchamps.net/ieee1394/coriander/" -depends=('libgnomeui' 'libtheora' 'ffmpeg' 'libxv' 'sdl' 'libdc1394>=2.0.0' 'libraw1394' 'faad2' 'faac') +depends=('libgnomeui' 'libtheora' 'ffmpeg' 'libxv' 'sdl' 'libdc1394>=2.0.0' 'libraw1394>=2.0' 'faad2' 'faac') groups=('gnome-extra') archs=('i686' 'x86_64') #source=($source \ From voroskoi at frugalware.org Wed Oct 1 09:38:26 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Oct 1 09:38:28 2008 Subject: [Frugalware-git] frugalware-current: chicken-3.4.0-1-i686 Message-ID: <20081001073826.9680B1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=85c1722c25f7d77c57027a11466d2bcd6f85a95d commit 85c1722c25f7d77c57027a11466d2bcd6f85a95d Author: voroskoi Date: Wed Oct 1 09:38:07 2008 +0200 chicken-3.4.0-1-i686 version bump diff --git a/source/devel-extra/chicken/FrugalBuild b/source/devel-extra/chicken/FrugalBuild index e8ca58d..3558dc9 100644 --- a/source/devel-extra/chicken/FrugalBuild +++ b/source/devel-extra/chicken/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=chicken -pkgver=3.3.4 +pkgver=3.4.0 pkgrel=1 pkgdesc="A compiler for Scheme, which produces portable, efficient C." url="http://www.call-with-current-continuation.org/" @@ -12,7 +12,7 @@ groups=('devel-extra') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://chicken.wiki.br/dev-snapshots/current/ |Flasttar" source=(http://chicken.wiki.br/dev-snapshots/current/$pkgname-$pkgver.tar.gz) -sha1sums=('971cf87243aa2d14410a21d409d85bb749d06eb5') +sha1sums=('fb9a812d94996aba6fc2abf2baf2726ea26d9ef0') build() { unset MAKEFLAGS From devil505linux at gmail.com Wed Oct 1 09:47:08 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Oct 1 09:47:08 2008 Subject: [Frugalware-git] frugalware-current: denemo-0.7.9-1-i686 Message-ID: <20081001074708.811F81190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3279788456c7a98ded80066e016e4860749acf36 commit 3279788456c7a98ded80066e016e4860749acf36 Author: Devil505 Date: Wed Oct 1 09:42:26 2008 +0200 denemo-0.7.9-1-i686 * new package diff --git a/source/xapps-extra/denemo/FrugalBuild b/source/xapps-extra/denemo/FrugalBuild new file mode 100644 index 0000000..d31d8ea --- /dev/null +++ b/source/xapps-extra/denemo/FrugalBuild @@ -0,0 +1,22 @@ +# Compiling Time: 0.12 SBU +# Maintainer: Devil505 + +pkgname=denemo +pkgver=0.7.9 +pkgrel=1 +pkgdesc="GTK+ graphical music notation editor." +url="http://savannah.gnu.org/projects/$pkgname" +depends=('gtk+2' 'freetype2' 'libxau' 'libxdmcp' 'aubio' 'portaudio' 'libxml2' 'libxdamage' 'libxext') +options=('scriptlet') +groups=('xapps-extra') +archs=('i686' 'x86_64') +Fconfopts="${Fconfopts[@]} --enable-gtk2 \ + --disable-xmltest \ + --disable-alsatest \ + --enable-alsa \ + --enable-nls \ + --with-plugins="analysis,midiinput,rumour"" +up2date="Flasttar http://download.savannah.gnu.org/releases/$pkgname/" +source=(http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) +sha1sums=('a0334c35d683e9c4d0389e50dca357eb6ad59d31') + From voroskoi at frugalware.org Wed Oct 1 10:07:44 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Oct 1 10:07:45 2008 Subject: [Frugalware-git] frugalware-current: kdenlive-0.5_1-3-i686 Message-ID: <20081001080744.168091190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=befb94af279a795c2a142a8b9c232189d5dd2154 commit befb94af279a795c2a142a8b9c232189d5dd2154 Author: voroskoi Date: Wed Oct 1 10:07:13 2008 +0200 kdenlive-0.5_1-3-i686 rebuilt with libraw1394>=2.0 diff --git a/source/kde-extra/kdenlive/FrugalBuild b/source/kde-extra/kdenlive/FrugalBuild index afe244d..69583d8 100644 --- a/source/kde-extra/kdenlive/FrugalBuild +++ b/source/kde-extra/kdenlive/FrugalBuild @@ -3,9 +3,9 @@ pkgname=kdenlive pkgver=0.5_1 -pkgrel=2 +pkgrel=3 pkgdesc="A Non-Linear Video Editing Suite for KDE" -depends=('libdrm' 'libiec61883' 'mlt-plus-plus>=0.2.2-4' 'libraw1394' 'kdelibs>=3.5.7' 'libavc1394' \ +depends=('libdrm' 'libiec61883' 'mlt-plus-plus>=0.2.2-4' 'libraw1394>=2.0' 'kdelibs>=3.5.7' 'libavc1394' \ 'mlt-qimage>=0.2.4-4' 'mlt-sdl>=0.2.4-4' 'mlt-jack>=0.2.4-4' 'mlt-lumas>=0.2.4-4' 'ladspa_sdk' 'libtheora' \ 'ffmpeg>=20080427-4') _F_kde_defaults=0 From voroskoi at frugalware.org Wed Oct 1 10:14:17 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Oct 1 10:14:18 2008 Subject: [Frugalware-git] frugalware-current: yasm-0.7.1-1-i686 Message-ID: <20081001081417.9A0D91190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b015e0abd2bf8f48f42b9f30d4e9cc8ad91a15b4 commit b015e0abd2bf8f48f42b9f30d4e9cc8ad91a15b4 Author: voroskoi Date: Wed Oct 1 10:14:04 2008 +0200 yasm-0.7.1-1-i686 fixed up2date diff --git a/source/devel-extra/yasm/FrugalBuild b/source/devel-extra/yasm/FrugalBuild index 61d6bce..e54ef48 100644 --- a/source/devel-extra/yasm/FrugalBuild +++ b/source/devel-extra/yasm/FrugalBuild @@ -9,7 +9,7 @@ url="http://www.tortall.net/projects/yasm/wiki" depends=('glibc') groups=('devel-extra') archs=('i686' 'x86_64' 'ppc') -up2date="lynx -dump $url/Download |grep http.*tar.gz |sed -ne 's/.*m-\(.*\).t.*/\1/;1 p'" +up2date="lynx -dump ${url}/Download |grep http.*tar.gz |Flasttar" source=(http://www.tortall.net/projects/yasm/releases/$pkgname-$pkgver.tar.gz) sha1sums=('c8adeb363ef52ee67c6e8e3041b509330aa30c87') From vmiklos at frugalware.org Wed Oct 1 12:14:42 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Oct 1 12:14:43 2008 Subject: [Frugalware-git] frugalware-current: at-3.1.10.2-1-i686 Message-ID: <20081001101442.9E96211901A1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=50280bd007a8b1f374cc5741c3c0f95cbb8f4882 commit 50280bd007a8b1f374cc5741c3c0f95cbb8f4882 Author: Miklos Vajna Date: Wed Oct 1 12:14:27 2008 +0200 at-3.1.10.2-1-i686 - version bump diff --git a/source/apps/at/FrugalBuild b/source/apps/at/FrugalBuild index 59f619b..9425389 100644 --- a/source/apps/at/FrugalBuild +++ b/source/apps/at/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Miklos Vajna pkgname=at -pkgver=3.1.10.1 -pkgrel=2 +pkgver=3.1.10.2 +pkgrel=1 pkgdesc="Allows you to run jobs at specified times" url="http://ftp.debian.org/debian/pool/main/a/at/" backup=('etc/at.deny') @@ -14,8 +14,8 @@ archs=('i686' 'x86_64') Fpkgversep="_" up2date="Flasttar http://ftp.debian.org/debian/pool/main/a/at/" source=(http://ftp.debian.org/debian/pool/main/a/at/${pkgname}_$pkgver.tar.gz \ - 00-$pkgname-$pkgver-makefile.patch rc.atd rc.atd-{de,hu}.po) -sha1sums=('09bac255666f1aff7a403b8b92fcc7cdcb0ad20f' \ + 00-$pkgname-3.1.10.1-makefile.patch rc.atd rc.atd-{de,hu}.po) +sha1sums=('7834e319b8307983981f192aa221520b95624f67' \ '4703618c6e9e09a177287031f16025ca33bc831c' \ '25167c3a3915b3d395815532c7f6c67c62a64906' \ 'd77fa8a0fe28f84ee91e2513fc4bb7f5a20eb279' \ From vmiklos at frugalware.org Wed Oct 1 12:14:42 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Oct 1 12:14:45 2008 Subject: [Frugalware-git] frugalware-current: scratchbox-1.0.11-1-i686 Message-ID: <20081001101442.82BE31190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dbfa98dfaf938705f4c95b5704613be22fa19ae4 commit dbfa98dfaf938705f4c95b5704613be22fa19ae4 Author: Miklos Vajna Date: Wed Oct 1 12:13:05 2008 +0200 scratchbox-1.0.11-1-i686 - version bump diff --git a/source/devel-extra/scratchbox/FrugalBuild b/source/devel-extra/scratchbox/FrugalBuild index 22798c0..ca12ad2 100644 --- a/source/devel-extra/scratchbox/FrugalBuild +++ b/source/devel-extra/scratchbox/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna pkgname=scratchbox -pkgver=1.0.10 +pkgver=1.0.11 pkgrel=1 pkgdesc="A cross-compilation toolkit to make embedded application development easier." url="http://www.scratchbox.org/" @@ -13,8 +13,8 @@ up2date="lynx -dump http://scratchbox.org/download/files/sbox-releases/apophis/s source=(http://scratchbox.org/download/files/sbox-releases/apophis/tarball/scratchbox-core-$pkgver-i386.tar.gz \ http://scratchbox.org/download/files/sbox-releases/apophis/tarball/scratchbox-libs-$pkgver-i386.tar.gz \ README.Frugalware rc.scratchbox) -sha1sums=('eb3c02c7b3a12ed3acb496badf81c626456beb57' \ - '575d27e5ea4adf7cdfeed3a25d2c5243f35a326c' \ +sha1sums=('1187b55e1569dd8c77bd2da182e089471b1aea42' \ + 'a6a31b61d3d0b022de6314b5636bd4ee4f90d095' \ 'c08ba6dc88526fe55cf0958f0b81b4dc3270c55e' \ '7f17d4a73c673e58d736f3363ae732c63870d301') options=('nostrip') # why wasting our time with this if it's already done? From devil505linux at gmail.com Wed Oct 1 13:00:36 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Oct 1 13:00:38 2008 Subject: [Frugalware-git] frugalware-current: binutils-emul-2.18.50.0.9_-1-x86_64 Message-ID: <20081001110036.B502F1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6dcfff676e5503977cff4f973d2492c77e6517a3 commit 6dcfff676e5503977cff4f973d2492c77e6517a3 Author: Devil505 Date: Wed Oct 1 13:00:30 2008 +0200 binutils-emul-2.18.50.0.9_-1-x86_64 version bump diff --git a/source/emul-extra/binutils-emul/FrugalBuild b/source/emul-extra/binutils-emul/FrugalBuild index 24b563d..8ddfccd 100644 --- a/source/emul-extra/binutils-emul/FrugalBuild +++ b/source/emul-extra/binutils-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=binutils-emul -pkgver=2.18.50.0.8_4 +pkgver=2.18.50.0.9_ pkgrel=1 pkgdesc="A set of programs to assemble and manipulate binary and object files for emulation of i686 on x86_64" url="http://sources.redhat.com/binutils" From devil505linux at gmail.com Wed Oct 1 13:03:32 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Oct 1 13:03:33 2008 Subject: [Frugalware-git] frugalware-current: mpfr-emul-2.3.2_3-1-x86_64 Message-ID: <20081001110332.2823C1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6dfe842c51ffb770945602feb268b31d7312c31f commit 6dfe842c51ffb770945602feb268b31d7312c31f Author: Devil505 Date: Wed Oct 1 13:02:57 2008 +0200 mpfr-emul-2.3.2_3-1-x86_64 version bump diff --git a/source/emul-extra/mpfr-emul/FrugalBuild b/source/emul-extra/mpfr-emul/FrugalBuild index 82cfd64..84c2453 100644 --- a/source/emul-extra/mpfr-emul/FrugalBuild +++ b/source/emul-extra/mpfr-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=mpfr-emul -pkgver=2.3.1_01_3 +pkgver=2.3.2_3 pkgrel=1 pkgdesc="Library for multiple-precision floating-point computations (32bit emul)" url="http://www.mpfr.org/mpfr-current/" @@ -10,4 +10,4 @@ depends=('gmp-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('98016ae72ae60f939d6ef89892fa29553ee59bd6') +sha1sums=('fbec830c39a680713041a9238b5996c6a70ffa56') From devil505linux at gmail.com Wed Oct 1 13:05:43 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Oct 1 13:05:45 2008 Subject: [Frugalware-git] frugalware-current: frugalware-emul-0.9_1-1-x86_64 Message-ID: <20081001110543.3580A1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fb7aa9f8f10fb9231d4043d07f372233f2e63bb4 commit fb7aa9f8f10fb9231d4043d07f372233f2e63bb4 Author: Devil505 Date: Wed Oct 1 13:05:23 2008 +0200 frugalware-emul-0.9_1-1-x86_64 version bump diff --git a/source/emul-extra/frugalware-emul/FrugalBuild b/source/emul-extra/frugalware-emul/FrugalBuild index 4167e2e..285d52c 100644 --- a/source/emul-extra/frugalware-emul/FrugalBuild +++ b/source/emul-extra/frugalware-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=frugalware-emul -pkgver=0.9rc1_1 +pkgver=0.9_1 pkgrel=1 pkgdesc="Basic Frugalware Linux filesystem package (32 emulation)" url="http://frugalware.org" @@ -22,4 +22,4 @@ build() { ln -s . $Fdestdir/usr/lib/chroot32/usr/X11R6 || Fdie Fmkdir /usr/lib/chroot32/usr/lib/X11/fonts } -sha1sums=('f9ff974c39520e20c782d4a66c28a219a2d8ed51') +sha1sums=('c7abad1c84b5d7c7947c4c55eb955bdd1f640e8c') From devil505linux at gmail.com Wed Oct 1 13:08:27 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Oct 1 13:08:28 2008 Subject: [Frugalware-git] frugalware-current: sqlite3-emul-3.6.3_1-1-x86_64 Message-ID: <20081001110827.4B9A91190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=20a98fc692553d06efb0a66b4ba076aa411a631e commit 20a98fc692553d06efb0a66b4ba076aa411a631e Author: Devil505 Date: Wed Oct 1 13:07:56 2008 +0200 sqlite3-emul-3.6.3_1-1-x86_64 version bump diff --git a/source/emul-extra/sqlite3-emul/FrugalBuild b/source/emul-extra/sqlite3-emul/FrugalBuild index e24c7b9..bdc1e89 100644 --- a/source/emul-extra/sqlite3-emul/FrugalBuild +++ b/source/emul-extra/sqlite3-emul/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Devil505 pkgname=sqlite3-emul -pkgver=3.5.9_1 +pkgver=3.6.3_1 pkgrel=1 pkgdesc="A C library that implements an SQL database engine for emulation of i686 on x86_64" url="http://www.sqlite.org/" depends=('readline-emul') groups=('emul-extra') Finclude emul -sha1sums=('f873000ac072960bcb392cfd7b57cbad5103d260') +sha1sums=('e384b996d99a2979052e899da15635b29fa62250') From devil505linux at gmail.com Wed Oct 1 13:10:53 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Oct 1 13:10:55 2008 Subject: [Frugalware-git] frugalware-current: libgcc-emul-4.3.2_1-1-x86_64 Message-ID: <20081001111053.E0C5A1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8332a07e1a63ba009abf624628f1a930e100af4b commit 8332a07e1a63ba009abf624628f1a930e100af4b Author: Devil505 Date: Wed Oct 1 13:10:26 2008 +0200 libgcc-emul-4.3.2_1-1-x86_64 version bump diff --git a/source/emul-extra/libgcc-emul/FrugalBuild b/source/emul-extra/libgcc-emul/FrugalBuild index ab994c3..005db41 100644 --- a/source/emul-extra/libgcc-emul/FrugalBuild +++ b/source/emul-extra/libgcc-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=libgcc-emul -pkgver=4.3.1_3 +pkgver=4.3.2_1 pkgrel=1 pkgdesc="The GNU Standard C++ Library for emulation of i686 on x86_64" url="http://gcc.gnu.org/" @@ -12,4 +12,4 @@ provides=('gcc-lib-emul') replaces=('gcc-lib-emul') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('1139274ed07f96cf3c1db0a82619d5d489a4078b') +sha1sums=('a98c11e6ca168ee8402dbe56f80c50021ccd4029') From devil505linux at gmail.com Wed Oct 1 13:20:54 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Oct 1 13:20:55 2008 Subject: [Frugalware-git] frugalware-current: firefox-emul-3.0.3_1-1-x86_64 Message-ID: <20081001112054.9AC771190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3556f2c88df010ac7cb12797fcfdf28b6efd7a6e commit 3556f2c88df010ac7cb12797fcfdf28b6efd7a6e Author: Devil505 Date: Wed Oct 1 13:17:05 2008 +0200 firefox-emul-3.0.3_1-1-x86_64 version bump diff --git a/source/emul-extra/firefox-emul/FrugalBuild b/source/emul-extra/firefox-emul/FrugalBuild index 3332f52..46099f0 100644 --- a/source/emul-extra/firefox-emul/FrugalBuild +++ b/source/emul-extra/firefox-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=firefox-emul -pkgver=3.0.1_2 +pkgver=3.0.3_1 pkgrel=1 pkgdesc="Mozilla Firefox web browser (32bit emul)" url="http://www.mozilla.org/products/firefox/" @@ -11,4 +11,4 @@ depends=('gtk+2-emul' 'libidl-emul' 'nss-emul' 'libxml2-emul' 'libstdc++-emul' ' groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('5c559d073c9caf8e93ec6fa1616421d731b16b4a') +sha1sums=('ce196d75d99524919dd39d5d396ae2954eb77702') From devil505linux at gmail.com Wed Oct 1 13:23:43 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Oct 1 13:23:44 2008 Subject: [Frugalware-git] frugalware-current: mktemp-emul-1.6_1-1-x86_64 Message-ID: <20081001112343.70F8E1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b99a94d88aeb864a9679bba49e904504a2c3eeb5 commit b99a94d88aeb864a9679bba49e904504a2c3eeb5 Author: Devil505 Date: Wed Oct 1 13:23:20 2008 +0200 mktemp-emul-1.6_1-1-x86_64 version bump diff --git a/source/emul-extra/mktemp-emul/FrugalBuild b/source/emul-extra/mktemp-emul/FrugalBuild index ecf3176..dd189ec 100644 --- a/source/emul-extra/mktemp-emul/FrugalBuild +++ b/source/emul-extra/mktemp-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=mktemp-emul -pkgver=1.5_3 +pkgver=1.6_1 pkgrel=1 pkgdesc="A small program to allow safe temporary file creation from shell scripts (32bit emul)" url="http://www.mktemp.org/" @@ -10,4 +10,4 @@ depends=('glibc-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('ba6fd8c0558c5bbb8505ec5c4dc05c1848e3c413') +sha1sums=('1724e580e028f2b1ffab1cacff42e36001918e72') From devil505linux at gmail.com Wed Oct 1 13:26:24 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Oct 1 13:26:25 2008 Subject: [Frugalware-git] frugalware-current: aalib-emul-1.4rc5_4-1-x86_64 Message-ID: <20081001112624.6C26E1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e322c682d8b42ee2d1f908230d6ec9c8e62da396 commit e322c682d8b42ee2d1f908230d6ec9c8e62da396 Author: Devil505 Date: Wed Oct 1 13:25:54 2008 +0200 aalib-emul-1.4rc5_4-1-x86_64 version bump diff --git a/source/emul-extra/aalib-emul/FrugalBuild b/source/emul-extra/aalib-emul/FrugalBuild index 2ff38a3..30cefd6 100644 --- a/source/emul-extra/aalib-emul/FrugalBuild +++ b/source/emul-extra/aalib-emul/FrugalBuild @@ -2,10 +2,10 @@ # Maintainer: Christian Hamar alias krix pkgname=aalib-emul -pkgver=1.4rc5_3 +pkgver=1.4rc5_4 pkgrel=1 pkgdesc="A portable ascii art graphics library. for emulation of i686 on x86_64" url="http://sourceforge.net/projects/aalib" depends=('glibc-emul' 'gpm-emul' 'ncurses-emul') Finclude emul -sha1sums=('e4f38ca998f5df8b5d72da49edf868f96d071d9e') +sha1sums=('0c38e8ba5482efc8193c432cb40890a72dd77452') From devil505linux at gmail.com Wed Oct 1 13:29:14 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Oct 1 13:29:15 2008 Subject: [Frugalware-git] frugalware-current: alsa-lib-emul-1.0.17_2-1-x86_64 Message-ID: <20081001112914.3386B1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ba7cb0860a344c0147ef75585dbe570520593067 commit ba7cb0860a344c0147ef75585dbe570520593067 Author: Devil505 Date: Wed Oct 1 13:28:43 2008 +0200 alsa-lib-emul-1.0.17_2-1-x86_64 version bump diff --git a/source/emul-extra/alsa-lib-emul/FrugalBuild b/source/emul-extra/alsa-lib-emul/FrugalBuild index 3d9093c..afd2788 100644 --- a/source/emul-extra/alsa-lib-emul/FrugalBuild +++ b/source/emul-extra/alsa-lib-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=alsa-lib-emul -pkgver=1.0.17_1 +pkgver=1.0.17_2 pkgrel=1 pkgdesc="An alternative implementation of Linux sound support (32bit emul)" url="http://www.alsa-project.org/" @@ -10,4 +10,4 @@ depends=('glibc-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('5a5d239f4245923c6c7f788b85c49c5b0707cb75') +sha1sums=('e832ba3f3264daff105a4935c5e397614e4a02e7') From devil505linux at gmail.com Wed Oct 1 13:37:30 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Oct 1 13:37:32 2008 Subject: [Frugalware-git] frugalware-current: fet-5.7.0-1-i686 Message-ID: <20081001113730.DE96D1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=97599b5b53de74897d620b2d1330ee0084caa4ef commit 97599b5b53de74897d620b2d1330ee0084caa4ef Author: Devil505 Date: Wed Oct 1 13:35:47 2008 +0200 fet-5.7.0-1-i686 * new package from uzsolt * closes Feature request FS#3193 diff --git a/source/xapps-extra/fet/FrugalBuild b/source/xapps-extra/fet/FrugalBuild new file mode 100644 index 0000000..59f52c6 --- /dev/null +++ b/source/xapps-extra/fet/FrugalBuild @@ -0,0 +1,31 @@ +# Compiling Time: 5.12 SBU +# Maintainer: Devil505 +# Contributor: uzsolt + +pkgname=fet +pkgver=5.7.0 +pkgrel=1 +pkgdesc="FET is a free timetabling program for schools, high-schools and some universities." +url="http://www.lalescu.ro/liviu/$pkgname" +depends=('qt4' 'libpng' 'libsm' 'libxi' 'libxrandr' 'libxinerama' 'fontconfig' 'glib2' 'libstdc++') +options=('scriptlet') +groups=('xapps-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump $url/download | Flasttar" +source=(http://www.lalescu.ro/liviu/fet/download/$pkgname-$pkgver.tar.bz2) +sha1sums=('5de54a4628be7e0a9da182a2208eed0bb3f537d2') + + +build () { +Fcd +qmake fet.pro || Fdie +Fmake +Fmakeinstall +Fmkdir /usr/{bin,share/{doc/fet-$pkgver/,man/man1,fet}} +Fcprrel fet /usr/bin/ +gzip doc/fet.1 +Fcprrel doc/fet.1.gz /usr/share/man/man1/ +Fcprrel "-r sample_inputs" /usr/share/doc/fet-$pkgver/ +Fcprrel "-r translations" /usr/share/fet/ +} + From devil505linux at gmail.com Wed Oct 1 13:48:22 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Oct 1 13:48:22 2008 Subject: [Frugalware-git] frugalware-current: glibc-emul-2.8_6-1-x86_64 Message-ID: <20081001114822.1C9CB1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0b93bee39c2d655611ba11b1760ff8b5ce99b48e commit 0b93bee39c2d655611ba11b1760ff8b5ce99b48e Author: Devil505 Date: Wed Oct 1 13:39:39 2008 +0200 glibc-emul-2.8_6-1-x86_64 version bump diff --git a/source/emul-extra/glibc-emul/FrugalBuild b/source/emul-extra/glibc-emul/FrugalBuild index b668082..29f1d17 100644 --- a/source/emul-extra/glibc-emul/FrugalBuild +++ b/source/emul-extra/glibc-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=glibc-emul -pkgver=2.8_4 +pkgver=2.8_6 pkgrel=1 pkgdesc="GNU C Library for emulation of i686 on x86_64" url="http://www.gnu.org/software/libc/libc.html" @@ -10,4 +10,4 @@ depends=('glibc') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('9f8526ecd86d2832b8240d72ec370a11107b5fd2') +sha1sums=('1699401b9a2ab8d0526a76d50b01888e4f4f38bb') From devil505linux at gmail.com Wed Oct 1 13:51:13 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Oct 1 13:51:13 2008 Subject: [Frugalware-git] frugalware-current: gpm-emul-1.20.5_4-1-x86_64 Message-ID: <20081001115113.0CD771190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=457166395ff32df80ee159da6cd489f46f10815e commit 457166395ff32df80ee159da6cd489f46f10815e Author: Devil505 Date: Wed Oct 1 13:50:41 2008 +0200 gpm-emul-1.20.5_4-1-x86_64 version bump diff --git a/source/emul-extra/gpm-emul/FrugalBuild b/source/emul-extra/gpm-emul/FrugalBuild index e957ea1..1c9f414 100644 --- a/source/emul-extra/gpm-emul/FrugalBuild +++ b/source/emul-extra/gpm-emul/FrugalBuild @@ -2,10 +2,10 @@ # Maintainer: Christian Hamar alias krix pkgname=gpm-emul -pkgver=1.20.5_3 +pkgver=1.20.5_4 pkgrel=1 pkgdesc="General purpose mouse server for emulation of i686 on x86_64" url="http://arcana.linux.it" depends=('ncurses-emul') Finclude emul -sha1sums=('9e0d5f2d781263000a7bf252f27def9a1ca5ddb0') +sha1sums=('a55e46b4918af0fdb5584a5ecf43dc43fae1eebf') From devil505linux at gmail.com Wed Oct 1 13:54:00 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Oct 1 13:54:01 2008 Subject: [Frugalware-git] frugalware-current: pcre-emul-7.8_1-1-x86_64 Message-ID: <20081001115400.0A34C1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e42e7e71cbec73a0fc3302668cc6fce5f622bd42 commit e42e7e71cbec73a0fc3302668cc6fce5f622bd42 Author: Devil505 Date: Wed Oct 1 13:53:31 2008 +0200 pcre-emul-7.8_1-1-x86_64 version bump diff --git a/source/emul-extra/pcre-emul/FrugalBuild b/source/emul-extra/pcre-emul/FrugalBuild index 1389196..3d52013 100644 --- a/source/emul-extra/pcre-emul/FrugalBuild +++ b/source/emul-extra/pcre-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=pcre-emul -pkgver=7.7_2 +pkgver=7.8_1 pkgrel=1 pkgdesc="Perl-compatible regular expression library (32bit emul)" url="http://pcre.sourceforge.net" @@ -10,4 +10,4 @@ depends=('libstdc++-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('a7cd37aec41c0295320ee06ce4c3f258761a9e22') +sha1sums=('59e637c041b375d8b18c8bc6694603a3d211f95a') From devil505linux at gmail.com Wed Oct 1 13:55:44 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Oct 1 13:55:45 2008 Subject: [Frugalware-git] frugalware-current: beep-1.2.2-1-i686 Message-ID: <20081001115544.1CCFF1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bd104ba3a7b4c202d35c983f9930f78efe28047d commit bd104ba3a7b4c202d35c983f9930f78efe28047d Author: Devil505 Date: Wed Oct 1 13:53:46 2008 +0200 beep-1.2.2-1-i686 * new package from Tibor Baksa * closes request FS#3326 diff --git a/source/apps-extra/beep/FrugalBuild b/source/apps-extra/beep/FrugalBuild new file mode 100644 index 0000000..0ef0f43 --- /dev/null +++ b/source/apps-extra/beep/FrugalBuild @@ -0,0 +1,26 @@ +# Compiling Time: 0 SBU +# Maintainer: Devil505 +# Contributor: Tibor Baksa + +pkgname=beep +pkgver=1.2.2 +pkgrel=1 +pkgdesc="Advanced pc-speaker beeper" +url="http://www.johnath.com/beep/" +depends=('glibc') +groups=('apps-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump http://www.johnath.com/beep/|grep -m 1 tar.gz|sed 's/.*beep-\(.*\).tar.gz.*/\1/'" +source=(http://www.johnath.com/beep/$pkgname-$pkgver.tar.gz) +sha1sums=('f4eeb8f074449a37326b79c6b560d7e1ab1ee579') + +build() +{ + Fconf + make FLAGS="$CFLAGS" || Fdie + Fmkdir /usr/{bin,share/man/man1} + Fmakeinstall INSTALL_DIR=$Fdestdir/usr/bin MAN_DIR=$Fdestdir/usr/share/man/man1 + chmod +s $Fdestdir/usr/bin/beep || Fdie +} + +# optimization OK From devil505linux at gmail.com Wed Oct 1 14:35:12 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Oct 1 14:35:13 2008 Subject: [Frugalware-git] frugalware-current: gmp-emul-4.2.4_1-1-x86_64 Message-ID: <20081001123512.3FCAA1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b5b331aa0d45389498507cb1ea62e2621ad62b62 commit b5b331aa0d45389498507cb1ea62e2621ad62b62 Author: Devil505 Date: Wed Oct 1 13:55:54 2008 +0200 gmp-emul-4.2.4_1-1-x86_64 version bump diff --git a/source/emul-extra/gmp-emul/FrugalBuild b/source/emul-extra/gmp-emul/FrugalBuild index 2088c4e..cf40619 100644 --- a/source/emul-extra/gmp-emul/FrugalBuild +++ b/source/emul-extra/gmp-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=gmp-emul -pkgver=4.2.2_3 +pkgver=4.2.4_1 pkgrel=1 pkgdesc="GNU multiple precision arithmetic library (32bit emul)" url="http://swox.com/gmp/" @@ -10,4 +10,4 @@ depends=('libstdc++-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('02720d9d4a9a0545cdd2fc6be2bfeb67fc49af16') +sha1sums=('c33b59a26f0fd9da6aa084813b99f19354c8e753') From devil505linux at gmail.com Wed Oct 1 14:35:12 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Oct 1 14:35:13 2008 Subject: [Frugalware-git] frugalware-current: binutils-emul-2.18.50.0.9_1-1-x86_64 Message-ID: <20081001123512.5D39211901A1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=197e796a4c6a31aa8b7c19c8980add09e7ed7c6d commit 197e796a4c6a31aa8b7c19c8980add09e7ed7c6d Author: Devil505 Date: Wed Oct 1 14:32:34 2008 +0200 binutils-emul-2.18.50.0.9_1-1-x86_64 * version bump diff --git a/source/emul-extra/binutils-emul/FrugalBuild b/source/emul-extra/binutils-emul/FrugalBuild index 8ddfccd..326e3f7 100644 --- a/source/emul-extra/binutils-emul/FrugalBuild +++ b/source/emul-extra/binutils-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=binutils-emul -pkgver=2.18.50.0.9_ +pkgver=2.18.50.0.9_1 pkgrel=1 pkgdesc="A set of programs to assemble and manipulate binary and object files for emulation of i686 on x86_64" url="http://sources.redhat.com/binutils" @@ -10,4 +10,4 @@ depends=('bash-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('78a9a7293f5ab648e1203cf9b5f5e7860ab6bf76') +sha1sums=('7a03d8bb67f0f6abccb457a6bf5c21d2a52bbfb7') From ryuo at frugalware.org Wed Oct 1 14:57:38 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Oct 1 14:57:39 2008 Subject: [Frugalware-git] frugalware-current: joy2key-1.6.3-1-i686 Message-ID: <20081001125738.10A3A1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c9ac7c498af6f347a1e90a74b6c2881ccdfbd594 commit c9ac7c498af6f347a1e90a74b6c2881ccdfbd594 Author: James Buren Date: Wed Oct 1 07:57:52 2008 -0500 joy2key-1.6.3-1-i686 * version bump * found a maintained version on sourceforge, so switching to that diff --git a/source/xapps-extra/joy2key/FrugalBuild b/source/xapps-extra/joy2key/FrugalBuild index 596c369..4484666 100644 --- a/source/xapps-extra/joy2key/FrugalBuild +++ b/source/xapps-extra/joy2key/FrugalBuild @@ -1,26 +1,15 @@ -# Compiling Time: 0.02 SBU +# Compiling Time: 0.01 SBU # Maintainer: James Buren pkgname=joy2key -pkgver=1.6 -pkgrel=2 +pkgver=1.6.3 +pkgrel=1 pkgdesc="A program for translating joystick events to keyboard events." -url="http://interreality.org/~tetron/technology/joy2key/" depends=('libx11' 'glibc') makedepends=('xorg-server') groups=('xapps-extra') archs=('i686' 'x86_64') -up2date="Flasttar $url" -source=($url/$pkgname-$pkgver.tar.gz) -sha1sums=('7149d2b4fe3e74c4fb99ce1d27a7685265cba30c') -_F_cd_path="$pkgname-$pkgver.1" -CFLAGS="${CFLAGS} -lX11" - -build() -{ - # change default dev node for joystick to frugalware default - Fsed "/dev/js0" "/dev/input/js0" joy2key.{c,1} - Fbuild -} +Finclude sourceforge +sha1sums=('11b0ed5b66299af815e8e4f476263469afc823a9') # optimization OK From devil505linux at gmail.com Wed Oct 1 15:52:53 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Oct 1 15:52:54 2008 Subject: [Frugalware-git] frugalware-current: strace-emul-4.5.18_1-1-x86_64 Message-ID: <20081001135253.1D38711901A1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f96a2757035630c35d732649d4d43a2e803215e6 commit f96a2757035630c35d732649d4d43a2e803215e6 Author: Devil505 Date: Wed Oct 1 15:52:32 2008 +0200 strace-emul-4.5.18_1-1-x86_64 version bump diff --git a/source/emul-extra/strace-emul/FrugalBuild b/source/emul-extra/strace-emul/FrugalBuild index 7d4e0ef..68fe5f7 100644 --- a/source/emul-extra/strace-emul/FrugalBuild +++ b/source/emul-extra/strace-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=strace-emul -pkgver=4.5.17_1 +pkgver=4.5.18_1 pkgrel=1 pkgdesc="A system call trace, which prints out a trace of all the system calls made by a another process/program (32bit emul)" url="http://www.liacs.nl/~wichert/strace/" @@ -10,4 +10,4 @@ depends=('glibc-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('ec9539a124704028c3af2ec48bd6ff9bad196e03') +sha1sums=('c20ca9c40f76155982ebb2489f7c327599da30df') From devil505linux at gmail.com Wed Oct 1 15:52:52 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Oct 1 15:52:54 2008 Subject: [Frugalware-git] frugalware-current: libpng-emul-1.2.32_1-1-x86_64 Message-ID: <20081001135253.00D9F1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c513894ed0d5cab9fbc7905a54635f238c54c44c commit c513894ed0d5cab9fbc7905a54635f238c54c44c Author: Devil505 Date: Wed Oct 1 15:06:31 2008 +0200 libpng-emul-1.2.32_1-1-x86_64 version bump diff --git a/source/emul-extra/libpng-emul/FrugalBuild b/source/emul-extra/libpng-emul/FrugalBuild index 951a812..1d64290 100644 --- a/source/emul-extra/libpng-emul/FrugalBuild +++ b/source/emul-extra/libpng-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=libpng-emul -pkgver=1.2.29_1 +pkgver=1.2.32_1 pkgrel=1 pkgdesc="A collection of routines used to create PNG format graphics files for emulation of i686 on x86_64" url="http://www.libpng.org/" @@ -10,4 +10,4 @@ depends=('glibc-emul' 'zlib-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('d35917d9984a60e2a8e30d1a3349706fa8f3e518') +sha1sums=('0ff334ae1a911d87ee87b689975667ec66d27044') From devil505linux at gmail.com Wed Oct 1 15:55:44 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Oct 1 15:55:45 2008 Subject: [Frugalware-git] frugalware-current: libstdc++-emul-4.3.2_1-1-x86_64 Message-ID: <20081001135544.497431190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=aa1949a36c775a81829d16ea658f12cbceab5b7b commit aa1949a36c775a81829d16ea658f12cbceab5b7b Author: Devil505 Date: Wed Oct 1 15:54:56 2008 +0200 libstdc++-emul-4.3.2_1-1-x86_64 version bump diff --git a/source/emul-extra/libstdc++-emul/FrugalBuild b/source/emul-extra/libstdc++-emul/FrugalBuild index edf854a..437111f 100644 --- a/source/emul-extra/libstdc++-emul/FrugalBuild +++ b/source/emul-extra/libstdc++-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=libstdc++-emul -pkgver=4.3.1_3 +pkgver=4.3.2_1 pkgrel=1 pkgdesc="The GNU Standard C++ Library for emulation of i686 on x86_64" url="http://gcc.gnu.org/" @@ -10,4 +10,4 @@ depends=('glibc-emul' 'libgcc-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('b1e7522db7fcc39fabfce78b7de4a950bb817884') +sha1sums=('496d48008bbe465dd7860c12d07eb707ce17c82c') From vmiklos at frugalware.org Wed Oct 1 16:46:41 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Oct 1 16:46:43 2008 Subject: [Frugalware-git] frugalware-current: docs/install: add commands to boot from usb on ppc Message-ID: <20081001144641.C80681190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c8c493060c387133a2beb96742dcad84445475b6 commit c8c493060c387133a2beb96742dcad84445475b6 Author: Miklos Vajna Date: Wed Oct 1 16:46:34 2008 +0200 docs/install: add commands to boot from usb on ppc diff --git a/docs/install.txt b/docs/install.txt index d3d6e64..ea97d84 100644 --- a/docs/install.txt +++ b/docs/install.txt @@ -93,6 +93,22 @@ Pros: No need to burn any CD. Cons: You have to be able to boot from USB. +On PPC, to boot from a USB stick, you will need to use the Open Firmware +prompt, since Open Firmware does not search USB storage devices by +default. To get to the prompt, hold down Command+Option+o+f all together +while booting. + +You will need to work out where the USB storage device appears in the +device tree. Type `dev / ls` and `devalias` at the Open Firmware prompt +to get a list of all known devices and device aliases. + +Example, in case the path is `/pci@f2000000/usb@1b`: + +---- +devalias usb0 /pci@f2000000/usb@1b +boot usb0/disk:2,\\:tbxi +---- + === TFTP image This is a floppy image, for a very special case: From devil505linux at gmail.com Wed Oct 1 18:26:43 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Oct 1 18:26:45 2008 Subject: [Frugalware-git] frugalware-current: gdata-python-client-1.2.1-1-i686 Message-ID: <20081001162643.B182A1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=027a37aa2fd043d9014c64978190d0c92713ddb6 commit 027a37aa2fd043d9014c64978190d0c92713ddb6 Author: Devil505 Date: Wed Oct 1 18:25:05 2008 +0200 gdata-python-client-1.2.1-1-i686 * new package * closes Request FS#3358 diff --git a/source/devel-extra/gdata-python-client/FrugalBuild b/source/devel-extra/gdata-python-client/FrugalBuild new file mode 100644 index 0000000..7a59f99 --- /dev/null +++ b/source/devel-extra/gdata-python-client/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling time: 0 SBU +# Maintainer: Devil505 + +pkgname=gdata-python-client +pkgver=1.2.1 +pkgrel=1 +pkgdesc="Python client library for Google data APIs" +depends=('elementtree' 'python') +groups=('devel-extra') +archs=('i686') +_F_googlecode_name=gdata.py +_F_archive_name=$_F_googlecode_name +Finclude googlecode +up2date="lynx -dump http://code.google.com/p/$pkgname/downloads/list |grep $_F_googlecode_name | Flasttar" +sha1sums=('5360ca69ae2a6d9524ffe1e5df1aa2e0a5377aa2') From devil505linux at gmail.com Wed Oct 1 18:31:09 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Oct 1 18:31:11 2008 Subject: [Frugalware-git] frugalware-current: * removing gdata-python-client (gdata.py is already in current) Message-ID: <20081001163109.9B95E1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e9b0ff979a05fa70b5e6af35dd27b9d5d92e4cb9 commit e9b0ff979a05fa70b5e6af35dd27b9d5d92e4cb9 Author: Devil505 Date: Wed Oct 1 18:27:56 2008 +0200 * removing gdata-python-client (gdata.py is already in current) diff --git a/source/devel-extra/gdata-python-client/FrugalBuild b/source/devel-extra/gdata-python-client/FrugalBuild deleted file mode 100644 index 7a59f99..0000000 --- a/source/devel-extra/gdata-python-client/FrugalBuild +++ /dev/null @@ -1,15 +0,0 @@ -# Compiling time: 0 SBU -# Maintainer: Devil505 - -pkgname=gdata-python-client -pkgver=1.2.1 -pkgrel=1 -pkgdesc="Python client library for Google data APIs" -depends=('elementtree' 'python') -groups=('devel-extra') -archs=('i686') -_F_googlecode_name=gdata.py -_F_archive_name=$_F_googlecode_name -Finclude googlecode -up2date="lynx -dump http://code.google.com/p/$pkgname/downloads/list |grep $_F_googlecode_name | Flasttar" -sha1sums=('5360ca69ae2a6d9524ffe1e5df1aa2e0a5377aa2') From vmiklos at frugalware.org Wed Oct 1 18:44:05 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Oct 1 18:44:07 2008 Subject: [Frugalware-git] frugalware-current: mplayer-1.0rc2-7-i686 Message-ID: <20081001164405.EAA8F1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=04bddeebe046506717b65b29792f556251e6e064 commit 04bddeebe046506717b65b29792f556251e6e064 Author: Miklos Vajna Date: Wed Oct 1 18:43:37 2008 +0200 mplayer-1.0rc2-7-i686 - added mplayer_demux_real.patch - closes #3371 diff --git a/source/xapps/mplayer/FrugalBuild b/source/xapps/mplayer/FrugalBuild index b1e833f..673ac51 100644 --- a/source/xapps/mplayer/FrugalBuild +++ b/source/xapps/mplayer/FrugalBuild @@ -5,7 +5,7 @@ pkgname=mplayer _F_archive_name=MPlayer pkgver=1.0rc2 pkgextraver= -pkgrel=6 +pkgrel=7 pkgdesc="The Movie Player" url="http://www.mplayerhq.hu/" depends=('mesa' 'fontconfig' 'libstdc++' 'libdv' 'termcap' 'libjpeg' 'libmad' \ @@ -30,7 +30,8 @@ source=(http://www.mplayerhq.hu/MPlayer/releases/$_F_archive_name-$pkgver$pkgext http://www.mplayerhq.hu/MPlayer/patches/demux_mov_fix_20080129.diff \ http://www.mplayerhq.hu/MPlayer/patches/demux_audio_fix_20080129.diff \ http://www.mplayerhq.hu/MPlayer/patches/stream_cddb_fix_20080120.diff \ - CVE-2008-0073.diff) + CVE-2008-0073.diff \ + http://www.ocert.org/patches/2008-013/mplayer_demux_real.patch) sha1sums=('e9b496f3527c552004ec6d01d6b43f196b43ce2d' \ '45e5ee7a5541a5f1cfd2678a6c9b5911ca473cb9' \ 'ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68' \ @@ -41,7 +42,8 @@ sha1sums=('e9b496f3527c552004ec6d01d6b43f196b43ce2d' \ 'a17d82baff58e8cc569365341503273956fd26c8' \ 'e25ba7d8d696d9c6365f105134ba723404adb4e1' \ '8d901c7a88fa120ed26492e741e1ae0fbe57e12d' \ - 'df2d0c46a73be32ec5e3d575532c34b939a79d5f') + 'df2d0c46a73be32ec5e3d575532c34b939a79d5f' \ + '3139c1c13d411cbacef9a9d050c9df87431aba71') # To add v4l support. # mknod -m 660 /dev/video0 c 81 0 From vmiklos at frugalware.org Wed Oct 1 19:11:16 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Oct 1 19:11:18 2008 Subject: [Frugalware-git] frugalware-current: fuseiso-20070708-2-ppc Message-ID: <20081001171116.E125E1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dcfbc37b506ab6f655d24775ce76d0f6fde16643 commit dcfbc37b506ab6f655d24775ce76d0f6fde16643 Author: Miklos Vajna Date: Wed Oct 1 19:10:59 2008 +0200 fuseiso-20070708-2-ppc added ppc to archs() diff --git a/source/apps-extra/fuseiso/FrugalBuild b/source/apps-extra/fuseiso/FrugalBuild index ff41c7e..7c04216 100644 --- a/source/apps-extra/fuseiso/FrugalBuild +++ b/source/apps-extra/fuseiso/FrugalBuild @@ -9,7 +9,7 @@ url="http://fuse.sourceforge.net/wiki/index.php/FuseIso" depends=('fuse') groups=('apps-extra') replaces=('cdemu') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump $url |grep bz2$|sed 's/.*-\(.*\)\.t.*/\1/;q'" source=(http://ubiz.ru/dm/fuseiso-$pkgver.tar.bz2) sha1sums=('fe142556ad35dd7e5dc31a16183232a6e2da7692') From bouleetbil at frogdev.info Wed Oct 1 19:12:22 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Oct 1 19:12:23 2008 Subject: [Frugalware-git] bouleetbilgnome224: sound-theme-freedesktop-1-1-i686 Message-ID: <20081001171222.9491F1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=ade82fdeb54fc24537621caddd65d7a87ee5092a commit ade82fdeb54fc24537621caddd65d7a87ee5092a Author: bouleetbil Date: Wed Oct 1 19:09:08 2008 +0200 sound-theme-freedesktop-1-1-i686 *new package diff --git a/source/lib-extra/sound-theme-freedesktop/FrugalBuild b/source/lib-extra/sound-theme-freedesktop/FrugalBuild new file mode 100644 index 0000000..f76c66b --- /dev/null +++ b/source/lib-extra/sound-theme-freedesktop/FrugalBuild @@ -0,0 +1,19 @@ +# Compiling Time: 0 SBU +# Maintainer: bouleetbil + +pkgname=sound-theme-freedesktop +pkgver=1 +pkgrel=1 +url="http://0pointer.de/lennart/projects/libcanberra/" +pkgdesc="The default freedesktop.org sound theme following the XDG theming." +groups=('lib-extra') +archs=('i686' 'x86_64') +depends=() +source=(http://0pointer.de/public/sound-theme-freedesktop.tar.gz) +up2date=$pkgver +sha1sums=('4897a8c786316ef529dca20c2185ccd395807f12') + +build(){ + Fmkdir /usr/share/sounds + Fcp freedesktop /usr/share/sounds/ +} From bouleetbil at frogdev.info Wed Oct 1 19:26:18 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Oct 1 19:26:20 2008 Subject: [Frugalware-git] bouleetbilgnome224: gnome-control-center-2.24.0.1-2-i686 Message-ID: <20081001172618.424531190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=55e83630c4cc39a4cfb4f9cc68e82de581ff9a45 commit 55e83630c4cc39a4cfb4f9cc68e82de581ff9a45 Author: bouleetbil Date: Wed Oct 1 19:23:34 2008 +0200 gnome-control-center-2.24.0.1-2-i686 *enable system sound default diff --git a/source/gnome/gnome-control-center/FrugalBuild b/source/gnome/gnome-control-center/FrugalBuild index 63d137e..64701b5 100644 --- a/source/gnome/gnome-control-center/FrugalBuild +++ b/source/gnome/gnome-control-center/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gnome-control-center pkgver=2.24.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME Control Center" depends=('gnome-desktop>=2.24.0' 'gnome-menus>=2.24.0' 'metacity>=2.24.0' 'libgnomekbd>=2.24.0' \ 'nautilus>=2.24.0' 'gst-plugins-base>=0.10.19-2' 'desktop-file-utils' \ @@ -11,7 +11,7 @@ depends=('gnome-desktop>=2.24.0' 'gnome-menus>=2.24.0' 'metacity>=2.24.0' 'libgn 'gnome-vfs>=2.24.0' 'gnome-panel>=2.24.0' 'heimdal>=1.2.1' 'db>=4.7.25' \ 'gnome-settings-daemon' 'libcanberra-gtk' 'libcanberra-alsa' 'libcanberra-gst') makedepends=('intltool' 'gnome-doc-utils>=0.12.2' 'gnome-common>=2.24.0') -rodepends=('gst-plugins-base-alsa>=0.10.19-2' 'gst-plugins-base-gnomevfs>=0.10.19-2') +rodepends=('gst-plugins-base-alsa>=0.10.19-2' 'gst-plugins-base-gnomevfs>=0.10.19-2' 'sound-theme-freedesktop') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') _F_gnome_schemas=('/etc/gconf/schemas/fontilus.schemas' \ From bouleetbil at frogdev.info Wed Oct 1 20:16:25 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Oct 1 20:16:27 2008 Subject: [Frugalware-git] bouleetbilgnome224: gnome-session-2.24.0-3-i686 Message-ID: <20081001181625.EC8CA1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=986629d81398944a99d139bfb81e4ac0d8c22f92 commit 986629d81398944a99d139bfb81e4ac0d8c22f92 Author: bouleetbil Date: Wed Oct 1 20:13:42 2008 +0200 gnome-session-2.24.0-3-i686 *delete useless patch *enable splash by default diff --git a/source/gnome/gnome-session/02-splash-disappear.patch b/source/gnome/gnome-session/02-splash-disappear.patch deleted file mode 100644 index a4c737a..0000000 --- a/source/gnome/gnome-session/02-splash-disappear.patch +++ /dev/null @@ -1,14 +0,0 @@ -http://bugzilla.gnome.org/show_bug.cgi?id=116814 - -diff -Naur gnome-session-2.8.1.orig/gnome-session/manager.c gnome-session-2.8.1/gnome-session/manager.c ---- gnome-session-2.8.1.orig/gnome-session/manager.c 2004-10-01 12:13:23.000000000 +0200 -+++ gnome-session-2.8.1/gnome-session/manager.c 2005-01-20 20:03:24.000000000 +0100 -@@ -1362,8 +1362,6 @@ - if (pending_list) - { - Client* client = (Client*)pending_list->data; -- if (client->match_rule != MATCH_PROP) -- goto out; - } - - if (start_list) diff --git a/source/gnome/gnome-session/09_splash_hide.patch b/source/gnome/gnome-session/09_splash_hide.patch deleted file mode 100644 index c4d8592..0000000 --- a/source/gnome/gnome-session/09_splash_hide.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -PruN gnome-session-2.8.1.orig/gnome-session/manager.c gnome-session-2.8.1/gnome-session/manager.c ---- gnome-session-2.8.1.orig/gnome-session/manager.c 2004-10-01 12:13:23.000000000 +0200 -+++ gnome-session-2.8.1/gnome-session/manager.c 2004-11-23 15:20:28.000000000 +0100 -@@ -1381,6 +1381,7 @@ - runlevel = client->priority; - } - if (pending_list) -+ splash_hide (); - goto out; - } - save_state = MANAGER_IDLE; -diff -PruN gnome-session-2.8.1.orig/gnome-session/splash-widget.c gnome-session-2.8.1/gnome-session/splash-widget.c ---- gnome-session-2.8.1.orig/gnome-session/splash-widget.c 2004-09-24 18:35:38.000000000 +0200 -+++ gnome-session-2.8.1/gnome-session/splash-widget.c 2004-11-23 15:19:57.000000000 +0100 -@@ -605,3 +605,10 @@ - } - } - -+void -+splash_hide (void) -+{ -+ if (global_splash) { -+ gtk_widget_hide (GTK_WIDGET (global_splash)); -+ } -+} -diff -PruN gnome-session-2.8.1.orig/gnome-session/splash-widget.h gnome-session-2.8.1/gnome-session/splash-widget.h ---- gnome-session-2.8.1.orig/gnome-session/splash-widget.h 2003-02-13 23:29:57.000000000 +0100 -+++ gnome-session-2.8.1/gnome-session/splash-widget.h 2004-11-23 15:18:45.000000000 +0100 -@@ -79,5 +79,6 @@ - void splash_start (void); - void splash_update (const gchar *text); - void splash_stop (void); -+void splash_hide (void); - - #endif /* SPLASH_WIDGET_H */ diff --git a/source/gnome/gnome-session/12_shaped_splash.patch b/source/gnome/gnome-session/12_shaped_splash.patch deleted file mode 100644 index 2316e91..0000000 --- a/source/gnome/gnome-session/12_shaped_splash.patch +++ /dev/null @@ -1,104 +0,0 @@ ---- gnome-session-2.12.0/gnome-session/splash-widget.h.shaped 2005-08-08 03:35:13.000000000 -0400 -+++ gnome-session-2.12.0/gnome-session/splash-widget.h 2006-01-12 02:19:59.000000000 -0500 -@@ -36,7 +36,6 @@ - GnomeIconTheme *icon_theme; - - GdkPixbuf *background; -- GdkPixmap *bg_pixmap; - GList *icons; - PangoLayout *layout; - PangoAttribute *font_size_attr; - ---- gnome-session-2.12.0/gnome-session/splash-widget.c.shaped 2006-01-12 02:19:59.000000000 -0500 -+++ gnome-session-2.12.0/gnome-session/splash-widget.c 2006-01-12 02:22:28.000000000 -0500 -@@ -137,16 +137,6 @@ - if (!GTK_WIDGET_DRAWABLE (widget)) - return FALSE; - -- if (gdk_rectangle_intersect ( -- &event->area, &sw->image_bounds, &exposed)) -- gdk_draw_drawable ( -- GDK_DRAWABLE (widget->window), -- widget->style->black_gc, -- GDK_DRAWABLE (sw->bg_pixmap), -- exposed.x, exposed.y, -- exposed.x, exposed.y, -- exposed.width, exposed.height); -- - for (l = sw->icons; l; l = l->next) { - SplashIcon *si = l->data; - -@@ -208,33 +218,42 @@ splash_widget_size_request (GtkWidget - static void - splash_widget_realize (GtkWidget *widget) - { -- GdkPixmap *pm; - SplashWidget *sw = (SplashWidget *) widget; - - GNOME_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget)); - - if (sw->background && widget->window) { -- int width, height; -+ GdkPixmap *pixmap; -+ GdkBitmap *mask; -+ GdkColormap *colormap; - -- width = gdk_pixbuf_get_width (sw->background); -- height = gdk_pixbuf_get_height (sw->background); -+ pixmap = NULL; -+ mask = NULL; - -- pm = gdk_pixmap_new ( -- widget->window, -- width, height, -- gdk_drawable_get_visual (widget->window)->depth); -+ colormap = gtk_widget_get_colormap (widget); -+ gdk_pixbuf_render_pixmap_and_mask_for_colormap (sw->background, -+ colormap, -+ &pixmap, &mask, -+ 125); - -- if (pm) { -- gdk_pixbuf_render_to_drawable ( -- sw->background, GDK_DRAWABLE (pm), -- widget->style->black_gc, -- 0, 0, 0, 0, width, height, -- GDK_RGB_DITHER_NORMAL, -- 0, 0); -- -- gdk_window_set_back_pixmap ( -- widget->window, pm, FALSE); -- sw->bg_pixmap = pm; -+ if (pixmap) { -+ GtkStyle *style; -+ -+ style = gtk_style_copy (widget->style); -+ style->bg_pixmap[GTK_STATE_NORMAL] = pixmap; -+ -+ gtk_widget_set_style (widget, style); -+ g_object_unref (style); -+ -+ if (mask) { -+ gdk_window_shape_combine_mask (widget->window, -+ mask, 0, 0); -+ -+ g_object_unref (mask); -+ } -+ -+ gtk_style_set_background (widget->style, widget->window, -+ GTK_STATE_NORMAL); - } - } - } -@@ -257,11 +256,6 @@ - { - SplashWidget *sw = (SplashWidget *) widget; - -- if (sw->bg_pixmap) { -- g_object_unref (sw->bg_pixmap); -- sw->bg_pixmap = NULL; -- } -- - GNOME_CALL_PARENT (GTK_WIDGET_CLASS, unrealize, (widget)); - } - diff --git a/source/gnome/gnome-session/19_gnome-wm-tweaking.patch b/source/gnome/gnome-session/19_gnome-wm-tweaking.patch deleted file mode 100644 index cde77b3..0000000 --- a/source/gnome/gnome-session/19_gnome-wm-tweaking.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur gnome-session-2.20.0.orig/gnome-session/gnome-wm gnome-session-2.20.0/gnome-session/gnome-wm ---- gnome-session-2.20.0.orig/gnome-session/gnome-wm 2007-09-24 19:55:59.000000000 +0200 -+++ gnome-session-2.20.0/gnome-session/gnome-wm 2007-09-24 19:59:19.000000000 +0200 -@@ -37,6 +37,11 @@ - esac - done - -+# Get previously set window manager in gconf -+if [ -z "$DEFWM" -o "x$DEFWM" = "xgnome-wm" ]; then -+ DEFWM=`gconftool-2 -g /desktop/gnome/applications/window_manager/default 2>/dev/null` -+fi -+ - # WINDOW_MANAGER overrides all - - if [ -z "$WINDOW_MANAGER" ] ; then -@@ -128,6 +133,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!" diff --git a/source/gnome/gnome-session/21_dont_grab_when_composited.patch b/source/gnome/gnome-session/21_dont_grab_when_composited.patch deleted file mode 100644 index 37d6eea..0000000 --- a/source/gnome/gnome-session/21_dont_grab_when_composited.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -ur gnome-session-2.16.0/gnome-session/logout.c gnome-session-2.16.0.patched/gnome-session/logout.c ---- gnome-session-2.16.0/gnome-session/logout.c 2006-09-29 18:30:17 +0100 -+++ gnome-session-2.16.0.patched/gnome-session/logout.c 2006-09-29 18:32:09 +0100 -@@ -796,8 +796,16 @@ - */ - if (!a11y_enabled && !getenv("LTSP_CLIENT")) - { -- XGrabServer (GDK_DISPLAY ()); -- gsm_foreach_screen (fadeout_screen); -+ Atom cmSnAtom; -+ Window currentCmSnOwner; -+ -+ cmSnAtom = XInternAtom (GDK_DISPLAY (), "_NET_WM_CM_S0", 0); -+ currentCmSnOwner = XGetSelectionOwner (GDK_DISPLAY (), cmSnAtom); -+ -+ if (currentCmSnOwner == None) { -+ XGrabServer (GDK_DISPLAY ()); -+ gsm_foreach_screen (fadeout_screen); -+ } - } - - gtk_widget_show_all (dialog->dialog); -@@ -823,8 +831,17 @@ - - if (!a11y_enabled && !getenv("LTSP_CLIENT")) - { -+ Atom cmSnAtom; -+ Window currentCmSnOwner; -+ - hide_fadeout_windows (); -- XUngrabServer (GDK_DISPLAY ()); -+ -+ cmSnAtom = XInternAtom (GDK_DISPLAY (), "_NET_WM_CM_S0", 0); -+ currentCmSnOwner = XGetSelectionOwner (GDK_DISPLAY (), cmSnAtom); -+ -+ if (currentCmSnOwner == None) { -+ XUngrabServer (GDK_DISPLAY ()); -+ } - - gdk_pointer_ungrab (GDK_CURRENT_TIME); - gdk_keyboard_ungrab (GDK_CURRENT_TIME); diff --git a/source/gnome/gnome-session/FrugalBuild b/source/gnome/gnome-session/FrugalBuild index 79eb231..1ac4395 100644 --- a/source/gnome/gnome-session/FrugalBuild +++ b/source/gnome/gnome-session/FrugalBuild @@ -5,7 +5,7 @@ pkgname=gnome-session pkgver=2.24.0 -pkgrel=2 +pkgrel=3 pkgdesc="GNOME session manager" depends=('libgnomeui>=2.24.0' 'gnome-desktop>=2.24.0' \ 'dbus-glib>=0.76' 'gnome-control-center>=2.24.0.1' 'gnome-vfs>=2.24.0' 'libnotify' 'gnome-keyring>=2.24.0') @@ -16,18 +16,15 @@ _F_gnome_schemas=('/etc/gconf/schemas/gnome-session.schemas') _F_gnome_iconcache="y" _F_gnome_desktop="y" Finclude gnome gnome-scriptlet -source=(${source[@]} 02-splash-disappear.patch \ - $pkgname http://ftp.frugalware.org/pub/other/artwork/gnome-theme/GNOME-Splash-1.0.png \ - 09_splash_hide.patch 19_gnome-wm-tweaking.patch) +source=(${source[@]} enable_splash.diff \ + $pkgname http://ftp.frugalware.org/pub/other/artwork/gnome-theme/GNOME-Splash-1.0.png ) sha1sums=('5a4b329db62ae3518029982ae86fb1b138500c3e' \ - 'd45d51203dc7ad290b12bc70281d59844a79be75' \ + '5a63c81ad2ecd0d29aa33c73d2717dcd1774333e' \ '047ac00bb24d52986aac94e232b4b40fa122f582' \ - '222c9a2fd01872acc2fb69c17e9771cde2e1e5a2' \ - '97585abf9d468e532422af3daceb42b61d832a13' \ - 'a69fefc4ee7f11ee1be13f61a4f7c711f3390c80') + '222c9a2fd01872acc2fb69c17e9771cde2e1e5a2') build() { - #Fpatchall + Fpatchall Fmake --disable-schemas-install Fmakeinstall GCONF_DISABLE_SCHEMA_INSTALL=1 Fbuild_gnome_scriptlet diff --git a/source/gnome/gnome-session/enable_splash.diff b/source/gnome/gnome-session/enable_splash.diff new file mode 100644 index 0000000..d9c897e --- /dev/null +++ b/source/gnome/gnome-session/enable_splash.diff @@ -0,0 +1,11 @@ +--- gnome-session-2.24.0old/data/gnome-session.schemas.in 2008-09-22 23:21:08.000000000 +0200 ++++ gnome-session-2.24.0/data/gnome-session.schemas.in 2008-10-01 16:39:35.000000000 +0200 +@@ -7,7 +7,7 @@ + /apps/gnome-session/options/show_splash_screen + gnome + bool +- false ++ true + + Show the splash screen + Show the splash screen when the session starts up From bouleetbil at frogdev.info Wed Oct 1 20:25:42 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Oct 1 20:25:43 2008 Subject: [Frugalware-git] bouleetbilgnome224: gnome-menus-2.24.0-2-i686 Message-ID: <20081001182542.3884A1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=d068949e77744eba1fa244fccea6a96543f0c3e2 commit d068949e77744eba1fa244fccea6a96543f0c3e2 Author: bouleetbil Date: Wed Oct 1 20:23:22 2008 +0200 gnome-menus-2.24.0-2-i686 *fixe broken submenu diff --git a/source/gnome/gnome-menus/FrugalBuild b/source/gnome/gnome-menus/FrugalBuild index 36195de..8b2cddf 100644 --- a/source/gnome/gnome-menus/FrugalBuild +++ b/source/gnome/gnome-menus/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gnome-menus pkgver=2.24.0 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME menus and menu editor" depends=('gamin>=0.1.9-3' 'pygtk>=2.12.1-2') makedepends=('intltool') @@ -12,9 +12,9 @@ replaces=('gnome-main-menu') archs=('i686' 'x86_64' 'ppc') Finclude gnome Fsysconfdir="/etc/gnome" -Fconfopts="$Fconfopts --enable-python --enable-debug=no --enable-inotify" +Fconfopts="$Fconfopts --enable-python --enable-debug=no" source=(${source[@]} $pkgname-2.18.0-categorize-prefs-menu.patch) sha1sums=('29c55f48a576216489ce139aa9c1bedf43394de1' \ - 'fa6cec3a8d11a35e0436b54038193f8e4c3b143f') + '1b397c1eaee3b6dda7460c0b00092b10abf521d4') # optimization OK diff --git a/source/gnome/gnome-menus/gnome-menus-2.18.0-categorize-prefs-menu.patch b/source/gnome/gnome-menus/gnome-menus-2.18.0-categorize-prefs-menu.patch index e4b0d85..856a31b 100644 --- a/source/gnome/gnome-menus/gnome-menus-2.18.0-categorize-prefs-menu.patch +++ b/source/gnome/gnome-menus/gnome-menus-2.18.0-categorize-prefs-menu.patch @@ -9,29 +9,47 @@ diff -Naur gnome-menus-2.20.0.orig/desktop-directories/Hardware.directory.in gno +Icon=system Type=Directory Encoding=UTF-8 ---- gnome-menus-2.24.0old/layout/applications.menu 2008-09-22 23:10:56.000000000 +0200 -+++ gnome-menus-2.24.0/layout/applications.menu 2008-09-29 20:40:30.000000000 +0200 -@@ -18,6 +18,16 @@ - - - -+ -+ -+ Personal -+ Look and Feel -+ Internet and Network -+ Hardware -+ System -+ -+ -+ - - - Accessories -@@ -137,6 +147,55 @@ +--- gnome-menus-2.24.0old/layout/settings.menu 2008-09-22 23:10:56.000000000 +0200 ++++ gnome-menus-2.24.0/layout/settings.menu 2008-10-01 13:06:11.000000000 +0200 +@@ -28,6 +28,11 @@ + + + System ++ X-GNOME-PersonalSettings ++ DesktopSettings ++ X-GNOME-NetworkSettings ++ HardwareSettings ++ X-GNOME-SystemSettings + gnomecc.desktop + + +@@ -47,6 +52,81 @@ - + ++ ++ ++ Personal ++ Personal.directory ++ ++ ++ Settings ++ X-GNOME-PersonalSettings ++ ++ ++ ++ ++ ++ Look and Feel ++ LookAndFeel.directory ++ ++ ++ Settings ++ DesktopSettings ++ ++ ++ ++ + + + Internet and Network @@ -81,8 +99,9 @@ diff -Naur gnome-menus-2.20.0.orig/desktop-directories/Hardware.directory.in gno + + + - - - Other - - ++ ++ ++ + + Preferences + Administration From bouleetbil at frogdev.info Wed Oct 1 21:32:20 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Oct 1 21:32:22 2008 Subject: [Frugalware-git] bouleetbilgnome224: gnome-settings-daemon-2.24.0-2-i686 Message-ID: <20081001193220.955FA1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=0a56d94606dc31962b8aca66932e826699b6b366 commit 0a56d94606dc31962b8aca66932e826699b6b366 Author: bouleetbil Date: Wed Oct 1 21:29:50 2008 +0200 gnome-settings-daemon-2.24.0-2-i686 *fixe launch gnome-setting-daemon to startup *fixe _F_gnome_schemas diff --git a/source/gnome/gnome-settings-daemon/FrugalBuild b/source/gnome/gnome-settings-daemon/FrugalBuild index f2c8121..d706070 100644 --- a/source/gnome/gnome-settings-daemon/FrugalBuild +++ b/source/gnome/gnome-settings-daemon/FrugalBuild @@ -3,17 +3,17 @@ pkgname=gnome-settings-daemon pkgver=2.24.0 -pkgrel=1 +pkgrel=2 pkgdesc="Utility library for accessing gnome-settings-daemon over DBUS" depends=('libgnomekbd' 'esd' 'gst-plugins-base' 'libgnomeui' 'libxxf86misc' 'gnome-desktop' 'gconf' 'alsa-lib') makedepends=('intltool' 'gtk-doc>=1.9' 'gnome-doc-utils>=0.12.2') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') -_F_gnome_schemas=('/etc/gconf/schemas/gnome-settings-daemon.schemas' - '/etc/gconf/schemas/desktop_gnome_font_rendering.schemas' - '/etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas' - '/etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas') -_F_gnome_entries=('/etc/gconf/schemas/panel-default-setup.entries') +_F_gnome_schemas=('/etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas' \ + '/etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas' \ + '/etc/gconf/schemas/apps_gnome_settings_daemon_xrandr.schemas' \ + '/etc/gconf/schemas/desktop_gnome_font_rendering.schemas' \ + '/etc/gconf/schemas/gnome-settings-daemon.schemas') _F_gnome_scrollkeeper="y" _F_gnome_iconcache="y" Finclude gnome gnome-scriptlet @@ -22,4 +22,11 @@ sha1sums=('7d95a7550c465c9a64e4bda64331c92069958bfd' \ 'eb601b6406db7700c12d6b144eacbbdc7c4a780e') Fconfopts="$Fconfopts --enable-gstreamer" +build(){ + Fbuild + Fbuild_gnome_scriptlet + Fmkdir usr/share/gnome/autostart + Fcprel $Fdestdir/etc/xdg/autostart/gnome-settings-daemon.desktop usr/share/gnome/autostart/gnome-settings-daemon.desktop +} + # optimization OK From bouleetbil at frogdev.info Wed Oct 1 21:43:48 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Oct 1 21:43:49 2008 Subject: [Frugalware-git] bouleetbilgnome224: eog-2.24.0-1-i686 Message-ID: <20081001194348.D800F1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=f7bb1c375e6b8691b2b80d55f66839cb253cd9bc commit f7bb1c375e6b8691b2b80d55f66839cb253cd9bc Author: bouleetbil Date: Wed Oct 1 21:41:15 2008 +0200 eog-2.24.0-1-i686 *version bump diff --git a/source/gnome/eog/FrugalBuild b/source/gnome/eog/FrugalBuild index 8123302..ac93d99 100644 --- a/source/gnome/eog/FrugalBuild +++ b/source/gnome/eog/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Christian Hamar alias krix pkgname=eog -pkgver=2.22.2 +pkgver=2.24.0 pkgrel=1 pkgdesc="An image viewing and cataloging program for GNOME" -depends=('libexif' 'libgnomeui>=2.22.1' 'rarian' 'desktop-file-utils' \ - 'gnome-desktop>=2.22.2' 'lcms' 'pygtk' 'gnome-python' 'libart_lgpl') +depends=('libexif' 'libgnomeui>=2.24.0' 'rarian' 'desktop-file-utils' \ + 'gnome-desktop>=2.24.0' 'lcms' 'pygtk' 'gnome-python' 'libart_lgpl') makedepends=('intltool' 'gnome-doc-utils>=0.12.2') groups=('gnome') archs=('i686' 'x86_64' 'ppc') @@ -15,6 +15,6 @@ _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" _F_gnome_iconcache="y" Finclude gnome gnome-scriptlet -sha1sums=('b9091c25b31fea262c9557d1148f5e6d4af08f9e') +sha1sums=('a36bcd101e19046f8b04b4f87dfa6a468c385b92') # optimization OK From bouleetbil at frogdev.info Wed Oct 1 21:54:11 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Oct 1 21:54:12 2008 Subject: [Frugalware-git] bouleetbilgnome224: gconf-editor-2.24.0.1-1-i686 Message-ID: <20081001195411.832F91190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=c97280cb912964839f8a540190e8a2cf3a0ba702 commit c97280cb912964839f8a540190e8a2cf3a0ba702 Author: bouleetbil Date: Wed Oct 1 21:51:48 2008 +0200 gconf-editor-2.24.0.1-1-i686 *version bump diff --git a/source/gnome/gconf-editor/FrugalBuild b/source/gnome/gconf-editor/FrugalBuild index 8ec6df2..f2afabd 100644 --- a/source/gnome/gconf-editor/FrugalBuild +++ b/source/gnome/gconf-editor/FrugalBuild @@ -2,18 +2,19 @@ # Maintainer: Christian Hamar alias krix pkgname=gconf-editor -pkgver=2.22.0 +pkgver=2.24.0.1 pkgrel=1 pkgdesc="An editor for the GConf configuration system" url="http://www.gnome.org/" -depends=('libgnomeui>=2.22.0' 'rarian') +depends=('libgnomeui>=2.24.0' 'rarian') makedepends=('intltool' 'gnome-doc-utils>=0.10.1' 'perl-xml-parser') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') _F_gnome_schemas=('/etc/gconf/schemas/gconf-editor.schemas') _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" +_F_gnome_iconcache="y" Finclude gnome gnome-scriptlet +sha1sums=('090e80d050a9c4bb67361575e838cf0b8e3d978e') -sha1sums=('7ca44dbb09136203b37d7dd5398b62bcf15ee528') # optimization OK From bouleetbil at frogdev.info Wed Oct 1 22:09:26 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Oct 1 22:09:28 2008 Subject: [Frugalware-git] bouleetbilgnome224: gnome-utils-2.24.0-1-i686 Message-ID: <20081001200926.D24C51190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=e0be175587addc771959fdafb0d7da1ca50b563d commit e0be175587addc771959fdafb0d7da1ca50b563d Author: bouleetbil Date: Wed Oct 1 22:05:52 2008 +0200 gnome-utils-2.24.0-1-i686 *version bump diff --git a/source/gnome/gnome-utils/FrugalBuild b/source/gnome/gnome-utils/FrugalBuild index 3f2417e..f49d2cf 100644 --- a/source/gnome/gnome-utils/FrugalBuild +++ b/source/gnome/gnome-utils/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-utils -pkgver=2.20.0.1 -pkgrel=3 +pkgver=2.24.0 +pkgrel=1 pkgdesc="GNOME utilities" url="http://www.gnome.org/" -depends=('libgnomeprintui>=2.18.0' 'gnome-panel>=2.22.0' 'e2fsprogs' 'rarian' \ - 'desktop-file-utils' 'hal>=0.5.8.1-4' 'libgtop>=2.22.0' 'gnome-vfs>=2.22.0' \ +depends=('libgnomeprintui>=2.18.0' 'gnome-panel>=2.24.0' 'e2fsprogs' 'rarian' \ + 'desktop-file-utils' 'hal>=0.5.8.1-4' 'libgtop>=2.24.0' 'gnome-vfs>=2.24.0' \ 'dbus-glib>=0.71' 'avahi-glib>=0.6.17') makedepends=('intltool' 'gnome-doc-utils>=0.10.0' 'gtk-doc') groups=('gnome' 'gnome-minimal') @@ -25,5 +25,5 @@ _F_gnome_iconcache="y" Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --enable-hal --enable-ipv6 --disable-gtk-doc --enable-gfloppy=yes" -sha1sums=('21aedfa39d2b937cf6e2ad697378dbecbe838dc7') +sha1sums=('82144b0804b9f612eaec818a9acfdbe149d9c894') # optimization OK From bouleetbil at frogdev.info Wed Oct 1 22:19:56 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Oct 1 22:19:58 2008 Subject: [Frugalware-git] bouleetbilgnome224: gnome-system-monitor-2.24.0-1-i686 Message-ID: <20081001201956.86FA31190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=cf6716f824d3a9aa25ebbc85d7cb5d7e810e92eb commit cf6716f824d3a9aa25ebbc85d7cb5d7e810e92eb Author: bouleetbil Date: Wed Oct 1 22:17:09 2008 +0200 gnome-system-monitor-2.24.0-1-i686 *version bump diff --git a/source/gnome/gnome-system-monitor/FrugalBuild b/source/gnome/gnome-system-monitor/FrugalBuild index c301ec4..1d36efd 100644 --- a/source/gnome/gnome-system-monitor/FrugalBuild +++ b/source/gnome/gnome-system-monitor/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-system-monitor -pkgver=2.22.3 +pkgver=2.24.0 pkgrel=1 pkgdesc="A system monitor for GNOME" url="http://www.gnome.org/" -depends=('libgnomeui>=2.22.1' 'libgtop>=2.22.3' 'libwnck>=2.22.3' \ +depends=('libgnomeui>=2.24.0' 'libgtop>=2.24.0' 'libwnck>=2.22.3' \ 'rarian' 'libgksu>=2.0.6' 'libsexy' 'gnome-icon-theme' 'pcre' 'gtkmm>=2.12.7' 'librsvg') makedepends=('intltool' 'gnome-doc-utils>=0.12.2') groups=('gnome' 'gnome-minimal') @@ -15,6 +15,6 @@ _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" _F_gnome_schemas=('/etc/gconf/schemas/gnome-system-monitor.schemas') Finclude gnome gnome-scriptlet -sha1sums=('6778d4dfa3b3f555d98d14c6f24a1f6f74befe9f') +sha1sums=('fb999996b2838b49977b5ee6600cf9a986bbbab7') # optimization OK From bouleetbil at frogdev.info Wed Oct 1 22:25:43 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Oct 1 22:25:44 2008 Subject: [Frugalware-git] bouleetbilgnome224: gcalctool-5.24.0-1-i686 Message-ID: <20081001202543.866811190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=97cff49df27ef0594f625c9271d6ddcb8965ddf2 commit 97cff49df27ef0594f625c9271d6ddcb8965ddf2 Author: bouleetbil Date: Wed Oct 1 22:23:15 2008 +0200 gcalctool-5.24.0-1-i686 *version bump diff --git a/source/gnome/gcalctool/FrugalBuild b/source/gnome/gcalctool/FrugalBuild index 2eee91c..53d462b 100644 --- a/source/gnome/gcalctool/FrugalBuild +++ b/source/gnome/gcalctool/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Christian Hamar alias krix pkgname=gcalctool -pkgver=5.22.1 +pkgver=5.24.0 pkgrel=1 pkgdesc="A scientific calculator for GNOME" url="http://www.gnome.org/" -depends=('rarian' 'libbonobo>=2.22.0' 'gtk+2>=2.12.9' 'gconf>=2.22.0' 'libglade') +depends=('rarian' 'libbonobo>=2.24.0' 'gtk+2>=2.14.3' 'gconf>=2.24.0' 'libglade') makedepends=('intltool' 'gnome-doc-utils>=0.10.0') groups=('gnome') archs=('i686' 'x86_64' 'ppc') @@ -14,6 +14,6 @@ _F_gnome_schemas=('/etc/gconf/schemas/gcalctool.schemas') _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" Finclude gnome gnome-scriptlet -sha1sums=('8436067dfb3e91338abf236c4b229ae435aa3681') +sha1sums=('f3379dbeddbb9582f9fd60497ab7d85094f52602') # optimization OK From bouleetbil at frogdev.info Wed Oct 1 22:29:49 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Oct 1 22:29:49 2008 Subject: [Frugalware-git] bouleetbilgnome224: zenity-2.24.0-1-i686 Message-ID: <20081001202949.61D241190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=4f328b53792b0893a0dac155c5e997847b1bc9ef commit 4f328b53792b0893a0dac155c5e997847b1bc9ef Author: bouleetbil Date: Wed Oct 1 22:27:09 2008 +0200 zenity-2.24.0-1-i686 *version bump diff --git a/source/gnome/zenity/FrugalBuild b/source/gnome/zenity/FrugalBuild index 89f6d9c..cd61eef 100644 --- a/source/gnome/zenity/FrugalBuild +++ b/source/gnome/zenity/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=zenity -pkgver=2.22.1 +pkgver=2.24.0 pkgrel=1 pkgdesc="A rewrite of gdialog" url="http://www.gnome.org/" @@ -13,6 +13,6 @@ groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') _F_gnome_scrollkeeper="y" Finclude gnome gnome-scriptlet +sha1sums=('f0e7239e8934de89f9722fbbb2b1e7fb636afd0d') -sha1sums=('776c5c84ad07bb87ba2f796ace8268aa298b0819') # optimization OK From bouleetbil at frogdev.info Wed Oct 1 22:36:05 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Oct 1 22:36:06 2008 Subject: [Frugalware-git] bouleetbilgnome224: at-spi-1.24.0-1-i686 Message-ID: <20081001203605.490311190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=437ce439e48a9efed020f99efd2dd2725b99fc63 commit 437ce439e48a9efed020f99efd2dd2725b99fc63 Author: bouleetbil Date: Wed Oct 1 22:33:45 2008 +0200 at-spi-1.24.0-1-i686 *version bump diff --git a/source/gnome/at-spi/FrugalBuild b/source/gnome/at-spi/FrugalBuild index 79125e5..b12439d 100644 --- a/source/gnome/at-spi/FrugalBuild +++ b/source/gnome/at-spi/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: Christian Hamar alias krix pkgname=at-spi -pkgver=1.22.1 +pkgver=1.24.0 pkgrel=1 pkgdesc="The Gnome Accessibility Toolkit" -depends=('gtk+2>=2.12.9' 'gail>=1.22.1' 'libbonobo>=2.22.0' 'libxtst' 'libxevie') -makedepends=('gtk-doc' 'perl-xml-parser') +depends=('gtk+2>=2.14.3' 'gail>=1.22.1' 'libbonobo>=2.22.0' 'libxtst' 'libxevie') +makedepends=('gtk-doc' 'perl-xml-parser' 'intltool') groups=('gnome') archs=('i686' 'x86_64' 'ppc') Finclude gnome url="http://developer.gnome.org/projects/gap/" Fconfopts="$Fconfopts --enable-gtk-doc" +sha1sums=('9c1349e27617d7a2006e76101e5b12c721e07e1a') -sha1sums=('b7dca093dbe9617e65a0c44ec0e255700a2ab048') # optimization OK From bouleetbil at frogdev.info Wed Oct 1 23:00:32 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Oct 1 23:00:34 2008 Subject: [Frugalware-git] bouleetbilgnome224: epiphany-2.24.0.1-1-i686 Message-ID: <20081001210032.B06D51190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=eaac9397ea94700b1f925541745b484f7967a92c commit eaac9397ea94700b1f925541745b484f7967a92c Author: bouleetbil Date: Wed Oct 1 22:57:22 2008 +0200 epiphany-2.24.0.1-1-i686 *version bump diff --git a/source/gnome-extra/epiphany/FrugalBuild b/source/gnome-extra/epiphany/FrugalBuild index 1f92987..e04c4ab 100644 --- a/source/gnome-extra/epiphany/FrugalBuild +++ b/source/gnome-extra/epiphany/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Christian Hamar alias krix pkgname=epiphany -pkgver=2.22.2 +pkgver=2.24.0.1 pkgrel=1 pkgdesc="GNOME webbrowser based on the mozilla rendering engine" url="http://www.gnome.org/projects/epiphany/" -depends=('libstdc++' 'dbus-x11' 'atk' 'libxslt' 'gnome-desktop>=2.22.2' 'startup-notification' \ +depends=('libstdc++' 'dbus-x11' 'atk' 'libxslt' 'gnome-desktop>=2.24.0' 'startup-notification' \ 'xulrunner>=1.8.1.3' 'docbook-xsl') -makedepends=('pygtk>=2.12.1' 'gtk-doc>=1.9' 'perl-xml-parser' 'python>=2.5' 'gnome-python>=2.22.0' 'iso-codes' 'gnome-doc-utils>=0.12.2') +makedepends=('pygtk>=2.12.1' 'gtk-doc>=1.9' 'perl-xml-parser' 'python>=2.5' 'gnome-python>=2.22.1' 'iso-codes' 'gnome-doc-utils>=0.12.2' 'intltool') _F_gnome_schemas=('/etc/gconf/schemas/epiphany.schemas' '/etc/gconf/schemas/epiphany-lockdown.schemas' '/etc/gconf/schemas/epiphany-pango.schemas' @@ -21,6 +21,6 @@ groups=('gnome-extra') archs=('x86_64' 'i686') Fconfopts="$Fconfopts -with-gecko=xulrunner \ --enable-python --enable-certificate-manager --disable-gtk-doc" -sha1sums=('bd57901dec8684e6f39bfadb426eac475a353a97') +sha1sums=('5cea9f40c25fb6be2d281625862f8443c094e8dc') # optimization OK From bouleetbil at frogdev.info Wed Oct 1 23:13:23 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Oct 1 23:13:24 2008 Subject: [Frugalware-git] bouleetbilgnome224: epiphany-extensions-2.24.0-1-i686 Message-ID: <20081001211323.9327A1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=e3d60e1e4dd4c9818b037d61a1c8e3cdcd5e074d commit e3d60e1e4dd4c9818b037d61a1c8e3cdcd5e074d Author: bouleetbil Date: Wed Oct 1 23:10:57 2008 +0200 epiphany-extensions-2.24.0-1-i686 *version bump diff --git a/source/gnome-extra/epiphany-extensions/FrugalBuild b/source/gnome-extra/epiphany-extensions/FrugalBuild index 94daebf..9e26e96 100644 --- a/source/gnome-extra/epiphany-extensions/FrugalBuild +++ b/source/gnome-extra/epiphany-extensions/FrugalBuild @@ -2,18 +2,18 @@ # Maintainer: Christian Hamar alias krix pkgname=epiphany-extensions -pkgver=2.22.2 -pkgrel=2 +pkgver=2.24.0 +pkgrel=1 pkgdesc="Extensions for epiphany web browser" url="http://www.gnome.org/projects/epiphany/extensions" -depends=('opensp' 'nss>=3.12' 'nspr>=4.7.1' 'pcre' 'epiphany>=2.22.2') -makedepends=('perl-xml-parser' 'gnome-doc-utils>=0.12.2') +depends=('opensp' 'nss>=3.12' 'nspr>=4.7.1' 'pcre' 'epiphany>=2.24.0.1') +makedepends=('perl-xml-parser' 'gnome-doc-utils>=0.12.2' 'intltool') _F_gnome_scrollkeeper="y" Finclude gnome gnome-scriptlet license="GPL2" groups=('gnome-extra') archs=('x86_64' 'i686') Fconfopts="$Fconfopts --with-gecko=xulrunner --with-extensions=really-all" -sha1sums=('0dff50f48a14e01dc358fa484b218f6d6a7f5519') +sha1sums=('802d42fe002bcb045ae7c760ba7c872e0fc2406b') # optimization OK From vmiklos at frugalware.org Wed Oct 1 23:52:32 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Oct 1 23:52:34 2008 Subject: [Frugalware-git] frugalware-current: yaboot-1.3.14-3-ppc Message-ID: <20081001215232.DC6D31190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=de4e36d674538e48c0bd2b9f4a5f205791607549 commit de4e36d674538e48c0bd2b9f4a5f205791607549 Author: Miklos Vajna Date: Wed Oct 1 23:51:55 2008 +0200 yaboot-1.3.14-3-ppc add two files which are essential to generate any bootable yaboot-enabled cd diff --git a/source/base/yaboot/FrugalBuild b/source/base/yaboot/FrugalBuild index 0916863..be6754e 100644 --- a/source/base/yaboot/FrugalBuild +++ b/source/base/yaboot/FrugalBuild @@ -3,7 +3,7 @@ pkgname=yaboot pkgver=1.3.14 -pkgrel=2 +pkgrel=3 pkgdesc="Yaboot is an OpenFirmware bootloader for OpenFirmware based machines" url="http://yaboot.ozlabs.org" groups=('base') @@ -11,17 +11,18 @@ depends=('hfsutils' 'hfsplus' 'mac-fdisk' 'powerpc-utils') backup=('etc/yaboot.conf') archs=('!i686' '!x86_64' 'ppc') up2date="Flasttar $url/releases" -source=($url/releases/yaboot-$pkgver.tar.gz) -sha1sums=('2bf7594a921075371acf468a46776d0f93e315a6') - -# TODO: add some config tool, generating the config file could be done -# almost automatically +source=($url/releases/yaboot-$pkgver.tar.gz maps ofboot.b) +sha1sums=('2bf7594a921075371acf468a46776d0f93e315a6' \ + '9f9b0823cb2d46886a5e29fbb9353ad94138802f' \ + '27c3889abd59a0924a2e39830bb1d5dd003032f5') build() { Fpatchall Fmake PREFIX=/usr Fmakeinstall ROOT=$Fdestdir PREFIX=/usr + Ffile /usr/lib/yaboot/maps + Ffile /usr/lib/yaboot/ofboot.b } # optimization OK diff --git a/source/base/yaboot/maps b/source/base/yaboot/maps new file mode 100644 index 0000000..d46dfe3 --- /dev/null +++ b/source/base/yaboot/maps @@ -0,0 +1,11 @@ +# This mapping is needed to successfully boot and to keep macos from +# treating everything like a text file (ugly!) +# +# EXTN XLate CREATOR TYPE Comment +.b Raw 'UNIX' 'tbxi' "bootstrap" +yaboot Raw 'UNIX' 'boot' "bootstrap" +linux Raw 'UNIX' 'boot' "kernel" +.conf Raw 'UNIX' 'conf' "bootstrap" +root.bin Raw 'UNIX' 'root' "root_image" +* Raw 'UNIX' 'UNIX' "unix" + diff --git a/source/base/yaboot/ofboot.b b/source/base/yaboot/ofboot.b new file mode 100644 index 0000000..483bac7 --- /dev/null +++ b/source/base/yaboot/ofboot.b @@ -0,0 +1,13 @@ + + +MacRISC MacRISC3 MacRISC4 + + +Frugalware Linux PPC bootloader + + +" screen" output +load-base release-load-area +boot cd:,\boot\yaboot\yaboot + + From voroskoi at frugalware.org Wed Oct 1 23:57:32 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Oct 1 23:57:33 2008 Subject: [Frugalware-git] frugalware-current: kdebase-3.5.9-4-x86_64 Message-ID: <20081001215732.61C4E1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9c3c04244196c69f096a55722e2d065fb5a99094 commit 9c3c04244196c69f096a55722e2d065fb5a99094 Author: voroskoi Date: Wed Oct 1 23:56:54 2008 +0200 kdebase-3.5.9-4-x86_64 rebuilt with libraw>=2.0 diff --git a/source/kde/kdebase/FrugalBuild b/source/kde/kdebase/FrugalBuild index 9044090..d125fff 100644 --- a/source/kde/kdebase/FrugalBuild +++ b/source/kde/kdebase/FrugalBuild @@ -3,9 +3,9 @@ pkgname=kdebase pkgver=3.5.9 -pkgrel=3 +pkgrel=4 pkgdesc="KDE Base Programs." -depends=('libxcomposite' 'libxscrnsaver' 'kdelibs>=3.5.9' 'libraw1394' 'hal>=0.5.7.1-3' 'mtools' 'libxdamage' \ +depends=('libxcomposite' 'libxscrnsaver' 'kdelibs>=3.5.9' 'libraw1394>=2.0' 'hal>=0.5.7.1-3' 'mtools' 'libxdamage' \ 'xscreensaver-data' 'bdftopcf' 'lmsensors' 'libxxf86misc' 'libfontenc' \ 'setxkbmap' 'dbus-qt3>=20060814' 'libsmbclient>=3.0.24-2' 'xkeyboard-config' 'cyrus-sasl>=2.1.22-8' 'libldap') makedepends=('samba' 'imake' 'doxygen' 'qt-docs' 'graphviz' 'openldap' 'java-gcj-compat') From voroskoi at frugalware.org Thu Oct 2 00:14:28 2008 From: voroskoi at frugalware.org (voroskoi) Date: Thu Oct 2 00:14:30 2008 Subject: [Frugalware-git] frugalware-current: drscheme-4.1-1-i686 Message-ID: <20081001221428.812621190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b5aa6e30f60a481d6660420e75a549cc882372fe commit b5aa6e30f60a481d6660420e75a549cc882372fe Author: voroskoi Date: Thu Oct 2 00:13:47 2008 +0200 drscheme-4.1-1-i686 version bump diff --git a/source/xapps-extra/drscheme/FrugalBuild b/source/xapps-extra/drscheme/FrugalBuild index fbbc262..f499c42 100644 --- a/source/xapps-extra/drscheme/FrugalBuild +++ b/source/xapps-extra/drscheme/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=drscheme -pkgver=371 +pkgver=4.1 pkgrel=1 pkgdesc="DrScheme is an interactive, integrated, graphical programming environment for the Scheme, MzScheme, and MrEd programming languages." url="http://download.plt-scheme.org/drscheme/" @@ -12,7 +12,7 @@ groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://download.plt-scheme.org/drscheme/ |grep 'Version:'|sed -e 's/.*: \(.*\) /\1/' -e 's/ .*//'" source=(http://gd.tuwien.ac.at/languages/scheme/plt/$pkgver/plt/plt-$pkgver-src-unix.tgz) -sha1sums=('a6cefadbc7561e0ab506c04ff6185ea10f7a9bcf') +sha1sums=('12b0de3ea1255a40c7c184105a6272d4bd4d8c1b') build() { From voroskoi at frugalware.org Thu Oct 2 00:18:12 2008 From: voroskoi at frugalware.org (voroskoi) Date: Thu Oct 2 00:18:13 2008 Subject: [Frugalware-git] frugalware-current: kino-1.3.1-1-x86_64 Message-ID: <20081001221812.BD4891190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=57edcdb47ad0b4014a7442a0ede5c7cc2a3213ee commit 57edcdb47ad0b4014a7442a0ede5c7cc2a3213ee Author: voroskoi Date: Thu Oct 2 00:17:26 2008 +0200 kino-1.3.1-1-x86_64 version bump (rebuilt with libraw>=2.0) diff --git a/source/xapps-extra/kino/FrugalBuild b/source/xapps-extra/kino/FrugalBuild index e39d925..025ac6e 100644 --- a/source/xapps-extra/kino/FrugalBuild +++ b/source/xapps-extra/kino/FrugalBuild @@ -2,17 +2,18 @@ # Maintainer: voroskoi pkgname=kino -pkgver=1.3.0 +pkgver=1.3.1 pkgrel=1 pkgdesc="A non-linear DV editor." -makedepends=('perl-xml-parser') -depends=('libiec61883' 'libquicktime' 'libglade' 'libsamplerate' 'ffmpeg>=20080427-4') +makedepends=('perl-xml-parser' 'intltool') +depends=('libiec61883' 'libraw1394>=2.0' 'libquicktime' 'libglade' 'libsamplerate' 'ffmpeg>=20080427-4') rodepends=('dvdauthor' 'gpac') groups=('xapps-extra') archs=('i686' 'x86_64') options=('scriptlet') Finclude sourceforge up2date="lynx -dump http://kino.schirmacher.de/article/static/1 |grep kino.*tar |sed -ne 's/.*o-\(.*\).tar.*/\1/;1p'" +sha1sums=('187dcb19e66b2642c7ce3bba2ad87a3aa4a6caab') build() { Fcd @@ -23,6 +24,5 @@ build() { Fln kino $Fprefix/bin/kino2raw Fmv /etc/udev/rules.d/kino.rules /etc/udev/rules.d/99-kino.rules } -sha1sums=('272860f89888a5e475a8dd792c6d8df2f7128695') # optimization OK From voroskoi at frugalware.org Thu Oct 2 00:48:37 2008 From: voroskoi at frugalware.org (voroskoi) Date: Thu Oct 2 00:48:38 2008 Subject: [Frugalware-git] frugalware-current: rubygems-1.3.0-1-i686 Message-ID: <20081001224837.076D41190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=67778c09e086066d8a048e764016c8927e77f8ba commit 67778c09e086066d8a048e764016c8927e77f8ba Author: voroskoi Date: Thu Oct 2 00:46:26 2008 +0200 rubygems-1.3.0-1-i686 version bump diff --git a/source/devel-extra/rubygems/FrugalBuild b/source/devel-extra/rubygems/FrugalBuild index 49ff8fb..df5b094 100644 --- a/source/devel-extra/rubygems/FrugalBuild +++ b/source/devel-extra/rubygems/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: voroskoi pkgname=rubygems -pkgver=1.2.0 -pkgid=38646 +pkgver=1.3.0 +pkgid=43985 pkgrel=1 pkgdesc="RubyGems is the Ruby standard for publishing and managing third party libraries." url="http://docs.rubygems.org/" @@ -12,7 +12,7 @@ groups=('devel-extra') archs=('i686' 'x86_64') source=(http://rubyforge.org/frs/download.php/$pkgid/rubygems-$pkgver.tgz libdir.diff) up2date='lynx -dump "http://rubyforge.org/frs/?group_id=126" | grep "rubygems.*.tgz" | head -n 1 | sed "s/.*rubygems-\(.*\).tgz.*/\1/"' -sha1sums=('89f8e35f03e1e8057cc8e237f2df025642653dde' \ +sha1sums=('399f55d7d6b57fa575b6b7f61264eded79be6b6f' \ '6fa1eb815bdc3dc59d1bb40731ca4a634c891f8b') build() { From voroskoi at frugalware.org Thu Oct 2 01:00:23 2008 From: voroskoi at frugalware.org (voroskoi) Date: Thu Oct 2 01:00:24 2008 Subject: [Frugalware-git] frugalware-current: scons-1.0.1-1-i686 Message-ID: <20081001230023.62FF91190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cf98afdfd870d6b2f564ab008a63265655f1c1b4 commit cf98afdfd870d6b2f564ab008a63265655f1c1b4 Author: voroskoi Date: Thu Oct 2 01:00:08 2008 +0200 scons-1.0.1-1-i686 version bump diff --git a/source/devel-extra/scons/FrugalBuild b/source/devel-extra/scons/FrugalBuild index ab5e362..772a9cb 100644 --- a/source/devel-extra/scons/FrugalBuild +++ b/source/devel-extra/scons/FrugalBuild @@ -3,13 +3,12 @@ # Maintainer: voroskoi pkgname=scons -pkgver=0.98.5 +pkgver=1.0.1 pkgrel=1 pkgdesc="SCons is an Open Source software construction tool, a next-generation build tool." -_F_sourceforge_broken_up2date=1 Finclude sourceforge url="http://www.scons.org/" depends=('python') groups=('devel-extra') archs=('i686' 'x86_64') -sha1sums=('d2ab8835fe850c6aea1ae22fb3f4eea777feee14') +sha1sums=('6129dd665d6be1012c4d5762b349157cf92f5a70') From voroskoi at frugalware.org Thu Oct 2 01:10:28 2008 From: voroskoi at frugalware.org (voroskoi) Date: Thu Oct 2 01:10:30 2008 Subject: [Frugalware-git] frugalware-current: octave-financial-0.3.0-1-i686 Message-ID: <20081001231028.6C5771190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5d28f61a949c25dd80d6d62e6b7dcc6df722e9aa commit 5d28f61a949c25dd80d6d62e6b7dcc6df722e9aa Author: voroskoi Date: Thu Oct 2 01:10:14 2008 +0200 octave-financial-0.3.0-1-i686 version bump diff --git a/source/apps-extra/octave-financial/FrugalBuild b/source/apps-extra/octave-financial/FrugalBuild index 75abdf9..b7d83ef 100644 --- a/source/apps-extra/octave-financial/FrugalBuild +++ b/source/apps-extra/octave-financial/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=octave-financial -pkgver=0.2.2 +pkgver=0.3.0 pkgrel=1 pkgdesc="Financial manipulation and plotting functions." _F_sourceforge_dirname="octave" @@ -11,4 +11,4 @@ Finclude sourceforge octave depends=('octave>=3.0.0') groups=('apps-extra') archs=('i686' 'x86_64') -sha1sums=('a4794419a403e248cf7438b1e1f9ebfb9122152b') +sha1sums=('75259b27505e25b7f430a7bc1025f48572824591') From voroskoi at frugalware.org Thu Oct 2 01:20:44 2008 From: voroskoi at frugalware.org (voroskoi) Date: Thu Oct 2 01:20:46 2008 Subject: [Frugalware-git] frugalware-current: octave-data-smoothing-1.1.1-1-i686 Message-ID: <20081001232044.9C68B11901A1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=35786675a65efb6d6f5eb2e43b8b914d61f6aba6 commit 35786675a65efb6d6f5eb2e43b8b914d61f6aba6 Author: voroskoi Date: Thu Oct 2 01:20:28 2008 +0200 octave-data-smoothing-1.1.1-1-i686 version bump diff --git a/source/apps-extra/octave-data-smoothing/FrugalBuild b/source/apps-extra/octave-data-smoothing/FrugalBuild index 2e55a95..02ac8c2 100644 --- a/source/apps-extra/octave-data-smoothing/FrugalBuild +++ b/source/apps-extra/octave-data-smoothing/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=octave-data-smoothing -pkgver=1.0.0 +pkgver=1.1.1 pkgrel=1 pkgdesc="Algorithms for smoothing noisy data." _F_sourceforge_dirname="octave" @@ -11,4 +11,4 @@ Finclude sourceforge octave depends=('octave>=3.0.0') groups=('apps-extra') archs=('i686' 'x86_64') -sha1sums=('c1b4d02db3409ea9c8dcaec5cbab8db7cd1db588') +sha1sums=('8f37c8158d16ce054da4f3855c9daf722efa36b2') From voroskoi at frugalware.org Thu Oct 2 01:31:59 2008 From: voroskoi at frugalware.org (voroskoi) Date: Thu Oct 2 01:32:01 2008 Subject: [Frugalware-git] frugalware-current: octave-bioinfo-0.1.1-1-i686 Message-ID: <20081001233159.39FE81190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5a9a7b47ee1b50be0a872c43ee3e945f1e6e10cb commit 5a9a7b47ee1b50be0a872c43ee3e945f1e6e10cb Author: voroskoi Date: Thu Oct 2 01:31:45 2008 +0200 octave-bioinfo-0.1.1-1-i686 version bump diff --git a/source/apps-extra/octave-bioinfo/FrugalBuild b/source/apps-extra/octave-bioinfo/FrugalBuild index c25a029..7ee3dd7 100644 --- a/source/apps-extra/octave-bioinfo/FrugalBuild +++ b/source/apps-extra/octave-bioinfo/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=octave-bioinfo -pkgver=0.1.0 +pkgver=0.1.1 pkgrel=1 pkgdesc="Bioinformatics manipulation." _F_sourceforge_dirname="octave" @@ -11,4 +11,4 @@ Finclude sourceforge octave depends=('octave>=3.0.0') groups=('apps-extra') archs=('i686' 'x86_64') -sha1sums=('eaea4c8add2b9b7ebca5a69661f1d1ff1e2f19da') +sha1sums=('327892390d5e6a90b17a3c90964c8dbcdc5b2f51') From vmiklos at frugalware.org Thu Oct 2 01:37:44 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Oct 2 01:37:45 2008 Subject: [Frugalware-git] frugalware-current: strace-4.5.18-1-ppc Message-ID: <20081001233744.0D9A81190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3414b24c325d3f62b00692c89907e4a694eb715b commit 3414b24c325d3f62b00692c89907e4a694eb715b Author: Miklos Vajna Date: Thu Oct 2 01:37:27 2008 +0200 strace-4.5.18-1-ppc added ppc to archs() diff --git a/source/devel/strace/FrugalBuild b/source/devel/strace/FrugalBuild index 608eac0..5c23691 100644 --- a/source/devel/strace/FrugalBuild +++ b/source/devel/strace/FrugalBuild @@ -7,7 +7,7 @@ pkgrel=1 pkgdesc="A system call trace, which prints out a trace of all the system calls made by a another process/program." depends=('glibc') groups=('devel') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') _F_sourceforge_ext=".tar.bz2" Finclude sourceforge url="http://www.liacs.nl/~wichert/strace/" From voroskoi at frugalware.org Thu Oct 2 01:41:23 2008 From: voroskoi at frugalware.org (voroskoi) Date: Thu Oct 2 01:41:24 2008 Subject: [Frugalware-git] frugalware-current: octave-io-1.0.7-1-i686 Message-ID: <20081001234123.7F4261190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d6a96c3b8062c2922ff48d43a67d12af03884bb7 commit d6a96c3b8062c2922ff48d43a67d12af03884bb7 Author: voroskoi Date: Thu Oct 2 01:40:23 2008 +0200 octave-io-1.0.7-1-i686 version bump diff --git a/source/apps-extra/octave-io/FrugalBuild b/source/apps-extra/octave-io/FrugalBuild index 8be84c7..451711d 100644 --- a/source/apps-extra/octave-io/FrugalBuild +++ b/source/apps-extra/octave-io/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=octave-io -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=1 pkgdesc="Input/Output in external formats." _F_sourceforge_dirname="octave" @@ -11,4 +11,4 @@ Finclude sourceforge octave depends=('octave>=3.0.0') groups=('apps-extra') archs=('i686' 'x86_64') -sha1sums=('42d1b098109845e22732f14a8811541afb960a57') +sha1sums=('097409e37feb94d2b9cda5ab9432d3767a089dc1') From vmiklos at frugalware.org Thu Oct 2 01:56:43 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Oct 2 01:56:46 2008 Subject: [Frugalware-git] pacman-tools: implement mkbootmsg for yaboot Message-ID: <20081001235643.6C23C1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=daaacb9f655a419ad0467f5d50cae738542eca58 commit daaacb9f655a419ad0467f5d50cae738542eca58 Author: Miklos Vajna Date: Thu Oct 2 00:57:11 2008 +0200 implement mkbootmsg for yaboot diff --git a/mkiso/menu.c b/mkiso/menu.c index dacd12d..12d8168 100644 --- a/mkiso/menu.c +++ b/mkiso/menu.c @@ -64,3 +64,22 @@ char *mkmenu(volume_t *volume) free(kernel); return(flist); } + +char *mkbootmsg(volume_t *volume) +{ + char *flist = strdup("/tmp/mkiso_XXXXXX"); + FILE *fp; + char *kernel = detect_kernel(volume->arch); + + mkstemp(flist); + if(!(fp = fopen(flist, "w"))) + return(NULL); + + fprintf(fp, "Frugalware %s (%s) - %s\n\n", fst_ver, fst_codename, kernel); + fprintf(fp, "To boot the kernel, just hit enter, or use 'install'.\n\n"); + fprintf(fp, "If the system fails to boot at all (the typical symptom is a white screen which\n" + "doesn't go away), use 'install video=ofonly'.\n\n"); + fclose(fp); + free(kernel); + return(flist); +} diff --git a/mkiso/menu.h b/mkiso/menu.h index 86fc56e..642f6ca 100644 --- a/mkiso/menu.h +++ b/mkiso/menu.h @@ -1,7 +1,7 @@ /* * menu.h * - * Copyright (c) 2006 by Miklos Vajna + * Copyright (c) 2006, 2008 by Miklos Vajna * * 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 @@ -20,3 +20,5 @@ */ char *mkmenu(volume_t *volume); +char *mkbootmsg(volume_t *volume); +char *mkconf(volume_t *volume); From vmiklos at frugalware.org Thu Oct 2 01:56:43 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Oct 2 01:56:47 2008 Subject: [Frugalware-git] pacman-tools: implement mkconf for yaboot Message-ID: <20081001235643.897ED11901A1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=21f72111a85195b5ccd033956fb853c9a183be26 commit 21f72111a85195b5ccd033956fb853c9a183be26 Author: Miklos Vajna Date: Thu Oct 2 01:01:56 2008 +0200 implement mkconf for yaboot diff --git a/mkiso/menu.c b/mkiso/menu.c index 12d8168..c0f5e31 100644 --- a/mkiso/menu.c +++ b/mkiso/menu.c @@ -83,3 +83,30 @@ char *mkbootmsg(volume_t *volume) free(kernel); return(flist); } + +char *mkconf(volume_t *volume) +{ + char *flist = strdup("/tmp/mkiso_XXXXXX"); + FILE *fp; + char *kernel = detect_kernel(volume->arch); + char *ptr = g_strdup_printf("%s/boot/initrd-%s.img.gz", fst_root, volume->arch); + + mkstemp(flist); + if(!(fp = fopen(flist, "w"))) + return(NULL); + + fprintf(fp, "device=cd:\n" + "default=install\n" + "root=/dev/ram\n" + "message=boot/yaboot/boot.msg\n"); + fprintf(fp, "image=boot/vmlinux-%s\n", kernel); + fprintf(fp, "label=install\n"); + fprintf(fp, "\tinitrd=boot/initrd-%s.img.gz\n", volume->arch); + fprintf(fp, "\tinitrd-size=%d\n", gunzip_size(ptr)/1024); + fprintf(fp, "\tread-write\n"); + + fclose(fp); + free(ptr); + free(kernel); + return(flist); +} From vmiklos at frugalware.org Thu Oct 2 01:56:43 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Oct 2 01:56:47 2008 Subject: [Frugalware-git] pacman-tools: mkiso: add support for ppc Message-ID: <20081001235643.D3CC811901A5@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=96d4cddd2122ed7a47fa861d36ddae90a52b1351 commit 96d4cddd2122ed7a47fa861d36ddae90a52b1351 Author: Miklos Vajna Date: Thu Oct 2 01:14:40 2008 +0200 mkiso: add support for ppc diff --git a/mkiso/mkiso.c b/mkiso/mkiso.c index 12cfe54..8d5204d 100644 --- a/mkiso/mkiso.c +++ b/mkiso/mkiso.c @@ -254,9 +254,10 @@ int mkiso(volume_t *volume, int countonly, int stable, int dryrun) int total=0, myvolume=1, bootsize; char *fname=get_filename(fst_ver, volume->arch, volume->media, volume->serial); char *label=get_label(fst_ver, volume->arch, volume->media, volume->serial); - char *flist, *cmdline, *ptr, *kptr, *iptr, *menu; + char *flist, *cmdline = NULL, *ptr, *kptr, *iptr; char cwd[PATH_MAX] = ""; FILE *fp; + char *menu = NULL, *bootmsg = NULL, *conf = NULL; flist = strdup("/tmp/mkiso_XXXXXX"); mkstemp(flist); @@ -278,10 +279,20 @@ int mkiso(volume_t *volume, int countonly, int stable, int dryrun) bootsize = boot_size(fst_root, kptr, iptr); free(kptr); free(iptr); - iso_add(dryrun, fp, "boot/grub/message"); - iso_add(dryrun, fp, "boot/grub/stage2_eltorito"); - menu = mkmenu(volume); - fprintf(fp, "boot/grub/menu.lst=%s\n", menu); + if (!strcmp(volume->arch, "i686") || !strcmp(volume->arch, "x86_64")) { + menu = mkmenu(volume); + iso_add(dryrun, fp, "boot/grub/message"); + iso_add(dryrun, fp, "boot/grub/stage2_eltorito"); + fprintf(fp, "boot/grub/menu.lst=%s\n", menu); + } else if (!strcmp(volume->arch, "ppc")) { + bootmsg = mkbootmsg(volume); + conf = mkconf(volume); + iso_add(dryrun, fp, "boot/yaboot/maps"); + iso_add(dryrun, fp, "boot/yaboot/ofboot.b"); + iso_add(dryrun, fp, "boot/yaboot/yaboot"); + fprintf(fp, "boot/yaboot/boot.msg=%s\n", bootmsg); + fprintf(fp, "boot/yaboot/yaboot.conf=%s\n", conf); + } // first volume of !net medias if(volume->serial==1) { @@ -321,30 +332,55 @@ int mkiso(volume_t *volume, int countonly, int stable, int dryrun) getcwd(cwd, PATH_MAX); chdir(fst_root); - cmdline = g_strdup_printf("mkisofs -o %s " - "-R -J -V \"Frugalware Install\" " - "-A \"%s\" " - "-graft-points " - "-path-list %s " - "-hide-rr-moved " - "-b boot/grub/stage2_eltorito " - "-v -d -N -no-emul-boot -boot-load-size 4 -boot-info-table", - fname, label, flist); + if (!strcmp(volume->arch, "i686") || !strcmp(volume->arch, "x86_64")) { + cmdline = g_strdup_printf("mkisofs -o %s " + "-R -J -V \"Frugalware Install\" " + "-A \"%s\" " + "-graft-points " + "-path-list %s " + "-hide-rr-moved " + "-b boot/grub/stage2_eltorito " + "-v -d -N -no-emul-boot -boot-load-size 4 -boot-info-table", + fname, label, flist); + } else if (!strcmp(volume->arch, "ppc")) { + cmdline = g_strdup_printf("mkhybrid -o %s " + "-r -hfs-unlock -part -hfs -map ./boot/yaboot/maps " + "-no-desktop -hfs-volid \"Frugalware Install\" " + "-graft-points " + "-path-list %s", + fname, flist); + printf("debug, cmdline: %s\n", cmdline); + } ptr = g_strdup_printf("%s.lst", fname); if((fp=fopen(ptr, "w"))==NULL) return(1); free(ptr); isogrp_stat(fp); fclose(fp); - if(!countonly && !dryrun) + if(!countonly && !dryrun) { system(cmdline); + if (!strcmp(volume->arch, "ppc")) { + free(cmdline); + cmdline = g_strdup_printf("hmount %s", fname); + system(cmdline); + system("hattrib -b :boot:yaboot:"); + system("humount"); + } + } else if(!dryrun) PRINTF("expected volume number: %d\n", myvolume); free(fname); free(label); - unlink(menu); - free(menu); + if (!strcmp(volume->arch, "i686") || !strcmp(volume->arch, "x86_64")) { + unlink(menu); + free(menu); + } else if (!strcmp(volume->arch, "ppc")) { + unlink(bootmsg); + free(bootmsg); + unlink(conf); + free(conf); + } unlink(flist); free(flist); free(cmdline); From vmiklos at frugalware.org Thu Oct 2 01:56:43 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Oct 2 01:56:48 2008 Subject: [Frugalware-git] pacman-tools: mkiso: add support for vmlinux-like kernels Message-ID: <20081001235643.EFFB011901AB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=43e3d1286def935dd9903a13726e06cd4f6cd97d commit 43e3d1286def935dd9903a13726e06cd4f6cd97d Author: Miklos Vajna Date: Thu Oct 2 01:25:12 2008 +0200 mkiso: add support for vmlinux-like kernels diff --git a/mkiso/mkiso.c b/mkiso/mkiso.c index 8d5204d..e2d9e30 100644 --- a/mkiso/mkiso.c +++ b/mkiso/mkiso.c @@ -165,7 +165,13 @@ char *detect_kernel(char *arch) DIR *dir; struct dirent *ent; char *ptr = g_strdup_printf("%s/boot", fst_root); + char *kname = NULL; + if (!strcmp(arch, "i686") || !strcmp(arch, "x86_64")) { + kname = "vmlinuz-"; + } else if (!strcmp(arch, "ppc")) { + kname = "vmlinux-"; + } dir = opendir(ptr); free(ptr); if (!dir) @@ -174,10 +180,10 @@ char *detect_kernel(char *arch) { if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")) continue; - if(strstr(ent->d_name, "vmlinuz-") && strstr(ent->d_name, arch)) + if(strstr(ent->d_name, kname) && strstr(ent->d_name, arch)) { closedir(dir); - return(strdup(ent->d_name+strlen("vmlinuz-"))); + return(strdup(ent->d_name+strlen(kname))); } } closedir(dir); @@ -254,7 +260,7 @@ int mkiso(volume_t *volume, int countonly, int stable, int dryrun) int total=0, myvolume=1, bootsize; char *fname=get_filename(fst_ver, volume->arch, volume->media, volume->serial); char *label=get_label(fst_ver, volume->arch, volume->media, volume->serial); - char *flist, *cmdline = NULL, *ptr, *kptr, *iptr; + char *flist, *cmdline = NULL, *ptr, *kptr = NULL, *iptr; char cwd[PATH_MAX] = ""; FILE *fp; char *menu = NULL, *bootmsg = NULL, *conf = NULL; @@ -270,7 +276,11 @@ int mkiso(volume_t *volume, int countonly, int stable, int dryrun) iso_add(dryrun, fp, "LICENSE"); iso_add(dryrun, fp, "docs"); ptr = detect_kernel(volume->arch); - kptr = g_strdup_printf("boot/vmlinuz-%s", ptr); + if (!strcmp(volume->arch, "i686") || !strcmp(volume->arch, "x86_64")) { + kptr = g_strdup_printf("boot/vmlinuz-%s", ptr); + } else if (!strcmp(volume->arch, "ppc")) { + kptr = g_strdup_printf("boot/vmlinux-%s", ptr); + } free(ptr); iso_add(dryrun, fp, kptr); iptr = g_strdup_printf("boot/initrd-%s.img.gz", volume->arch); From voroskoi at frugalware.org Thu Oct 2 01:59:03 2008 From: voroskoi at frugalware.org (voroskoi) Date: Thu Oct 2 01:59:05 2008 Subject: [Frugalware-git] frugalware-current: unrar-3.8.3-1-i686 Message-ID: <20081001235903.27EFA1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1f4b525f4081672dc588ea6a16a16b5b52076a4e commit 1f4b525f4081672dc588ea6a16a16b5b52076a4e Author: voroskoi Date: Thu Oct 2 01:58:35 2008 +0200 unrar-3.8.3-1-i686 version bump diff --git a/source/apps-extra/unrar/FrugalBuild b/source/apps-extra/unrar/FrugalBuild index 2b8ea93..38fed91 100644 --- a/source/apps-extra/unrar/FrugalBuild +++ b/source/apps-extra/unrar/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=unrar -pkgver=3.8.2 +pkgver=3.8.3 pkgrel=1 pkgdesc="Uncompress rar files" url="http://www.rarlab.com/" @@ -11,8 +11,8 @@ depends=('libstdc++') groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/rar_add.htm |grep unrarsrc |sed 's/.*c-\(.*\).t.*/\1/'" -source=(http://www.rarlab.com/rar/unrarsrc-$pkgver.tar.gz \ - $pkgname-3.5.2-optimalization-fix.patch) +source=(http://www.rarlab.com/rar/unrarsrc-$pkgver.tar.gz) +sha1sums=('3b14c8b1ae43911e18c15a10d53db631d6ed6818') build() { Fcd $pkgname @@ -20,7 +20,5 @@ build() { make -f makefile.unix || Fdie Fexerel /usr/bin/unrar } -sha1sums=('9b04dae947a6697d035a08ede0730e932bf6ed81' \ - '265050fcbedceafba4ad8aff1cfc4390954e4203') # optimization OK diff --git a/source/apps-extra/unrar/unrar-3.5.2-optimalization-fix.patch b/source/apps-extra/unrar/unrar-3.5.2-optimalization-fix.patch deleted file mode 100644 index 2ed2e6e..0000000 --- a/source/apps-extra/unrar/unrar-3.5.2-optimalization-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur unrar.orig/makefile.unix unrar/makefile.unix ---- unrar.orig/makefile.unix 2005-05-27 21:53:56.000000000 +0000 -+++ unrar/makefile.unix 2005-05-27 21:54:16.000000000 +0000 -@@ -7,7 +7,7 @@ - - # Linux using GCC - CXX=g++ --CXXFLAGS=-O2 -+CXXFLAGS=${CFLAGS} - DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE - STRIP=strip - From voroskoi at frugalware.org Thu Oct 2 02:05:06 2008 From: voroskoi at frugalware.org (voroskoi) Date: Thu Oct 2 02:05:08 2008 Subject: [Frugalware-git] frugalware-current: rxvt-2.7.10-1-i686 Message-ID: <20081002000506.EB1121190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=52abc5571b3ecd139b83fc5386e1cb646a2aeb2f commit 52abc5571b3ecd139b83fc5386e1cb646a2aeb2f Author: voroskoi Date: Thu Oct 2 02:04:54 2008 +0200 rxvt-2.7.10-1-i686 fixed up2date diff --git a/source/x11-extra/rxvt/FrugalBuild b/source/x11-extra/rxvt/FrugalBuild index c429cc4..196cf49 100644 --- a/source/x11-extra/rxvt/FrugalBuild +++ b/source/x11-extra/rxvt/FrugalBuild @@ -9,9 +9,8 @@ pkgdesc="rxvt is a colour vt102 terminal emulator" depends=('libx11' 'libxt') groups=('x11-extra') archs=('i686' 'x86_64') +_F_sourceforge_realname="rxvt-dev" Finclude sourceforge -url="http://sourceforge.net/projects/rxvt" -up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=221|grep Latest|sed -n 's/.*]\(.*\) \[.*\].*/\1/;s/-/_/g;$ p'" source=($source CVE-2008-1142.patch) sha1sums=('dabb960d94703d4f81e9a9a50749210a2977ef2b' \ '57a89c98ce1cfd725d19d4148439b8bf72faba97') From vmiklos at frugalware.org Thu Oct 2 02:28:16 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Oct 2 02:28:18 2008 Subject: [Frugalware-git] frugalware-current: docs/install: fix ppc usb commands Message-ID: <20081002002816.617921190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=71284a13ee04fb3ebb3162c2d778ac8f2b6ec910 commit 71284a13ee04fb3ebb3162c2d778ac8f2b6ec910 Author: Miklos Vajna Date: Thu Oct 2 02:26:56 2008 +0200 docs/install: fix ppc usb commands the old version worked only with older yaboot version, the current one is ok with our packaged version as well. diff --git a/docs/install.txt b/docs/install.txt index ea97d84..3e24cf8 100644 --- a/docs/install.txt +++ b/docs/install.txt @@ -106,7 +106,7 @@ Example, in case the path is `/pci@f2000000/usb@1b`: ---- devalias usb0 /pci@f2000000/usb@1b -boot usb0/disk:2,\\:tbxi +boot usb0/disk:2,\yaboot ---- === TFTP image From vmiklos at frugalware.org Thu Oct 2 02:55:04 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Oct 2 02:55:08 2008 Subject: [Frugalware-git] setup: updates for 0.9.6 Message-ID: <20081002005504.D73601190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup.git;a=commitdiff;h=883a975f1b84a05cf04c0e96e63e6303a8f1ae2a commit 883a975f1b84a05cf04c0e96e63e6303a8f1ae2a Author: Miklos Vajna Date: Thu Oct 2 02:54:49 2008 +0200 updates for 0.9.6 diff --git a/NEWS b/NEWS index 19fcf38..bb29211 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +0.9.6 - fixed cd/dvd seach on eee pc + - initial ppc support 0.9.5 - add back libparted support which was removed accidently 0.9.4 - allow special chars in passwords - fix installation in case a depcycle is splitted to diff --git a/configure b/configure index 8168bd6..9477087 100755 --- a/configure +++ b/configure @@ -20,7 +20,7 @@ elif os.uname()[-1] == 'ppc': packages.extend(['mac-fdisk']) # when releasing a new setup, please update this. -version = "0.9.5" +version = "0.9.6" # parse our options parser = OptionParser(version="configure for Frugalware Setup v%s" % (version)) diff --git a/src/plugins/Makefile b/src/plugins/Makefile index 95ac206..0f05cbb 100644 --- a/src/plugins/Makefile +++ b/src/plugins/Makefile @@ -1,6 +1,6 @@ # Makefile for Frugalware Linux Setup # -# Copyright (C) 2005 by Miklos Vajna +# Copyright (C) 2005, 2006, 2007, 2008 by Miklos Vajna # # 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 diff --git a/src/plugins/formatdisk.c b/src/plugins/formatdisk.c index a040de5..2c5b7a8 100644 --- a/src/plugins/formatdisk.c +++ b/src/plugins/formatdisk.c @@ -1,7 +1,7 @@ /* * formatdisk.c for Frugalware setup * - * Copyright (c) 2005 by Miklos Vajna + * Copyright (c) 2005, 2006, 2007, 2008 by Miklos Vajna * * 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 diff --git a/src/plugins/loadsource.c b/src/plugins/loadsource.c index ce4f2f5..33cb2f3 100644 --- a/src/plugins/loadsource.c +++ b/src/plugins/loadsource.c @@ -1,7 +1,7 @@ /* * loadsource.c for Frugalware setup * - * Copyright (c) 2005 by Miklos Vajna + * Copyright (c) 2005, 2006, 2007, 2008 by Miklos Vajna * * 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 diff --git a/src/plugins/partdisk.c b/src/plugins/partdisk.c index e7382d3..d89aca1 100644 --- a/src/plugins/partdisk.c +++ b/src/plugins/partdisk.c @@ -1,7 +1,7 @@ /* * partdisk.c for Frugalware setup * - * Copyright (c) 2005 by Miklos Vajna + * Copyright (c) 2005, 2006, 2007, 2008 by Miklos Vajna * * 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 diff --git a/src/plugins/postconf.c b/src/plugins/postconf.c index 32e5a75..77dd7e0 100644 --- a/src/plugins/postconf.c +++ b/src/plugins/postconf.c @@ -1,7 +1,7 @@ /* * postconf.c for Frugalware setup * - * Copyright (c) 2005, 2008 by Miklos Vajna + * Copyright (c) 2005, 2006, 2007, 2008 by Miklos Vajna * * 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 From vmiklos at frugalware.org Thu Oct 2 03:06:02 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Oct 2 03:06:04 2008 Subject: [Frugalware-git] frugalware-current: fwsetup-0.9.5-1-ppc Message-ID: <20081002010602.CD9CE1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2bc0e9ca62872addc750b6084b56fe37aacfe4c7 commit 2bc0e9ca62872addc750b6084b56fe37aacfe4c7 Author: Miklos Vajna Date: Thu Oct 2 03:05:12 2008 +0200 fwsetup-0.9.5-1-ppc prepare ppc support. do not add ppc to archs yet in this version, but mark grub as x86-specific and such. diff --git a/source/devel-extra/fwsetup/FrugalBuild b/source/devel-extra/fwsetup/FrugalBuild index 54f5e0c..c9be58e 100644 --- a/source/devel-extra/fwsetup/FrugalBuild +++ b/source/devel-extra/fwsetup/FrugalBuild @@ -10,7 +10,13 @@ pkgrel=1 pkgdesc="Frugalware Setup" url="http://ftp.frugalware.org/pub/other/setup/" depends=() -makedepends=('dialog' 'parted' 'pacman-g2>=3.5.5' 'module-init-tools' 'frugalware>=0.9' 'grub') +makedepends=('dialog' 'parted' 'pacman-g2>=3.5.5' 'module-init-tools' 'frugalware>=0.9') +if [ "$CARCH" != "ppc" ]; then + Fconfopts="$Fconfopts --enable-tftp" + makedepends=(${makedepends[@]} 'grub') +else + makedepends=(${makedepends[@]} 'yaboot' 'hfsutils') +fi groups=('devel-extra') archs=('i686' 'x86_64') _F_archive_nosort=y @@ -34,7 +40,7 @@ build() Funpack_scm make prepare fi - Fbuild --repo=current --enable-usb --enable-tftp + Fbuild --repo=current --enable-usb } # optimization OK From vmiklos at frugalware.org Thu Oct 2 03:13:15 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Oct 2 03:13:15 2008 Subject: [Frugalware-git] frugalware-current: docs/install: add external cd drive commands (ppc-specific) Message-ID: <20081002011315.4BB101190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b9209b38d09bc9d10436ccc480309e2162fe67e6 commit b9209b38d09bc9d10436ccc480309e2162fe67e6 Author: Miklos Vajna Date: Thu Oct 2 03:03:05 2008 +0200 docs/install: add external cd drive commands (ppc-specific) diff --git a/docs/install.txt b/docs/install.txt index 3e24cf8..6910349 100644 --- a/docs/install.txt +++ b/docs/install.txt @@ -13,6 +13,22 @@ you need a graphical system, then you'll need the second CD as well. NOTE: Don't download CDs 3-11 unless you don't have an internet connection! You can install language packs later from FTP servers if you need them. +On PPC, to boot from an external CD drive, you will need to use the Open +Firmware prompt, since Open Firmware does not search external optical +devices by default. To get to the prompt, hold down Command+Option+o+f +all together while booting. + +You will need to work out where the optical device appears in the device +tree. Type `dev / ls` and `devalias` at the Open Firmware prompt to get +a list of all known devices and device aliases. + +Example, in case the path is `/pci@f2000000/usb@1b/disk@1`: + +---- +devalias cd /pci@f2000000/usb@1b/disk@1 +boot cd:,\\:tbxi +---- + === Installing from DVD If you don't have any Internet connection but you want language packs and From vmiklos at frugalware.org Thu Oct 2 03:13:15 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Oct 2 03:13:16 2008 Subject: [Frugalware-git] frugalware-current: docs/install: document how to do a netinstall without burning an iso Message-ID: <20081002011315.6D17511901A1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2950bee2c5ce02bd76d64b7d404cea90f2244fe3 commit 2950bee2c5ce02bd76d64b7d404cea90f2244fe3 Author: Miklos Vajna Date: Thu Oct 2 03:13:06 2008 +0200 docs/install: document how to do a netinstall without burning an iso diff --git a/docs/install.txt b/docs/install.txt index 6910349..3fd091f 100644 --- a/docs/install.txt +++ b/docs/install.txt @@ -51,6 +51,24 @@ or unnecessary packages. Cons: No offline installation possible, high bandwidth or hours of patience required for a full installation. +An alternate way of doing this is to just copy the contents of the ISO +image to your hard drive and use your existing boot manager to boot it. + +Typically you can add a new entry to your existing GRUB installation on +i686 or x86_64 (in this case you just have to copy the commands from the +`menu.lst` file from the image) or you can boot yaboot from Open +Firmware on PPC. (See below on how to invoke Open Firmware.) Once you +have the Open Firmware prompt, for example in case the `boot` directory +is copied to the root directory of the 5th partition of your hard disk: + +---- +boot hd:5,\boot\yaboot\yaboot +---- + +Pros: No USB stick or (re)writeable CD needed. + +Cons: Possible only in case you have some kind of bootloader available. + === USB image This is a filesystem image, similar to the network install ISO image. From vmiklos at frugalware.org Thu Oct 2 03:15:45 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Oct 2 03:15:46 2008 Subject: [Frugalware-git] frugalware-current: fwsetup-0.9.6-1-i686 Message-ID: <20081002011545.8C1771190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4275721d9120e0d0c92f96386cff0011fb143130 commit 4275721d9120e0d0c92f96386cff0011fb143130 Author: Miklos Vajna Date: Thu Oct 2 03:15:36 2008 +0200 fwsetup-0.9.6-1-i686 - version bump diff --git a/source/devel-extra/fwsetup/FrugalBuild b/source/devel-extra/fwsetup/FrugalBuild index c9be58e..56c59a7 100644 --- a/source/devel-extra/fwsetup/FrugalBuild +++ b/source/devel-extra/fwsetup/FrugalBuild @@ -4,7 +4,7 @@ USE_DEVEL=${USE_DEVEL:-"n"} pkgname=fwsetup -pkgver=0.9.5 +pkgver=0.9.6 Fuse $USE_DEVEL && pkgver=0.8.8.9.gd348556 pkgrel=1 pkgdesc="Frugalware Setup" From ryuo at frugalware.org Thu Oct 2 03:54:25 2008 From: ryuo at frugalware.org (James Buren) Date: Thu Oct 2 03:54:26 2008 Subject: [Frugalware-git] frugalware-current: kbstick-0.80-1-i686 Message-ID: <20081002015425.7EC1D1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b833c7db959d9a70d975037962f49e03058e7dcf commit b833c7db959d9a70d975037962f49e03058e7dcf Author: James Buren Date: Wed Oct 1 20:54:56 2008 -0500 kbstick-0.80-1-i686 * new package diff --git a/source/xapps-extra/kbstick/FrugalBuild b/source/xapps-extra/kbstick/FrugalBuild new file mode 100644 index 0000000..4b4f343 --- /dev/null +++ b/source/xapps-extra/kbstick/FrugalBuild @@ -0,0 +1,30 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=kbstick +pkgver=0.80 +pkgrel=1 +pkgdesc="A tool for converting joystick events to keyboard events." +url="http://www.ditch.org/kbstick/" +depends=('libxtst' 'glibc') +groups=('xapps-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump '$url' | grep 'Version ' | head -n1 | sed 's|^.*Version \(.*\) p.*$|\1|'" +source=($url/qstick.tar.gz $pkgname.conf $pkgname) +options=('nodocs') +backup=("etc/$pkgname.conf") +sha1sums=('33a1009bf0ae6587fff7b7d54976a9bb69bd0d0b' \ + '57c869da6b7127860c95ad22baba3d85061229c1' \ + '5fef37615702de1e28f1f378c9ea3b49b500950e') + +build() +{ + Fsed "-I/usr/X11R6/include" "-I/usr/X11R6/include ${CFLAGS}" Makefile + Fmake + Ffile /etc/$pkgname.conf + Fexerel $pkgname /usr/bin/$pkgname-bin + Fexe /usr/bin/$pkgname + Fdocrel CREDITS +} + +# optimization OK diff --git a/source/xapps-extra/kbstick/README.Frugalware b/source/xapps-extra/kbstick/README.Frugalware new file mode 100644 index 0000000..3b7e9fb --- /dev/null +++ b/source/xapps-extra/kbstick/README.Frugalware @@ -0,0 +1,9 @@ +If you do not know the keycodes for the keys you wish to remap the joystick events +to, then please install the xev program. It will help you to identify them. Moving +on, the /etc/kbstick.conf is the system level configuration file the shell script +reads from if the user does not have a .kbstickrc in their home directory. Syntax +is the same in both cases, and the configuration file has some comments to give you +an idea of what each variable does. I have set the default up/down/left/right key +mappings to what my laptop uses for them and the buttons will have to be manually +defined to their proper keycodes. If you need any further help, please email the +maintainer of this package. diff --git a/source/xapps-extra/kbstick/kbstick b/source/xapps-extra/kbstick/kbstick new file mode 100644 index 0000000..686a569 --- /dev/null +++ b/source/xapps-extra/kbstick/kbstick @@ -0,0 +1,9 @@ +#!/bin/sh + +if [ -f "$HOME/.kbstickrc" ]; then + source "$HOME/.kbstickrc" +else + source "/etc/kbstick.conf" +fi + +exec /usr/bin/kbstick-bin "${KBS_Joystick}" & diff --git a/source/xapps-extra/kbstick/kbstick.conf b/source/xapps-extra/kbstick/kbstick.conf new file mode 100644 index 0000000..563e96e --- /dev/null +++ b/source/xapps-extra/kbstick/kbstick.conf @@ -0,0 +1,103 @@ +# Assign X KeyCodes to shell variables. This is small number of the +# X keyboard KeyCodes (corresponding to the keypad keys). +# +X_UP="98" +X_DOWN="104" +X_LEFT="100" +X_RIGHT="102" +X_BUTTON_0="" +X_BUTTON_1="" +X_BUTTON_2="" +X_BUTTON_3="" +X_BUTTON_4="" +X_BUTTON_5="" +X_BUTTON_6="" +X_BUTTON_7="" +X_BUTTON_8="" +X_BUTTON_9="" +X_BUTTON_10="" +X_BUTTON_11="" + +# Assign KeyCodes to the joystick axes. +# Axes 0 and 1 should be the x (horizontal) and y (vertical) axes of the +# stick itself. Axes beyond these will correspond to rudder, throttle, etc. +# controls. +# KBStick supports up to 6 axes, though altering the source code +# to support more would be a trivial exercise. +# +# *If you un-comment any of these be sure to un-comment the exports below.* +# +KBS_Axis_0_Plus="${X_RIGHT}" +KBS_Axis_1_Plus="${X_DOWN}" +#KBS_Axis_2_Plus= +#KBS_Axis_3_Plus= +#KBS_Axis_4_Plus= +#KBS_Axis_5_Plus= +KBS_Axis_0_Minus="${X_LEFT}" +KBS_Axis_1_Minus="${X_UP}" +#KBS_Axis_2_Minus= +#KBS_Axis_3_Minus= +#KBS_Axis_4_Minus= +#KBS_Axis_5_Minus= + +# Assign KeyCodes to the joystick buttons. +# Location and order of buttons/button number will vary from joystick to +# joystick. Choosing the KeyCodes of unused keyboard keys to assign to +# joystick buttons makes moot the matter of which button sends which KeyCode +# since one can run QStick and _then_ run and configure the games you wish +# to play, rather than configuring the games first then trying to match +# button messages to your game configuration. +# KBStick supports up to 12 joystick buttons, but once again altering the +# source code to allow more would be a minor task. +# +KBS_Button_0="${X_BUTTON_0}" +KBS_Button_1="${X_BUTTON_1}" +KBS_Button_2="${X_BUTTON_2}" +KBS_Button_3="${X_BUTTON_3}" +KBS_Button_4="${X_BUTTON_4}" +KBS_Button_5="${X_BUTTON_5}" +KBS_Button_6="${X_BUTTON_6}" +KBS_Button_7="${X_BUTTON_7}" +KBS_Button_8="${X_BUTTON_8}" +KBS_Button_9="${X_BUTTON_9}" +KBS_Button_10="${X_BUTTON_10}" +KBS_Button_11="${X_BUTTON_11}" + +# Assign a quit button. +# Setting the environment variable KBS_Quit_Button makes the assigned button +# (actually any button that sends the assigned KeyCode) cause the KBStick program +# to exit after 3 consecutive quit button presses. Any other button press resets +# the quit count to 0, but it would probably be good to choose a seldom +# used button to be the quit button lest in the fever of a Deathmatch you +# turn off your joystick support. B) +# Though KBStick issues a warning if you don't you need not assign a quit +# key at all. +# + +#KBS_Quit_Button="${KBS_Button_7}" + + +# Assign the device node where your joystick is located. +# Usually, this is /dev/input/js0. + +KBS_Joystick="/dev/input/js0" + +# Assign a Dead Zone around the center all your joystick axes. +# This is really better done with a calibrator like jscal from the +# Linux Joystick Driver distribution. +# +#export KBS_Dead_Zone=500 + +# Export the shell variables to the environment... +# +export KBS_Axis_0_Plus KBS_Axis_1_Plus +#export KBS_Axis_2_Plus KBS_Axis_3_Plus +#export KBS_Axis_4_Plus KBS_Axis_5_Plus +export KBS_Axis_0_Minus KBS_Axis_1_Minus +#export KBS_Axis_2_Minus KBS_Axis_3_Minus +#export KBS_Axis_4_Minus KBS_Axis_5_Minus + +export KBS_Button_0 KBS_Button_1 KBS_Button_2 KBS_Button_3 +export KBS_Button_4 KBS_Button_5 KBS_Button_6 KBS_Button_7 +export KBS_Button_8 KBS_Button_9 KBS_Button_10 KBS_Button_11 +#export KBS_Quit_Button From bouleetbil at frogdev.info Thu Oct 2 04:30:58 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Oct 2 04:30:59 2008 Subject: [Frugalware-git] bouleetbilgnome224: gnome-games-2.24.0-1-i686 Message-ID: <20081002023058.0EE3B1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=5ee3612deec63233b00dc5c2ecc179014ee8f9e0 commit 5ee3612deec63233b00dc5c2ecc179014ee8f9e0 Author: bouleetbil Date: Thu Oct 2 04:25:14 2008 +0200 gnome-games-2.24.0-1-i686 *version bump diff --git a/source/gnome-extra/gnome-games/FrugalBuild b/source/gnome-extra/gnome-games/FrugalBuild index 989d4ff..88f883f 100644 --- a/source/gnome-extra/gnome-games/FrugalBuild +++ b/source/gnome-extra/gnome-games/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-games -pkgver=2.22.3 +pkgver=2.24.0 pkgrel=1 pkgdesc="Games for GNOME" url="http://www.gnome.org/" -depends=('guile' 'libgnomeui>=2.22.1' 'librsvg>=2.22.2' 'rarian>=0.8.0' \ - 'desktop-file-utils' 'libbonobo>=2.22.0' 'gnome-python-desktop>=2.22.0' 'ggz-client-libs' 'sdl' 'sdl_mixer') +depends=('guile' 'libgnomeui>=2.24.0' 'librsvg>=2.22.2' 'rarian>=0.8.0' \ + 'desktop-file-utils' 'libbonobo>=2.22.0' 'gnome-python-desktop>=2.24.0' 'ggz-client-libs' 'sdl' 'sdl_mixer') makedepends=('intltool' 'gnome-doc-utils>=0.12.2') groups=('gnome-extra') archs=('i686' 'x86_64') @@ -31,6 +31,6 @@ _F_gnome_desktop="y" _F_gnome_iconcache="y" Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --with-scores-group=users --with-scores-user=root" -sha1sums=('55d17c8e5dcadf7192532f5ef30dcba22168c9a8') +sha1sums=('bc8bc818db93065dcc4552e9386508d4dfe564e4') # optimization OK From bouleetbil at frogdev.info Thu Oct 2 04:46:32 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Oct 2 04:46:35 2008 Subject: [Frugalware-git] bouleetbilgnome224: gnome-games-extra-data-2.24.0-1-i686 Message-ID: <20081002024632.E5FB71190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=c564deeda497507ad89ecfd0daa23eb88271c1cc commit c564deeda497507ad89ecfd0daa23eb88271c1cc Author: bouleetbil Date: Thu Oct 2 04:42:53 2008 +0200 gnome-games-extra-data-2.24.0-1-i686 *version bump diff --git a/source/gnome-extra/gnome-games-extra-data/FrugalBuild b/source/gnome-extra/gnome-games-extra-data/FrugalBuild index 6f2c27a..7bf511e 100644 --- a/source/gnome-extra/gnome-games-extra-data/FrugalBuild +++ b/source/gnome-extra/gnome-games-extra-data/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: AlexExtreme pkgname=gnome-games-extra-data -pkgver=2.22.0 +pkgver=2.24.0 pkgrel=1 pkgdesc="Extra data files for the GNOME games" url="http://www.gnome.org/" -depends=('gnome-games>=2.22.0') +depends=('gnome-games>=2.24.0') groups=('gnome-extra') archs=('i686' 'x86_64') Finclude gnome -sha1sums=('ad9ed0f3fbe9e688f77b52eea5c8b03d20ef590a') +sha1sums=('a33d7fd3ba40be8fca472a9517138c849ae36be8') From bouleetbil at frogdev.info Thu Oct 2 05:13:05 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Oct 2 05:13:07 2008 Subject: [Frugalware-git] bouleetbilgnome224: libxml++-2.24.0-1-i686 Message-ID: <20081002031305.419521190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=06612347b8e078cd1a341fd79e30ff823e80dfb1 commit 06612347b8e078cd1a341fd79e30ff823e80dfb1 Author: bouleetbil Date: Thu Oct 2 05:10:39 2008 +0200 libxml++-2.24.0-1-i686 *version bump diff --git a/source/lib-extra/libxml++/FrugalBuild b/source/lib-extra/libxml++/FrugalBuild index 1ca976a..6540058 100644 --- a/source/lib-extra/libxml++/FrugalBuild +++ b/source/lib-extra/libxml++/FrugalBuild @@ -3,17 +3,15 @@ # Maintainer: voroskoi pkgname=libxml++ -pkgver=2.22.0 -pkgrel=2 +pkgver=2.24.0 +pkgrel=1 pkgdesc="libxml++ is a C++ wrapper for the libxml XML parser library" url="http://libxmlplusplus.sourceforge.net/" groups=('lib-extra') archs=('i686' 'x86_64') depends=('libxml2' 'glibmm' 'glib2') Finclude gnome -source=(${source[@]} ${pkgname}_nodes.patch) -sha1sums=('8c69339e1b472bd5e541e30fdaa47b152bc186bc' \ - '680075d2b754b28cfb2a9ea8d888045e2bc9ae0b') +sha1sums=('bfeeda534a4ba3800c6cf22fd0aa9136f3036d99') build() { Fbuild diff --git a/source/lib-extra/libxml++/libxml++_nodes.patch b/source/lib-extra/libxml++/libxml++_nodes.patch deleted file mode 100644 index 85fdeb6..0000000 --- a/source/lib-extra/libxml++/libxml++_nodes.patch +++ /dev/null @@ -1,288 +0,0 @@ -diff -Naur libxml++-2.22.0/libxml++/nodes/element.cc libxml++-2.23.1/libxml++/nodes/element.cc ---- libxml++-2.22.0/libxml++/nodes/element.cc 2008-01-17 14:56:54.000000000 +0530 -+++ libxml++-2.23.1/libxml++/nodes/element.cc 2008-06-24 18:59:04.000000000 +0530 -@@ -156,6 +156,40 @@ - return 0; - } - -+TextNode* Element::add_child_text(xmlpp::Node* previous_sibling, const Glib::ustring& content) -+{ -+ if(!previous_sibling) -+ return 0; -+ -+ if(cobj()->type == XML_ELEMENT_NODE) -+ { -+ xmlNode* node = xmlNewText((const xmlChar*)content.c_str()); -+ -+ // Use the result, because node can be freed when merging text nodes: -+ node = xmlAddNextSibling(previous_sibling->cobj(), node); -+ -+ return static_cast(node->_private); -+ } -+ return 0; -+} -+ -+TextNode* Element::add_child_text_before(xmlpp::Node* next_sibling, const Glib::ustring& content) -+{ -+ if(!next_sibling) -+ return 0; -+ -+ if(cobj()->type == XML_ELEMENT_NODE) -+ { -+ xmlNode* node = xmlNewText((const xmlChar*)content.c_str()); -+ -+ // Use the result, because node can be freed when merging text nodes: -+ node = xmlAddPrevSibling(next_sibling->cobj(), node); -+ -+ return static_cast(node->_private); -+ } -+ return 0; -+} -+ - bool Element::has_child_text() const - { - return get_child_text() != 0; -diff -Naur libxml++-2.22.0/libxml++/nodes/element.h libxml++-2.23.1/libxml++/nodes/element.h ---- libxml++-2.22.0/libxml++/nodes/element.h 2008-01-17 14:56:54.000000000 +0530 -+++ libxml++-2.23.1/libxml++/nodes/element.h 2008-06-24 18:59:04.000000000 +0530 -@@ -94,6 +94,26 @@ - */ - TextNode* add_child_text(const Glib::ustring& content = Glib::ustring()); - -+ /** Add a new text node after the specified existing child node. -+ * -+ * @newin2p24 -+ * -+ * @param previous_sibling An existing child node. -+ * @param content The text. This should be unescaped - see ContentNode::set_content(). -+ * @returns The new text node. -+ */ -+ TextNode* add_child_text(xmlpp::Node* previous_sibling, const Glib::ustring& content = Glib::ustring()); -+ -+ /** Add a new text node before the specified existing child node. -+ * -+ * @newin2p24 -+ * -+ * @param next_sibling An existing child node. -+ * @param content The text. This should be unescaped - see ContentNode::set_content(). -+ * @returns The new text node. -+ */ -+ TextNode* add_child_text_before(xmlpp::Node* next_sibling, const Glib::ustring& content = Glib::ustring()); -+ - /** Set the text of the first text node, adding one if necessary. - * This is a convenience method, meant as an alternative to iterating over all the child nodes to find the first suitable node then and setting the text directly. - * @param content The text. This should be unescaped - see ContentNode::set_content(). -diff -Naur libxml++-2.22.0/libxml++/nodes/node.cc libxml++-2.23.1/libxml++/nodes/node.cc ---- libxml++-2.22.0/libxml++/nodes/node.cc 2008-01-17 14:56:54.000000000 +0530 -+++ libxml++-2.23.1/libxml++/nodes/node.cc 2008-06-24 18:59:04.000000000 +0530 -@@ -97,7 +97,55 @@ - Element* Node::add_child(const Glib::ustring& name, - const Glib::ustring& ns_prefix) - { -- xmlNode* node = 0; -+ _xmlNode* child = create_new_child_node(name, ns_prefix); -+ if(!child) -+ return 0; -+ -+ _xmlNode* node = xmlAddChild(impl_, child); -+ if(node) -+ return static_cast(node->_private); -+ else -+ return 0; -+} -+ -+Element* Node::add_child(xmlpp::Node* previous_sibling, -+ const Glib::ustring& name, -+ const Glib::ustring& ns_prefix) -+{ -+ if(!previous_sibling) -+ return 0; -+ -+ _xmlNode* child = create_new_child_node(name, ns_prefix); -+ if(!child) -+ return 0; -+ -+ _xmlNode* node = xmlAddNextSibling(previous_sibling->cobj(), child); -+ if(node) -+ return static_cast(node->_private); -+ else -+ return 0; -+} -+ -+Element* Node::add_child_before(xmlpp::Node* next_sibling, -+ const Glib::ustring& name, -+ const Glib::ustring& ns_prefix) -+{ -+ if(!next_sibling) -+ return 0; -+ -+ _xmlNode* child = create_new_child_node(name, ns_prefix); -+ if(!child) -+ return 0; -+ -+ _xmlNode* node = xmlAddPrevSibling(next_sibling->cobj(), child); -+ if(node) -+ return static_cast(node->_private); -+ else -+ return 0; -+} -+ -+_xmlNode* Node::create_new_child_node(const Glib::ustring& name, const Glib::ustring& ns_prefix) -+{ - xmlNs* ns = 0; - - if(impl_->type != XML_ELEMENT_NODE) -@@ -124,14 +172,10 @@ - } - } - -- node = xmlAddChild(impl_, xmlNewNode(ns, (const xmlChar*)name.c_str())); -- -- if(node) -- return static_cast(node->_private); -- else -- return 0; -+ return xmlNewNode(ns, (const xmlChar*)name.c_str()); - } - -+ - void Node::remove_child(Node* node) - { - //TODO: Allow a node to be removed without deleting it, to allow it to be moved? -diff -Naur libxml++-2.22.0/libxml++/nodes/node.h libxml++-2.23.1/libxml++/nodes/node.h ---- libxml++-2.22.0/libxml++/nodes/node.h 2007-08-13 18:17:18.000000000 +0530 -+++ libxml++-2.23.1/libxml++/nodes/node.h 2008-06-24 18:59:04.000000000 +0530 -@@ -20,7 +20,8 @@ - } - #endif //DOXYGEN_SHOULD_SKIP_THIS - --namespace xmlpp { -+namespace xmlpp -+{ - - class TextNode; - class Element; -@@ -50,7 +51,7 @@ - */ - void set_name(const Glib::ustring& name); - -- /** Set the namespace prefix used by the node -+ /** Set the namespace prefix used by the node. - * If no such namespace prefix has been declared then this method will throw an exception. - * @param ns_prefix The namespace prefix. - */ -@@ -64,32 +65,32 @@ - */ - int get_line() const; - -- /** Get the parent element for this node -+ /** Get the parent element for this node. - * @returns The parent node - */ - const Element* get_parent() const; - -- /** Get the parent element for this node -+ /** Get the parent element for this node. - * @returns The parent node - */ - Element* get_parent(); - -- /** Get the next sibling for this node -+ /** Get the next sibling for this node. - * @returns The next sibling - */ - const Node* get_next_sibling() const; - -- /** Get the next sibling for this node -+ /** Get the next sibling for this node. - * @returns The next sibling - */ - Node* get_next_sibling(); - -- /** Get the previous sibling for this node -+ /** Get the previous sibling for this node . - * @returns The previous sibling - */ - const Node* get_previous_sibling() const; - -- /** Get the previous sibling for this node -+ /** Get the previous sibling for this node. - * @returns The previous sibling - */ - Node* get_previous_sibling(); -@@ -106,7 +107,7 @@ - */ - const NodeList get_children(const Glib::ustring& name = Glib::ustring()) const; - -- /** Add a child element to this node -+ /** Add a child element to this node. - * @param name The new node name - * @param ns_prefix The namespace prefix. If the prefix has not been declared then this method will throw an exception. - * @returns The newly-created element -@@ -114,6 +115,30 @@ - Element* add_child(const Glib::ustring& name, - const Glib::ustring& ns_prefix = Glib::ustring()); - -+ /** Add a child element to this node after the specified existing child node. -+ * -+ * @newin2p24 -+ * -+ * @param previous_sibling An existing child node. -+ * @param name The new node name -+ * @param ns_prefix The namespace prefix. If the prefix has not been declared then this method will throw an exception. -+ * @returns The newly-created element -+ */ -+ Element* add_child(xmlpp::Node* previous_sibling, const Glib::ustring& name, -+ const Glib::ustring& ns_prefix = Glib::ustring()); -+ -+ /** Add a child element to this node before the specified existing child node. -+ * -+ * @newin2p24 -+ * -+ * @param next_sibling An existing child node. -+ * @param name The new node name -+ * @param ns_prefix The namespace prefix. If the prefix has not been declared then this method will throw an exception. -+ * @returns The newly-created element -+ */ -+ Element* add_child_before(xmlpp::Node* next_sibling, const Glib::ustring& name, -+ const Glib::ustring& ns_prefix = Glib::ustring()); -+ - /** Remove the child node. - * @param node The child node to remove. This Node will be deleted and therefore unusable after calling this method. - */ -@@ -127,12 +152,12 @@ - Node* import_node(const Node* node, bool recursive = true); - - -- /** Return the XPath of this node -+ /** Return the XPath of this node. - * @result The XPath of the node. - */ - Glib::ustring get_path() const; - -- /** Find nodes from a XPath expression -+ /** Find nodes from a XPath expression. - * @param xpath The XPath of the nodes. - */ - NodeSet find(const Glib::ustring& xpath) const; -@@ -141,7 +166,7 @@ - */ - typedef std::map PrefixNsMap; - -- /** Find nodes from a XPath expression -+ /** Find nodes from a XPath expression. - * @param xpath The XPath of the nodes. - * @param namespaces A map of namespace prefixes to namespace URIs to be used while finding. - */ -@@ -154,6 +179,11 @@ - ///Access the underlying libxml implementation. - const _xmlNode* cobj() const; - -+protected: -+ -+ ///Create the C instance ready to be added to the parent node. -+ _xmlNode* create_new_child_node(const Glib::ustring& name, const Glib::ustring& ns_prefix); -+ - private: - _xmlNode* impl_; - }; From bouleetbil at frogdev.info Thu Oct 2 05:23:35 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Oct 2 05:23:36 2008 Subject: [Frugalware-git] bouleetbilgnome224: file-roller-2.24.0-1-i686 Message-ID: <20081002032335.F0E6A1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=afc49ea28a3180a99a9b9282c6c87c2395c827ce commit afc49ea28a3180a99a9b9282c6c87c2395c827ce Author: bouleetbil Date: Thu Oct 2 05:21:05 2008 +0200 file-roller-2.24.0-1-i686 *version bump diff --git a/source/gnome/file-roller/FrugalBuild b/source/gnome/file-roller/FrugalBuild index 4329746..bcf811c 100644 --- a/source/gnome/file-roller/FrugalBuild +++ b/source/gnome/file-roller/FrugalBuild @@ -2,10 +2,10 @@ # Maintainer: Christian Hamar alias krix pkgname=file-roller -pkgver=2.22.4 +pkgver=2.24.0 pkgrel=1 pkgdesc="Archive manager utility for GNOME" -depends=('nautilus>=2.22.5.1' 'rarian' 'desktop-file-utils') +depends=('nautilus>=2.24.0' 'rarian' 'desktop-file-utils') makedepends=('intltool' 'gnome-doc-utils>=0.12.2') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') @@ -14,6 +14,6 @@ _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" _F_gnome_iconcache="y" Finclude gnome gnome-scriptlet -sha1sums=('2894493c7e9eb55a874f3690b416fb16ad5d5729') +sha1sums=('cd22cea10b1d2be0edb1d64957e3a3cdf63b55ba') # optimization OK From bouleetbil at frogdev.info Thu Oct 2 05:36:09 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Oct 2 05:36:10 2008 Subject: [Frugalware-git] bouleetbilgnome224: nautilus-open-terminal-0.9-2-i686 Message-ID: <20081002033609.EAD4A1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=4ad767bad64fbf96e42c315f1a4c343f8c5dc597 commit 4ad767bad64fbf96e42c315f1a4c343f8c5dc597 Author: bouleetbil Date: Thu Oct 2 05:33:46 2008 +0200 nautilus-open-terminal-0.9-2-i686 *rebuild with nautilus>=2.24.0 diff --git a/source/gnome/nautilus-open-terminal/FrugalBuild b/source/gnome/nautilus-open-terminal/FrugalBuild index e2bba67..bf51cfd 100644 --- a/source/gnome/nautilus-open-terminal/FrugalBuild +++ b/source/gnome/nautilus-open-terminal/FrugalBuild @@ -3,12 +3,13 @@ pkgname=nautilus-open-terminal pkgver=0.9 -pkgrel=1 +pkgrel=2 pkgdesc="Nautilus open terminal feature with improvements." url="http://manny.cluecoder.org/packages/nautilus-open-terminal/" -depends=('nautilus' 'perl-xml-parser') +depends=('nautilus>=2.24.0' 'perl-xml-parser') groups=('gnome') archs=('i686' 'x86_64' 'ppc') +_F_gnome_schemas=('/etc/gconf/schemas/nautilus-open-terminal.schemas') Finclude gnome sha1sums=('14ae57b4b17fd82c0bc00cf138cf4f387feaf10d') From bouleetbil at frogdev.info Thu Oct 2 05:40:58 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Oct 2 05:41:00 2008 Subject: [Frugalware-git] bouleetbilgnome224: vino-2.24.0-1-i686 Message-ID: <20081002034058.47D391190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=f4fe70a03c7755094596872f9f3da3bd3861e17a commit f4fe70a03c7755094596872f9f3da3bd3861e17a Author: bouleetbil Date: Thu Oct 2 05:38:35 2008 +0200 vino-2.24.0-1-i686 *version bump diff --git a/source/gnome/vino/FrugalBuild b/source/gnome/vino/FrugalBuild index 3665ea4..ba11f0a 100644 --- a/source/gnome/vino/FrugalBuild +++ b/source/gnome/vino/FrugalBuild @@ -2,10 +2,10 @@ # Maintainer: Christian Hamar alias krix pkgname=vino -pkgver=2.22.2 +pkgver=2.24.0 pkgrel=1 pkgdesc="An integrated VNC server for GNOME" -depends=('libgnomeui>=2.22.1' 'gnutls>=2.2' 'avahi' 'libxtst' 'libxdamage' 'libnotify' 'gnome-keyring') +depends=('libgnomeui>=2.24.0' 'gnutls>=2.2' 'avahi' 'libxtst' 'libxdamage' 'libnotify' 'gnome-keyring') makedepends=('intltool' 'perl-xml-parser') groups=('gnome') archs=('i686' 'x86_64' 'ppc') @@ -15,6 +15,6 @@ _F_gnome_iconcache="y" Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --enable-http-server=yes --enable-session-support=yes --enable-avahi \ --enable-debug=no --enable-gnome-keyring=yes" -sha1sums=('ded4b0ce4e05caa31f6378ba65dc172b20a9594d') +sha1sums=('7b6a2fa97b923653140d8ad8661bdebd250d5968') # optimization OK From bouleetbil at frogdev.info Thu Oct 2 05:46:26 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Oct 2 05:46:27 2008 Subject: [Frugalware-git] bouleetbilgnome224: gnome-volume-manager-2.24.0-1-i686 Message-ID: <20081002034626.D13621190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=56d7562825b3d7183cf6d5eaef2452c578caf463 commit 56d7562825b3d7183cf6d5eaef2452c578caf463 Author: bouleetbil Date: Thu Oct 2 05:44:07 2008 +0200 gnome-volume-manager-2.24.0-1-i686 *version bump diff --git a/source/gnome/gnome-volume-manager/FrugalBuild b/source/gnome/gnome-volume-manager/FrugalBuild index 849d6c6..7d79217 100644 --- a/source/gnome/gnome-volume-manager/FrugalBuild +++ b/source/gnome/gnome-volume-manager/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-volume-manager -pkgver=2.22.5 +pkgver=2.24.0 pkgrel=1 pkgdesc="A volume manager for GNOME" url="http://www.gnome.org/" -depends=('gnome-media>=2.22.0' 'dbus-glib>=0.71' 'libnotify>=0.4.4' 'gnome-vfs>=2.22.0' 'avahi-glib>=0.6.17') -rodepends=('totem>=2.22.0' 'gthumb') +depends=('gnome-media>=2.24.0.1' 'dbus-glib>=0.71' 'libnotify>=0.4.4' 'gnome-vfs>=2.24.0' 'avahi-glib>=0.6.17') +rodepends=('totem>=2.24.0' 'gthumb') makedepends=('intltool') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') @@ -15,7 +15,7 @@ _F_gnome_schemas=('/etc/gconf/schemas/gnome-volume-manager.schemas') _F_gnome_desktop="y" Finclude gnome gnome-scriptlet source=(${source[@]} 01-defaults.patch $pkgname-gthumb) -sha1sums=('108a3c7cab897680f202a796ee7f4f07809a790e' \ +sha1sums=('3ce48166b1f70e3a5e6353de996c98311791f715' \ '0624b78a7354e8673d480df497233945f0cb86e5' \ '2f814a6a4b287532899e48a5a4df0490ec9fddeb') From bouleetbil at frogdev.info Thu Oct 2 05:49:56 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Oct 2 05:49:57 2008 Subject: [Frugalware-git] bouleetbilgnome224: gnome-backgrounds-2.24.0-1-i686 Message-ID: <20081002034956.D8DDD1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=1693bca0ba0cadf6256dc62eb176931736c11ba6 commit 1693bca0ba0cadf6256dc62eb176931736c11ba6 Author: bouleetbil Date: Thu Oct 2 05:45:58 2008 +0200 gnome-backgrounds-2.24.0-1-i686 *version bump diff --git a/source/gnome/gnome-backgrounds/FrugalBuild b/source/gnome/gnome-backgrounds/FrugalBuild index 7e941c2..9f7c377 100644 --- a/source/gnome/gnome-backgrounds/FrugalBuild +++ b/source/gnome/gnome-backgrounds/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-backgrounds -pkgver=2.22.0 +pkgver=2.24.0 pkgrel=1 pkgdesc="A set of backgrounds for GNOME" url="http://www.gnome.org/" @@ -11,6 +11,6 @@ makedepends=('intltool') groups=('gnome') archs=('i686' 'x86_64' 'ppc') Finclude gnome -sha1sums=('eede46b91595b4f72fe8d160a13fcaee8e4b0236') +sha1sums=('3ceb98be1b49d7af6456b0ef2aefddca15e6146b') # optimization OK From bouleetbil at frogdev.info Thu Oct 2 06:01:34 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Oct 2 06:01:35 2008 Subject: [Frugalware-git] bouleetbilgnome224: gtkhtml-3.24.0-1-i686 Message-ID: <20081002040134.BEA021190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=91fd9cf5fc7721b40b1d7fa195b9216369095a25 commit 91fd9cf5fc7721b40b1d7fa195b9216369095a25 Author: bouleetbil Date: Thu Oct 2 05:59:07 2008 +0200 gtkhtml-3.24.0-1-i686 *version bump diff --git a/source/gnome/gtkhtml/FrugalBuild b/source/gnome/gtkhtml/FrugalBuild index 4a7c6c8..022beb8 100644 --- a/source/gnome/gtkhtml/FrugalBuild +++ b/source/gnome/gtkhtml/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: Christian Hamar alias krix pkgname=gtkhtml -pkgver=3.18.1 +pkgver=3.24.0 pkgrel=1 pkgdesc="A lightweight HTML rendering/printing/editing engine" -depends=('gail>=1.20.1' 'libgnomeui>=2.22.0' \ - 'libsoup>=2.4.1' 'gnome-icon-theme>=2.22.0' \ - 'libbonobo>=2.22.0') +depends=('gail>=1.20.1' 'libgnomeui>=2.24.0' \ + 'libsoup>=2.24.0.1-2' 'gnome-icon-theme>=2.24.0' \ + 'libbonobo>=2.24.0' 'enchant' 'iso-codes') makedepends=('intltool') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') Finclude gnome +sha1sums=('df1f0cf1420d28193540c68a9a945f046d427e87') -sha1sums=('6f2310fd7ef392941593f873e3181827705f6021') # optimization OK From bouleetbil at frogdev.info Thu Oct 2 06:22:15 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Oct 2 06:22:17 2008 Subject: [Frugalware-git] bouleetbilgnome224: sound-juicer-2.24.0-1-i686 Message-ID: <20081002042215.5CF1A1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=4435d7f9737b910ac5d44bd05ae3c19ea330cca3 commit 4435d7f9737b910ac5d44bd05ae3c19ea330cca3 Author: bouleetbil Date: Thu Oct 2 06:19:53 2008 +0200 sound-juicer-2.24.0-1-i686 *version bump diff --git a/source/gnome-extra/sound-juicer/FrugalBuild b/source/gnome-extra/sound-juicer/FrugalBuild index 8e3c561..3767fa2 100644 --- a/source/gnome-extra/sound-juicer/FrugalBuild +++ b/source/gnome-extra/sound-juicer/FrugalBuild @@ -3,13 +3,13 @@ # Contributor: DNAku pkgname=sound-juicer -pkgver=2.22.0 +pkgver=2.24.0 pkgrel=1 pkgdesc="Sound Juicer is a CD ripper for GNOME 2" -depends=('libstdc++' 'libcdio' 'gnome-media>=2.20.1' 'gst-plugins-base' 'gst-plugins-good' 'libmusicbrainz' 'taglib' \ +depends=('libstdc++' 'libcdio' 'gnome-media>=2.24.0.1' 'gst-plugins-base' 'gst-plugins-good' 'libmusicbrainz' 'taglib' \ 'gst-plugins-base-cdparanoia' 'gst-plugins-base-gnomevfs' 'gst-plugins-good-flac' 'gst-plugins-base-pango' \ gst-plugins-base-vorbis) -makedepends=('gnome-doc-utils' 'perl-xml-parser') +makedepends=('gnome-doc-utils' 'perl-xml-parser' 'intltool') groups=('gnome-extra') archs=('i686' 'x86_64') _F_gnome_schemas=('/etc/gconf/schemas/sound-juicer.schemas') @@ -19,7 +19,13 @@ _F_gnome_iconcache="y" options=('scriptlet') Finclude gnome gnome-scriptlet url="http://www.burtonini.com/blog/computers/sound-juicer" -sha1sums=('d710d2041f4214a80387d6518056856c6401719a') -unset MAKEFLAGS +sha1sums=('f1b0e44d8947b0391a6dda97f18a21fe227ea699') + +build() { + unset MAKEFLAGS + Fsed "SUBDIRS = po data libjuicer src tests help" "SUBDIRS = po data libjuicer src tests" Makefile.* + Fbuild + Fbuild_gnome_scriptlet +} # optimization OK From bouleetbil at frogdev.info Thu Oct 2 06:36:27 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Oct 2 06:36:29 2008 Subject: [Frugalware-git] bouleetbilgnome224: empathy-2.24.0-1-i686 Message-ID: <20081002043627.872221190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=2c279d43455c74676c838894b4dc91c78685dcd6 commit 2c279d43455c74676c838894b4dc91c78685dcd6 Author: bouleetbil Date: Thu Oct 2 06:33:54 2008 +0200 empathy-2.24.0-1-i686 *version bump diff --git a/source/gnome-extra/empathy/FrugalBuild b/source/gnome-extra/empathy/FrugalBuild index 4b7e56a..be93efb 100644 --- a/source/gnome-extra/empathy/FrugalBuild +++ b/source/gnome-extra/empathy/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=empathy -pkgver=0.23.4 +pkgver=2.24.0 pkgrel=1 pkgdesc="Empathy consists of a rich set of reusable instant messaging widgets" depends=('gconf' 'telepathy-glib' 'libxml2' 'enchant' \ @@ -20,11 +20,10 @@ _F_gnome_desktop="y" _F_gnome_schemas=('/etc/gconf/schemas/empathy.schemas'\ '/etc/gconf/schemas/GNOME_Megaphone_Applet.schemas') Finclude gnome gnome-scriptlet -sha1sums=('fc90f970fad3dc04b210d93e11003b32c13d033c') Fconfopts="${Fconfopts[@]} --enable-python=yes --enable-gtk-doc \ --disable-scrollkeeper --enable-spell=yes \ --enable-megaphone=yes --enable-nothere=yes" -sha1sums=('fc90f970fad3dc04b210d93e11003b32c13d033c') +sha1sums=('6a293f0dbd9ac12d3cf1e58132ae7641f710cf75') build() { Fcd From bouleetbil at frogdev.info Thu Oct 2 06:51:30 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Oct 2 06:51:31 2008 Subject: [Frugalware-git] bouleetbilgnome224: evince-2.24.0-1-i686 Message-ID: <20081002045130.226FB1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=5785654df3b6315664467d2e3d1a9b4086b856f7 commit 5785654df3b6315664467d2e3d1a9b4086b856f7 Author: bouleetbil Date: Thu Oct 2 06:48:53 2008 +0200 evince-2.24.0-1-i686 *version bump diff --git a/source/gnome/evince/FrugalBuild b/source/gnome/evince/FrugalBuild index 09e5933..53b330d 100644 --- a/source/gnome/evince/FrugalBuild +++ b/source/gnome/evince/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Christian Hamar alias krix pkgname=evince -pkgver=2.22.2 +pkgver=2.24.0 pkgrel=1 pkgdesc="A document viewer for GNOME" -depends=('libgnomeui>=2.22.1' 'poppler-glib>=0.8.2' 'ghostscript' 'rarian' 'desktop-file-utils' \ +depends=('libgnomeui>=2.24.0' 'poppler-glib>=0.8.2' 'ghostscript' 'rarian' 'desktop-file-utils' \ 't1lib' 'dbus-glib>=0.76' 'tetex-kpathsea' 'djvulibre') -makedepends=('intltool' 'gnome-doc-utils' 'perl-xml-parser' 'tetex' 'nautilus>=2.22.3') +makedepends=('intltool' 'gnome-doc-utils' 'perl-xml-parser' 'tetex' 'nautilus>=2.24.0') replaces=('gpdf') groups=('gnome') archs=('i686' 'x86_64' 'ppc') @@ -22,11 +22,11 @@ _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" Finclude gnome gnome-scriptlet url="http://www.gnome.org/projects/evince/" -sha1sums=('c1be08426c8d7220021d20502a7ffafbe82108b4') +sha1sums=('125e4a3a88daa742cd7f12c09eb21187071c94cb') subpkgs=('evince-nautilus') subdescs=('Evince plugin for Nautilus') -subdepends=("nautilus>=2.20.0 $pkgname=$pkgver") +subdepends=("nautilus>=2.24.0 $pkgname=$pkgver") subgroups=('gnome') subarchs=('x86_64 i686 ppc') From priyank at frugalware.org Thu Oct 2 07:03:26 2008 From: priyank at frugalware.org (Priyank) Date: Thu Oct 2 07:03:28 2008 Subject: [Frugalware-git] frugalware-current: gmpc-lyrics-0.16.0-1-i686 Message-ID: <20081002050326.9C6F21190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bb4f0074938968a8af219fd476ed216edc3aa953 commit bb4f0074938968a8af219fd476ed216edc3aa953 Author: Priyank Date: Thu Oct 2 10:30:07 2008 +0530 gmpc-lyrics-0.16.0-1-i686 * Version bump * Fix url, up2date, source diff --git a/source/xapps-extra/gmpc-lyrics/FrugalBuild b/source/xapps-extra/gmpc-lyrics/FrugalBuild index 8184375..2e62978 100644 --- a/source/xapps-extra/gmpc-lyrics/FrugalBuild +++ b/source/xapps-extra/gmpc-lyrics/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: Priyank Gosalia pkgname=gmpc-lyrics -pkgver=0.15.5.0 +pkgver=0.16.0 pkgrel=1 pkgdesc="A lyrics fetching plugin for Gmpc." -url="http://sarine.nl/gmpc-plugins-lyrics-provider/" -depends=('gtk+2' 'gmpc=0.15.5.0' 'libxml2' 'libmpd') +url="http://gmpcwiki.sarine.nl/index.php/Lyrics" +depends=('gtk+2' 'gmpc>=0.16.1' 'libxml2' 'libmpd') groups=('xapps-extra') archs=('i686' 'x86_64') -up2date="lynx -dump http://sarine.nl/gmpc-plugins-downloads | grep -m1 $pkgname | Flasttar" -source=(http://download.sarine.nl/gmpc-0.15.5/$pkgname-$pkgver.tar.gz) -sha1sums=('d98f314d2b8f6d7678ced66c0904aeefa79de4b8') +up2date="lynx -dump $url | grep Download -m1 | sed 's/.*\* \(.*\):.*/\1/'" +source=(http://download.sarine.nl/Programs/gmpc/$pkgver/$pkgname-$pkgver.tar.gz) +sha1sums=('54475d71bd581c2fa065537a0dcb9107d7ca765d') # optimization OK From priyank at frugalware.org Thu Oct 2 07:21:44 2008 From: priyank at frugalware.org (Priyank) Date: Thu Oct 2 07:21:45 2008 Subject: [Frugalware-git] frugalware-current: gmpc-serverstats-0.16.0-1-i686 Message-ID: <20081002052144.0E7371190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=676ff89aff2eaeb238dec3c143fd9df7a0d14c5d commit 676ff89aff2eaeb238dec3c143fd9df7a0d14c5d Author: Priyank Date: Thu Oct 2 10:49:51 2008 +0530 gmpc-serverstats-0.16.0-1-i686 * Version bump * Fix url, up2date, source diff --git a/source/xapps-extra/gmpc-serverstats/FrugalBuild b/source/xapps-extra/gmpc-serverstats/FrugalBuild index 853c7db..a9a6b30 100644 --- a/source/xapps-extra/gmpc-serverstats/FrugalBuild +++ b/source/xapps-extra/gmpc-serverstats/FrugalBuild @@ -1,16 +1,16 @@ -# Compiling Time: 0.03 SBU +# Compiling Time: 0.05 SBU # Maintainer: Priyank Gosalia pkgname=gmpc-serverstats -pkgver=0.15.5.0 +pkgver=0.16.0 pkgrel=1 pkgdesc="A gmpc plugin that shows detailed information about a mpd database." -url="http://sarine.nl/gmpc-plugins-serverstats/" -depends=('gtk+2' 'gmpc=0.15.5.0' 'libxml2' 'libmpd') +url="http://gmpcwiki.sarine.nl/index.php/Server_statistics" +depends=('gtk+2' 'gmpc>=0.16.1' 'libxml2' 'libmpd') groups=('xapps-extra') archs=('i686' 'x86_64') -up2date="lynx -dump http://sarine.nl/gmpc-plugins-downloads | grep -m1 $pkgname | Flasttar" -source=(http://download.sarine.nl/gmpc-0.15.5/$pkgname-$pkgver.tar.gz) -sha1sums=('7f6bc78c03b4e90cd10782c8897f67bdd6535e4e') +up2date="lynx -dump $url | grep Download -m1 | sed 's/.*\* \(.*\):.*/\1/'" +source=(http://download.sarine.nl/Programs/gmpc/$pkgver/$pkgname-$pkgver.tar.gz) +sha1sums=('3bfb96caace07ad6dcf36377186dc5e60cc6722d') # optimization OK From priyank at frugalware.org Thu Oct 2 07:27:57 2008 From: priyank at frugalware.org (Priyank) Date: Thu Oct 2 07:27:58 2008 Subject: [Frugalware-git] frugalware-current: gmpc-stopbutton-0.15.5.0-1-i686 Message-ID: <20081002052757.305511190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e3eabe7f82243239b02311025bd4dd8682454733 commit e3eabe7f82243239b02311025bd4dd8682454733 Author: Priyank Date: Thu Oct 2 10:56:45 2008 +0530 gmpc-stopbutton-0.15.5.0-1-i686 * removed (deprecated in gmpc-0.16.0) diff --git a/source/xapps-extra/gmpc-stopbutton/FrugalBuild b/source/xapps-extra/gmpc-stopbutton/FrugalBuild deleted file mode 100644 index 1d81948..0000000 --- a/source/xapps-extra/gmpc-stopbutton/FrugalBuild +++ /dev/null @@ -1,16 +0,0 @@ -# Compiling Time: 0.02 SBU -# Maintainer: Priyank Gosalia - -pkgname=gmpc-stopbutton -pkgver=0.15.5.0 -pkgrel=1 -pkgdesc="A gmpc plugin that adds a stop button to controls." -url="http://sarine.nl/gmpc-plugins-stopbutton/" -depends=('gtk+2' 'gmpc=0.15.5.0' 'libxml2' 'libmpd') -groups=('xapps-extra') -archs=('i686' 'x86_64') -up2date="lynx -dump http://sarine.nl/gmpc-plugins-downloads | grep -m1 $pkgname | Flasttar" -source=(http://download.sarine.nl/gmpc-0.15.5/$pkgname-$pkgver.tar.gz) -sha1sums=('9d52b0cdcb44d23ef1d8b79657d1d0218db72e2e') - -# optimization OK From voroskoi at frugalware.org Thu Oct 2 08:58:43 2008 From: voroskoi at frugalware.org (voroskoi) Date: Thu Oct 2 08:58:45 2008 Subject: [Frugalware-git] frugalware-current: openttd-0.6.3-1-i686 Message-ID: <20081002065843.33BBA1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d2ec1988fed40e12dd4e6a1729271d46996f5e68 commit d2ec1988fed40e12dd4e6a1729271d46996f5e68 Author: voroskoi Date: Thu Oct 2 08:58:15 2008 +0200 openttd-0.6.3-1-i686 version bump diff --git a/source/games-extra/openttd/FrugalBuild b/source/games-extra/openttd/FrugalBuild index 473e6eb..7d4c56e 100644 --- a/source/games-extra/openttd/FrugalBuild +++ b/source/games-extra/openttd/FrugalBuild @@ -3,16 +3,14 @@ # Maintainer: voroskoi pkgname=openttd -pkgver=0.6.2 +pkgver=0.6.3 pkgrel=1 -pkgdesc="An open source clone of the Microprose game Transport Tycoon Deluxe" +pkgdesc="An open source clone of the Microprose game Transport Tycoon Deluxe." _F_sourceforge_ext="-source.tar.gz" Finclude sourceforge -url="http://www.openttd.com/" depends=('sdl' 'libpng' 'libtimidity' 'freetype2' 'fontconfig') groups=('games-extra') archs=('i686' 'x86_64') -up2date="lynx -dump http://www.openttd.com/downloads.php |grep latest |sed -ne 's/.*is \(.*\),.*/\1/;1p'" Fconfopts="--prefix-dir=${Fprefix} --binary-dir=/bin --data-dir=/share/openttd --personal-dir=.openttd --install-dir=${Fdestdir}" source=($source README.Frugalware \ http://$_F_sourceforge_mirror.dl.sourceforge.net/openttd/openttd-0.5.0-scenarios.tar.bz2 \ @@ -30,7 +28,7 @@ build() { _F_desktop_icon="openttd.64.png" Fdesktop2 } -sha1sums=('04465c64ee43e1af7353b6d3801d79c52cf9ee30' \ +sha1sums=('00e7466aa626a78bad2280730ef1d44aede474a7' \ 'f4fbcdeb9109489bf69e0976c68955381ff6d6d6' \ '965fc34bbe9998741ea07531772c9673b33aab99' \ '88b3caff739fbf7bd4eb143ae97925556e813ce4') From voroskoi at frugalware.org Thu Oct 2 09:13:52 2008 From: voroskoi at frugalware.org (voroskoi) Date: Thu Oct 2 09:13:54 2008 Subject: [Frugalware-git] frugalware-current: commoncpp2-1.6.3-1-i686 Message-ID: <20081002071352.7B3DB1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2a8781b3f923a870be08768dbceefc205212ab12 commit 2a8781b3f923a870be08768dbceefc205212ab12 Author: voroskoi Date: Thu Oct 2 09:13:39 2008 +0200 commoncpp2-1.6.3-1-i686 version bump diff --git a/source/lib-extra/commoncpp2/FrugalBuild b/source/lib-extra/commoncpp2/FrugalBuild index eac4166..b8e2acd 100644 --- a/source/lib-extra/commoncpp2/FrugalBuild +++ b/source/lib-extra/commoncpp2/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=commoncpp2 -pkgver=1.6.2 +pkgver=1.6.3 pkgrel=1 url="http://wiki.gnutelephony.org/index.php/GNU_Common_CPP_Framework" pkgdesc="GNU Common C++ is a portable and highly optimized class framework for writing C++ applications." From voroskoi at frugalware.org Thu Oct 2 09:18:46 2008 From: voroskoi at frugalware.org (voroskoi) Date: Thu Oct 2 09:18:48 2008 Subject: [Frugalware-git] frugalware-current: ccrtp-1.6.2-1-i686 Message-ID: <20081002071846.EE50E1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0e510e38e7877e967c72e01d3e88945bc8a90eeb commit 0e510e38e7877e967c72e01d3e88945bc8a90eeb Author: voroskoi Date: Thu Oct 2 09:18:34 2008 +0200 ccrtp-1.6.2-1-i686 version bump diff --git a/source/lib-extra/ccrtp/FrugalBuild b/source/lib-extra/ccrtp/FrugalBuild index 7d2d0cd..5cb6ab1 100644 --- a/source/lib-extra/ccrtp/FrugalBuild +++ b/source/lib-extra/ccrtp/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=ccrtp -pkgver=1.6.1 +pkgver=1.6.2 pkgrel=1 pkgdesc="GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF." url="http://wiki.gnutelephony.org/index.php/GNU_ccRTP" From voroskoi at frugalware.org Thu Oct 2 09:26:00 2008 From: voroskoi at frugalware.org (voroskoi) Date: Thu Oct 2 09:26:02 2008 Subject: [Frugalware-git] frugalware-current: libzrtpcpp-1.3.0-1-i686 Message-ID: <20081002072600.20EE51190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2fcaf4fd819247e4e78e22ab18d371c87b8544c8 commit 2fcaf4fd819247e4e78e22ab18d371c87b8544c8 Author: voroskoi Date: Thu Oct 2 09:25:42 2008 +0200 libzrtpcpp-1.3.0-1-i686 version bump diff --git a/source/lib-extra/libzrtpcpp/FrugalBuild b/source/lib-extra/libzrtpcpp/FrugalBuild index 669c027..02033ec 100644 --- a/source/lib-extra/libzrtpcpp/FrugalBuild +++ b/source/lib-extra/libzrtpcpp/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=libzrtpcpp -pkgver=1.1.0 +pkgver=1.3.0 pkgrel=1 pkgdesc="ZRTP extension for GNU ccRTP." url="http://wiki.gnutelephony.org/index.php/Zrtp_FAQ" From voroskoi at frugalware.org Thu Oct 2 09:55:20 2008 From: voroskoi at frugalware.org (voroskoi) Date: Thu Oct 2 09:55:24 2008 Subject: [Frugalware-git] frugalware-current: twinkle-1.3.2-1-i686 Message-ID: <20081002075520.B3B8F1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=50071d86722df6b97f9a9622f3f5446486f6752b commit 50071d86722df6b97f9a9622f3f5446486f6752b Author: voroskoi Date: Thu Oct 2 09:55:00 2008 +0200 twinkle-1.3.2-1-i686 version bump diff --git a/source/kde-extra/twinkle/FrugalBuild b/source/kde-extra/twinkle/FrugalBuild index 6cb7ad2..7617d28 100644 --- a/source/kde-extra/twinkle/FrugalBuild +++ b/source/kde-extra/twinkle/FrugalBuild @@ -2,18 +2,18 @@ # Maintainer: voroskoi pkgname=twinkle -pkgver=1.2 -pkgrel=2 +pkgver=1.3.2 +pkgrel=1 url="http://www.twinklephone.com/" pkgdesc="Twinkle is a soft phone for your voice over IP communcations using the SIP protocol." -depends=('libsndfile' 'kdelibs' 'speex' 'ilbc' 'libzrtpcpp>=1.0' 'libboost-mt>=1.35.0' 'libgl' 'libxmu' 'libxi' 'libxdamage') +depends=('libsndfile' 'kdelibs' 'speex' 'ilbc' 'libzrtpcpp>=1.3' 'libboost-mt>=1.35.0' 'libgl' 'libxmu' 'libxi' 'libxdamage') makedepends=('boost>=1.35.0') archs=('i686' 'x86_64') groups=('kde-extra') Finclude kde up2date="lynx -dump http://www.xs4all.nl/~mfnboer/twinkle/download.html |grep twinkle.*tar |sed -ne 's/.*-\(.*\).t.*/\1/;1p'" source=(http://www.xs4all.nl/~mfnboer/twinkle/download/twinkle-$pkgver.tar.gz) -sha1sums=('e54a9d451fb109fd66349e65028cba8c8372b165') +sha1sums=('0c6054bb5f6c981cf070f238df9773ef93feed1a') build() { Fsed "boost_regex-gcc" "boost_regex-mt" configure.in From janny at frugalware.org Thu Oct 2 12:31:43 2008 From: janny at frugalware.org (Janos Kovacs) Date: Thu Oct 2 12:31:44 2008 Subject: [Frugalware-git] frugalware-current: gimp-2.6.0-1-i686 Message-ID: <20081002103143.773011190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=01c9a1910e94ba69ae6dfd0c107193458f886bad commit 01c9a1910e94ba69ae6dfd0c107193458f886bad Author: Janos Kovacs Date: Thu Oct 2 12:30:53 2008 +0200 gimp-2.6.0-1-i686 * version bump diff --git a/source/xapps/gimp/FrugalBuild b/source/xapps/gimp/FrugalBuild index 8fc08f2..b1fab5e 100644 --- a/source/xapps/gimp/FrugalBuild +++ b/source/xapps/gimp/FrugalBuild @@ -3,18 +3,18 @@ # Contributor: VMiklos pkgname=gimp -pkgver=2.4.6 -pkgrel=2 +pkgver=2.6.0 +pkgrel=1 pkgdesc="The GNU Image Manipulation Program" url="http://www.gimp.org/" depends=('librsvg' 'libmng' 'libexif>=0.6.12-3' 'alsa-lib' 'libgtkhtml>=2.11.1-2' \ - 'desktop-file-utils' 'lcms' 'pygtk' 'aalib' 'libxpm') + 'desktop-file-utils' 'lcms' 'pygtk' 'aalib' 'libxpm' 'intltool' 'gegl') groups=('xapps') archs=('i686' 'x86_64' 'ppc') makedepends=('gimp-print' 'perl-xml-parser') up2date="lynx -dump $url/downloads/|grep tar.bz2|sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'" -source=(ftp://ftp.gimp.org/pub/gimp/v2.4/$pkgname-$pkgver.tar.bz2) -sha1sums=('6cbfda0da19bf5a2221013afe32643e3c09aeeda') +source=(ftp://ftp.gimp.org/pub/gimp/v2.6/$pkgname-$pkgver.tar.bz2) +sha1sums=('187effb5722a1d5943c48ec74a3be96c836215f6') options=('scriptlet' 'force') _F_gnome_desktop="y" Finclude gnome-scriptlet From crazy at frugalware.org Thu Oct 2 13:07:40 2008 From: crazy at frugalware.org (crazy) Date: Thu Oct 2 13:07:41 2008 Subject: [Frugalware-git] frugalware-current: glibc-2.8-7-x86_64 Message-ID: <20081002110740.754481190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=80dc1aa8661a4b17061fc9e8a315d8c116ce93ed commit 80dc1aa8661a4b17061fc9e8a315d8c116ce93ed Author: crazy Date: Thu Oct 2 12:56:46 2008 +0200 glibc-2.8-7-x86_64 * up to latest snapshot diff --git a/source/base/glibc/FrugalBuild b/source/base/glibc/FrugalBuild index 0e28dc4..c4aef04 100644 --- a/source/base/glibc/FrugalBuild +++ b/source/base/glibc/FrugalBuild @@ -4,8 +4,8 @@ pkgname=glibc pkgver=2.8 -pkgrel=6 -glibcsnap="20080922" +pkgrel=7 +glibcsnap="20080929" pkgdesc="GNU C Library" url="http://www.gnu.org/software/libc/libc.html" depends=() @@ -23,7 +23,7 @@ source=(ftp://sources.redhat.com/pub/glibc/snapshots/$pkgname-$pkgver-$glibcsnap nptl-powerpc.diff) ## this up2date is wrong but we get at least notified when an new snapshot is uploaded up2date="lynx -dump ftp://sources.redhat.com/pub/glibc/snapshots|grep $pkgname-$pkgver|Flasttarbz2|sed 's/-/_/'" -sha1sums=('641a94bc58671cfc2cda5d46c8ec2cc332e85095' \ +sha1sums=('9f2ad5f67bd484d390b33593ce4b613da8c260bd' \ '8735a5d35ae5f3b3771c1dc75d1221de6cda2d1e') build() From vmiklos at frugalware.org Thu Oct 2 13:43:03 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Oct 2 13:43:04 2008 Subject: [Frugalware-git] frugalware-current: fwsetup-0.9.6-1-ppc Message-ID: <20081002114303.18FD61190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f3ead0cb7a7c0d4c3f631b3ced2ac6bbc9fcaeec commit f3ead0cb7a7c0d4c3f631b3ced2ac6bbc9fcaeec Author: Miklos Vajna Date: Thu Oct 2 03:26:42 2008 +0200 fwsetup-0.9.6-1-ppc - added ppc to archs() diff --git a/source/devel-extra/fwsetup/FrugalBuild b/source/devel-extra/fwsetup/FrugalBuild index 56c59a7..eca8d40 100644 --- a/source/devel-extra/fwsetup/FrugalBuild +++ b/source/devel-extra/fwsetup/FrugalBuild @@ -18,7 +18,7 @@ else makedepends=(${makedepends[@]} 'yaboot' 'hfsutils') fi groups=('devel-extra') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') _F_archive_nosort=y up2date="lynx -dump $url/releases/ |Flasttar" if ! Fuse $USE_DEVEL; then From ryuo at frugalware.org Thu Oct 2 14:38:31 2008 From: ryuo at frugalware.org (James Buren) Date: Thu Oct 2 14:38:32 2008 Subject: [Frugalware-git] frugalware-current: seamonkey-adblock_plus-0.7.5.5-1-i686 Message-ID: <20081002123831.305AA1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8d2d1a36d516e7682f1ef7c556aa4b0d5b039d02 commit 8d2d1a36d516e7682f1ef7c556aa4b0d5b039d02 Author: James Buren Date: Thu Oct 2 07:38:49 2008 -0500 seamonkey-adblock_plus-0.7.5.5-1-i686 * attempt to fix testsuite diff --git a/source/xapps-extra/seamonkey-adblock_plus/FrugalBuild b/source/xapps-extra/seamonkey-adblock_plus/FrugalBuild index 2b5c1b3..16f7a3c 100644 --- a/source/xapps-extra/seamonkey-adblock_plus/FrugalBuild +++ b/source/xapps-extra/seamonkey-adblock_plus/FrugalBuild @@ -1,12 +1,12 @@ # Compiling Time: 0.01 SBU # Maintainer: James Buren -_F_seamonkey_name=adblock_plus -_F_seamonkey_ext=-fx+tb+sm.xpi +_F_seamonkey_name="adblock_plus" +_F_seamonkey_ext="-fx+tb+sm.xpi" pkgver=0.7.5.5 pkgrel=1 pkgdesc="Adblock plus makes ads a thing of the past. (seamonkey version)" url="https://addons.mozilla.org/en-US/seamonkey/addon/1865" -source=(https://addons.mozilla.org/en-US/seamonkey/downloads/file/30901/$_F_seamonkey_name$Fpkgversep$pkgver$_F_seamonkey_ext) +source=(https://addons.mozilla.org/en-US/seamonkey/downloads/file/30901/${_F_seamonkey_name}${Fpkgversep}${pkgver}${_F_seamonkey_ext}) sha1sums=('514f17e8ace564094954de8abb293843a47c637f') Finclude seamonkey-addon From ryuo at frugalware.org Thu Oct 2 14:43:15 2008 From: ryuo at frugalware.org (James Buren) Date: Thu Oct 2 14:43:16 2008 Subject: [Frugalware-git] frugalware-current: seamonkey-addon.sh Message-ID: <20081002124315.256EC1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0c2dfe1593071a2ad18bf65633aff08484185f53 commit 0c2dfe1593071a2ad18bf65633aff08484185f53 Author: James Buren Date: Thu Oct 2 07:43:49 2008 -0500 seamonkey-addon.sh * added a message to clarify an Fdie diff --git a/source/include/seamonkey-addon.sh b/source/include/seamonkey-addon.sh index 56a827f..304aaba 100644 --- a/source/include/seamonkey-addon.sh +++ b/source/include/seamonkey-addon.sh @@ -31,6 +31,7 @@ ### if [ -z "$_F_seamonkey_name" ]; then + Fmessage "You must specify the _F_seamonkey_name variable." Fdie else pkgname="seamonkey-$_F_seamonkey_name" From vmiklos at frugalware.org Thu Oct 2 15:01:29 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Oct 2 15:01:31 2008 Subject: [Frugalware-git] frugalware-current: bzr-1.7.1-1-i686 Message-ID: <20081002130129.650041190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e547d42d9e5002f7fbe1cad422beef7c468d099e commit e547d42d9e5002f7fbe1cad422beef7c468d099e Author: Miklos Vajna Date: Thu Oct 2 15:01:18 2008 +0200 bzr-1.7.1-1-i686 - version bump diff --git a/source/devel-extra/bzr/FrugalBuild b/source/devel-extra/bzr/FrugalBuild index 7ff18c5..9d4cf2c 100644 --- a/source/devel-extra/bzr/FrugalBuild +++ b/source/devel-extra/bzr/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna pkgname=bzr -pkgver=1.7 +pkgver=1.7.1 pkgrel=1 pkgdesc="Next generation distributed version control" url="http://bazaar-vcs.org" From vmiklos at frugalware.org Thu Oct 2 15:19:10 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Oct 2 15:19:11 2008 Subject: [Frugalware-git] frugalware-current: mailx-12.4-2-ppc Message-ID: <20081002131910.28FFC1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a369935ad6fc0cbcd00f907b6005e1a734b019b3 commit a369935ad6fc0cbcd00f907b6005e1a734b019b3 Author: Miklos Vajna Date: Thu Oct 2 15:18:46 2008 +0200 mailx-12.4-2-ppc added ppc to archs() diff --git a/source/network/mailx/FrugalBuild b/source/network/mailx/FrugalBuild index 193c0b5..d3ac4bc 100644 --- a/source/network/mailx/FrugalBuild +++ b/source/network/mailx/FrugalBuild @@ -14,7 +14,7 @@ url="http://heirloom.sourceforge.net/mailx.html" backup=('etc/nail.rc') depends=('heimdal>=1.2.1') groups=('network') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump $url |grep mailx.*tar |sed -e 's/.*x-\(.*\).t.*/\1/'" sha1sums=('b1e105adf9d36269daf317dedf68b6e4cca404a7') From vmiklos at frugalware.org Thu Oct 2 15:22:12 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Oct 2 15:22:14 2008 Subject: [Frugalware-git] frugalware-current: xf86-video-mach64-6.8.0-1-ppc Message-ID: <20081002132212.CCC581190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4d9ddefc03c16e16a9946d04147ea115a5a7060b commit 4d9ddefc03c16e16a9946d04147ea115a5a7060b Author: Miklos Vajna Date: Thu Oct 2 15:22:08 2008 +0200 xf86-video-mach64-6.8.0-1-ppc added ppc to archs() diff --git a/source/x11/xf86-video-mach64/FrugalBuild b/source/x11/xf86-video-mach64/FrugalBuild index 8f6a400..5b5c42b 100644 --- a/source/x11/xf86-video-mach64/FrugalBuild +++ b/source/x11/xf86-video-mach64/FrugalBuild @@ -7,7 +7,7 @@ pkgrel=1 pkgdesc="X.Org video driver for mach64 cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') depends=('xorg-server>=1.4.0.90') makedepends=('randrproto' 'renderproto' 'xineramaproto' 'videoproto' 'xf86driproto' 'glproto') Finclude xorg From vmiklos at frugalware.org Thu Oct 2 15:22:32 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Oct 2 15:22:33 2008 Subject: [Frugalware-git] frugalware-current: rails-2.1.1-1-i686 Message-ID: <20081002132232.035D91190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=be0414fce851f9461b3c44ae6dd27604121839fa commit be0414fce851f9461b3c44ae6dd27604121839fa Author: Miklos Vajna Date: Thu Oct 2 15:22:12 2008 +0200 rails-2.1.1-1-i686 - version bump - closes #3368 diff --git a/source/devel-extra/rails/FrugalBuild b/source/devel-extra/rails/FrugalBuild index 7a64656..c5fa0b3 100644 --- a/source/devel-extra/rails/FrugalBuild +++ b/source/devel-extra/rails/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Bence Nagy pkgname=rails -pkgver=2.1.0 +pkgver=2.1.1 pkgrel=1 pkgdesc="Ruby on Rails is a web-application and persistance framework" url="http://www.rubyonrails.org/" @@ -31,4 +31,4 @@ build() { # optimization OK -sha1sums=('7c5ab9edba65923d7332d842217e0e7fc6b66404') +sha1sums=('df16906481cd5602ff62df61254f28ab7e485882') From vmiklos at frugalware.org Thu Oct 2 15:25:01 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Oct 2 15:25:03 2008 Subject: [Frugalware-git] frugalware-current: xf86-video-r128-6.8.0-1-ppc Message-ID: <20081002132501.E432C1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f5fbaa40788b254459b740c7bc69b512cea76112 commit f5fbaa40788b254459b740c7bc69b512cea76112 Author: Miklos Vajna Date: Thu Oct 2 15:24:53 2008 +0200 xf86-video-r128-6.8.0-1-ppc added ppc to archs() diff --git a/source/x11/xf86-video-r128/FrugalBuild b/source/x11/xf86-video-r128/FrugalBuild index 3582783..216e164 100644 --- a/source/x11/xf86-video-r128/FrugalBuild +++ b/source/x11/xf86-video-r128/FrugalBuild @@ -7,7 +7,7 @@ pkgrel=1 pkgdesc="X.Org video driver for r128 cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') depends=('xorg-server>=1.4.0.90') makedepends=('randrproto' 'renderproto' 'xineramaproto' 'videoproto' 'xf86driproto' 'glproto') Finclude xorg From vmiklos at frugalware.org Thu Oct 2 15:52:30 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Oct 2 15:52:31 2008 Subject: [Frugalware-git] pacman-g2: scripts/makepkg Message-ID: <20081002135230.047AC1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=dda53e45373f2e707016a1fc51391101af290756 commit dda53e45373f2e707016a1fc51391101af290756 Author: Marcus Habermehl (BMH1980) Date: Tue Sep 30 12:35:34 2008 +0200 scripts/makepkg changing GZIP to USEGZIP, because GZIP is an environment variable of the gzip binary diff --git a/scripts/makepkg b/scripts/makepkg index d40a0ea..58876be 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -51,7 +51,7 @@ NOSTRIP=0 RMDEPS=0 CHROOT=1 NOUP2DATE=0 -GZIP=0 +USEGZIP=0 NODOCS=0 TREE="" CACHEURL="" @@ -573,7 +573,7 @@ create_pkg() extra="$extra .CHANGELOG" fi - if [ "$GZIP" == "1" ]; then + if [ "$USEGZIP" == "1" ]; then tarargs="czf" warning "Using gzip compression - this is not optimal!" else @@ -710,7 +710,7 @@ while [ "$#" -ne "0" ]; do --host) CHROOT=0 ;; --noup2date) NOUP2DATE=1 ;; --logging) ;; # we can remove this after Frugalware-0.7 is out - --gzip) GZIP=1 ;; + --gzip) USEGZIP=1 ;; --help) usage exit 0 From vmiklos at frugalware.org Thu Oct 2 16:39:10 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Oct 2 16:39:12 2008 Subject: [Frugalware-git] pacman-tools: mkiso: use -V, not just -hfs-volid on ppc Message-ID: <20081002143910.AE43D1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=8ba173e481730b7a67aa9d5eb1a29e49e5e0b853 commit 8ba173e481730b7a67aa9d5eb1a29e49e5e0b853 Author: Miklos Vajna Date: Thu Oct 2 16:38:50 2008 +0200 mkiso: use -V, not just -hfs-volid on ppc diff --git a/mkiso/mkiso.c b/mkiso/mkiso.c index e2d9e30..0fbf650 100644 --- a/mkiso/mkiso.c +++ b/mkiso/mkiso.c @@ -356,6 +356,7 @@ int mkiso(volume_t *volume, int countonly, int stable, int dryrun) cmdline = g_strdup_printf("mkhybrid -o %s " "-r -hfs-unlock -part -hfs -map ./boot/yaboot/maps " "-no-desktop -hfs-volid \"Frugalware Install\" " + "-V \"Frugalware Install\" " "-graft-points " "-path-list %s", fname, flist); From priyank at frugalware.org Thu Oct 2 16:42:24 2008 From: priyank at frugalware.org (Priyank) Date: Thu Oct 2 16:42:25 2008 Subject: [Frugalware-git] frugalware-current: gimmix-0.5.1-1-i686 Message-ID: <20081002144224.2B57C1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2fd57544459416b4c1ab28875d789d6f5cd5d27d commit 2fd57544459416b4c1ab28875d789d6f5cd5d27d Author: Priyank Date: Thu Oct 2 20:10:21 2008 +0530 gimmix-0.5.1-1-i686 * Version bump diff --git a/source/xapps-extra/gimmix/FrugalBuild b/source/xapps-extra/gimmix/FrugalBuild index c5422f7..7526a2d 100644 --- a/source/xapps-extra/gimmix/FrugalBuild +++ b/source/xapps-extra/gimmix/FrugalBuild @@ -2,18 +2,17 @@ # Maintainer: Priyank Gosalia pkgname=gimmix -pkgver=0.5.0 -pkgrel=2 +pkgver=0.5.1 +pkgrel=1 pkgdesc="Gimmix is a graphical music player daemon (MPD) client." _F_berlios_ext=".tar.bz2" Finclude berlios url="http://gimmix.berlios.de/" rodepends=('mpd') -depends=('gtk+2' 'libglade' 'libmpd>=0.16.0' 'libnxml' 'taglib') +depends=('gtk+2' 'libglade' 'libmpd>=0.16.1' 'libnxml' 'taglib') makedepends=('intltool') groups=('xapps-extra') archs=('i686' 'x86_64') -Fconfopts="${Fconfopts[@]} --enable-cover --enable-lyrics" -sha1sums=('44fd29bdc59334dfeb645dfa1d834d9b496c20bb') +sha1sums=('68ada97cb4bc2d2f8e0042649b1e4af2dd1284a4') # optimization OK From vmiklos at frugalware.org Thu Oct 2 17:37:18 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Oct 2 17:37:20 2008 Subject: [Frugalware-git] frugalware-current: busybox-1.12.1-2-i686 Message-ID: <20081002153718.73AF31190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c7ada702b5ebbb0ef0630656ee19dc96a297ba18 commit c7ada702b5ebbb0ef0630656ee19dc96a297ba18 Author: Miklos Vajna Date: Thu Oct 2 17:36:53 2008 +0200 busybox-1.12.1-2-i686 - make tar -j / -z work again diff --git a/source/apps-extra/busybox/FrugalBuild b/source/apps-extra/busybox/FrugalBuild index 5c72bde..ad26ea2 100644 --- a/source/apps-extra/busybox/FrugalBuild +++ b/source/apps-extra/busybox/FrugalBuild @@ -3,7 +3,7 @@ pkgname=busybox pkgver=1.12.1 -pkgrel=1 +pkgrel=2 pkgdesc="Utilities for rescue and embedded systems." url="http://www.busybox.net/" depends=('glibc') @@ -13,7 +13,7 @@ up2date="lynx -dump 'http://busybox.net/'|grep '(stable)'|sed 's/[^,]*BusyBox \( source=(http://www.busybox.net/downloads/busybox-$pkgver.tar.bz2 config) # NOTE: we can't use signatures() here as the author signes only the checksums sha1sums=('e405e2d6587714626c8eb7d181f63208f3997845' \ - '00bbf490feb2a9702c1d77e7edf3f8e590310cd6') + '75455cdce81580baba40800bf90d71c4c84c3f69') build() { diff --git a/source/apps-extra/busybox/config b/source/apps-extra/busybox/config index bc01af5..047f913 100644 --- a/source/apps-extra/busybox/config +++ b/source/apps-extra/busybox/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.12.1 -# Mon Sep 29 09:54:22 2008 +# Thu Oct 2 17:33:41 2008 # CONFIG_HAVE_DOT_CONFIG=y @@ -102,8 +102,8 @@ CONFIG_FEATURE_HWIB=y # Archival Utilities # # CONFIG_FEATURE_SEAMLESS_LZMA is not set -# CONFIG_FEATURE_SEAMLESS_BZ2 is not set -# CONFIG_FEATURE_SEAMLESS_GZ is not set +CONFIG_FEATURE_SEAMLESS_BZ2=y +CONFIG_FEATURE_SEAMLESS_GZ=y # CONFIG_FEATURE_SEAMLESS_Z is not set # CONFIG_AR is not set # CONFIG_FEATURE_AR_LONG_FILENAMES is not set From vmiklos at frugalware.org Thu Oct 2 17:38:45 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Oct 2 17:38:46 2008 Subject: [Frugalware-git] frugalware-current: fwsetup-0.9.6-2-i686 Message-ID: <20081002153845.B13AC1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=90ac77384ba4014ba3dc53ca6d028dc12a9301d7 commit 90ac77384ba4014ba3dc53ca6d028dc12a9301d7 Author: Miklos Vajna Date: Thu Oct 2 17:38:20 2008 +0200 fwsetup-0.9.6-2-i686 - rebuild with newer busybox diff --git a/source/devel-extra/fwsetup/FrugalBuild b/source/devel-extra/fwsetup/FrugalBuild index eca8d40..22b9f49 100644 --- a/source/devel-extra/fwsetup/FrugalBuild +++ b/source/devel-extra/fwsetup/FrugalBuild @@ -6,11 +6,12 @@ USE_DEVEL=${USE_DEVEL:-"n"} pkgname=fwsetup pkgver=0.9.6 Fuse $USE_DEVEL && pkgver=0.8.8.9.gd348556 -pkgrel=1 +pkgrel=2 pkgdesc="Frugalware Setup" url="http://ftp.frugalware.org/pub/other/setup/" depends=() -makedepends=('dialog' 'parted' 'pacman-g2>=3.5.5' 'module-init-tools' 'frugalware>=0.9') +makedepends=('dialog' 'parted' 'pacman-g2>=3.5.5' 'module-init-tools' \ + 'frugalware>=0.9' 'busybox>=1.12.1-2') if [ "$CARCH" != "ppc" ]; then Fconfopts="$Fconfopts --enable-tftp" makedepends=(${makedepends[@]} 'grub') From j3d1f0x at free.fr Thu Oct 2 19:52:29 2008 From: j3d1f0x at free.fr (gholafox) Date: Thu Oct 2 19:52:32 2008 Subject: [Frugalware-git] frugalware-current: arora-0.4-1-i686 Message-ID: <20081002175229.BB2D71190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5709f60cf50d501292fd5a4676dd56581853ba44 commit 5709f60cf50d501292fd5a4676dd56581853ba44 Author: gholafox Date: Thu Oct 2 19:49:03 2008 +0200 arora-0.4-1-i686 * Update version diff --git a/source/xapps-extra/arora/FrugalBuild b/source/xapps-extra/arora/FrugalBuild index 1886fa0..8a8a136 100644 --- a/source/xapps-extra/arora/FrugalBuild +++ b/source/xapps-extra/arora/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: gholafox pkgname=arora -pkgver=0.3 +pkgver=0.4 pkgrel=1 pkgdesc="Web browser written in Qt and which use webkit." _F_gnome_iconcache="y" @@ -11,8 +11,8 @@ source=($source prefix.diff) makedepends=('qt4-linguist') depends=('libqtwebkit') groups=('xapps-extra') -archs=('i686' 'x86_64') -sha1sums=('560707e2e20bbc18f3692f227033111b0f41af34' \ +archs=('i686') +sha1sums=('b3facd08256c4622fc08cafa0cb0202d9b468f18' \ '3b8db0e28bd4f65433559811226903bfc68bf32d') build() { From priyank at frugalware.org Thu Oct 2 21:03:19 2008 From: priyank at frugalware.org (Priyank) Date: Thu Oct 2 21:03:21 2008 Subject: [Frugalware-git] frugalware-current: slim-1.3.1-1-i686 Message-ID: <20081002190319.E42D71190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=09826cd2b75e8bad68248379a2eb78c9678e3244 commit 09826cd2b75e8bad68248379a2eb78c9678e3244 Author: Priyank Date: Fri Oct 3 00:29:29 2008 +0530 slim-1.3.1-1-i686 * Version bump * updated Makefile patch diff --git a/source/xfce4/slim/FrugalBuild b/source/xfce4/slim/FrugalBuild index ad60c79..b8bae98 100644 --- a/source/xfce4/slim/FrugalBuild +++ b/source/xfce4/slim/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Priyank Gosalia pkgname=slim -pkgver=1.3.0 -pkgrel=5 +pkgver=1.3.1 +pkgrel=1 pkgdesc="SLiM is a lightweight, Desktop-independent graphical login manager for X11." depends=('libpng' 'libjpeg') makedepends=('libx11' 'libxft' 'libxmu') @@ -20,11 +20,11 @@ source=(${source[@]} \ ftp://ftp.frugalware.org/pub/other/people/priyank/slim/frugalware-0.7.tar.bz2 \ Fix_GCC43.diff) -sha1sums=('f27f40c73a2f757f1ae32155bf0438c97be2c019' \ +sha1sums=('30152b280724daf75299a8ee16585041f253ed4f' \ '98dcec8ae2d52ae9c9b5abcfa3d145882a0848bd' \ 'a17849f628f4f74cf1bd48eea21a144f2f1a274d' \ - '279111ffb45456f646250fb5e21eec53426c0a9b' \ - 'bb38d2ca1ab7a8e0c7d8d7a98760d602974a5fef'\ + '76e2bc4f4415271535735026c064403c4236afe2' \ + 'bb38d2ca1ab7a8e0c7d8d7a98760d602974a5fef' \ '13b28c06f03fdadfb45dcf1b21bb8d64fccd32ff') build() diff --git a/source/xfce4/slim/slim-1.3.0-cflags.diff b/source/xfce4/slim/slim-1.3.0-cflags.diff deleted file mode 100644 index 66709a2..0000000 --- a/source/xfce4/slim/slim-1.3.0-cflags.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur slim-1.3.0/Makefile slim-1.3.0.new/Makefile ---- slim-1.3.0/Makefile 2007-07-15 19:39:28.000000000 +0530 -+++ slim-1.3.0.new/Makefile 2007-08-28 16:04:15.000000000 +0530 -@@ -5,9 +5,9 @@ - ####################################################### - CXX=/usr/bin/g++ - CC=/usr/bin/gcc --CFLAGS=-Wall -I. -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include -+CFLAGS+=-Wall -I. -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include - CXXFLAGS=$(CFLAGS) --LDFLAGS=-L/usr/X11R6/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg -+LDFLAGS+=-L/usr/X11R6/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg - CUSTOM=-DHAVE_SHADOW - ifdef USE_PAM - LDFLAGS+= -lpam diff --git a/source/xfce4/slim/slim-1.3.1-cflags.diff b/source/xfce4/slim/slim-1.3.1-cflags.diff new file mode 100644 index 0000000..5e261d4 --- /dev/null +++ b/source/xfce4/slim/slim-1.3.1-cflags.diff @@ -0,0 +1,15 @@ +diff -Naur slim-1.3.1/Makefile slim-1.3.1.new/Makefile +--- slim-1.3.1/Makefile 2008-09-26 06:24:15.000000000 +0530 ++++ slim-1.3.1.new/Makefile 2008-10-03 00:24:09.000000000 +0530 +@@ -5,9 +5,9 @@ + ####################################################### + CXX=/usr/bin/g++ + CC=/usr/bin/gcc +-CFLAGS=-Wall -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include ++CFLAGS+=-Wall -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include + CXXFLAGS=$(CFLAGS) +-LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg ++LDFLAGS+=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg + CUSTOM=-DHAVE_SHADOW + ifdef USE_PAM + LDFLAGS+= -lpam From bouleetbil at frogdev.info Thu Oct 2 21:51:33 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Oct 2 21:51:34 2008 Subject: [Frugalware-git] bouleetbilgnome224: gtk2-sharp-2.12.4-1-i686 Message-ID: <20081002195133.181FB1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=95cb8deb9b5b92fe9669d35a3ce26625c52a72b2 commit 95cb8deb9b5b92fe9669d35a3ce26625c52a72b2 Author: bouleetbil Date: Thu Oct 2 21:48:52 2008 +0200 gtk2-sharp-2.12.4-1-i686 *version bump diff --git a/source/gnome/gtk2-sharp/FrugalBuild b/source/gnome/gtk2-sharp/FrugalBuild index 86878a4..7dae4ed 100644 --- a/source/gnome/gtk2-sharp/FrugalBuild +++ b/source/gnome/gtk2-sharp/FrugalBuild @@ -3,11 +3,11 @@ pkgname=gtk2-sharp _F_gnome_name=gtk-sharp -pkgver=2.12.1 +pkgver=2.12.4 pkgrel=1 pkgdesc="A C# language binding for the GTK+2 toolkit" url="http://www.mono-project.com/GtkSharp" -depends=('mono>=1.9' 'gtk+2>=2.12.9' 'libglade' 'libxdamage') +depends=('mono>=1.9' 'gtk+2>=2.14.3' 'libglade' 'libxdamage') provides=('gtk-sharp') replaces=('gtk-sharp') groups=('gnome') @@ -15,7 +15,7 @@ archs=('i686' 'x86_64' 'ppc') _F_cd_path="$_F_gnome_name-$pkgver" _F_mono_aot=0 Finclude gnome mono -sha1sums=('0208d9f6119fd72162dc12d4be98429d34bb6858') +sha1sums=('e189e7fbf4331b02570bb0788bc710c8bb9dd2fd') unset MAKEFLAGS From bouleetbil at frogdev.info Thu Oct 2 22:03:38 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Oct 2 22:03:39 2008 Subject: [Frugalware-git] bouleetbilgnome224: gnome-sharp-2.24.0-1-i686 Message-ID: <20081002200338.129421190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=64efa5cc89f92d4636bccf41f2574d4653cc98c0 commit 64efa5cc89f92d4636bccf41f2574d4653cc98c0 Author: bouleetbil Date: Thu Oct 2 22:01:15 2008 +0200 gnome-sharp-2.24.0-1-i686 *version bump diff --git a/source/gnome/gnome-sharp/FrugalBuild b/source/gnome/gnome-sharp/FrugalBuild index b14c79f..5332742 100644 --- a/source/gnome/gnome-sharp/FrugalBuild +++ b/source/gnome/gnome-sharp/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: AlexExtreme pkgname=gnome-sharp -pkgver=2.20.1 +pkgver=2.24.0 pkgrel=1 pkgdesc="C# bindings for the Gnome desktop" url="http://www.gnome.org" -depends=('gtk2-sharp>=2.12.1' 'libart_lgpl' 'gnome-vfs>=2.22.0' 'libgnomecanvas>=2.20.1.1-2' \ - 'gnome-panel>=2.22.1.1' 'libgnomeprintui>=2.18.2-2') +depends=('gtk2-sharp>=2.12.4' 'libart_lgpl' 'gnome-vfs>=2.24.0' 'libgnomecanvas>=2.20.1.1-2' \ + 'gnome-panel>=2.24.0' 'libgnomeprintui>=2.18.2-2') groups=('gnome') archs=('i686' 'x86_64' 'ppc') _F_mono_aot=0 Finclude gnome mono -sha1sums=('84e2a9c71aee7d18f3afe7b0a96046932d269523') +sha1sums=('7cb0607e19019771ec707df1bcd2b5b71d835c54') unset MAKEFLAGS From bouleetbil at frogdev.info Thu Oct 2 22:15:19 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Oct 2 22:15:19 2008 Subject: [Frugalware-git] bouleetbilgnome224: gnome-doc-utils-0.14.0-1-i686 Message-ID: <20081002201519.1FD651190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=ec8f8b95c116cd3ab5177c2ac160a89f062b3b80 commit ec8f8b95c116cd3ab5177c2ac160a89f062b3b80 Author: bouleetbil Date: Thu Oct 2 22:12:59 2008 +0200 gnome-doc-utils-0.14.0-1-i686 *version bump diff --git a/source/gnome-extra/gnome-doc-utils/FrugalBuild b/source/gnome-extra/gnome-doc-utils/FrugalBuild index 8ceaf46..dde1b2d 100644 --- a/source/gnome-extra/gnome-doc-utils/FrugalBuild +++ b/source/gnome-extra/gnome-doc-utils/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-doc-utils -pkgver=0.12.2 +pkgver=0.14.0 pkgrel=1 pkgdesc="A collection of documentation utilities for GNOME" url="http://www.gnome.org/" @@ -12,6 +12,6 @@ groups=('gnome-extra') archs=('i686' 'x86_64' 'ppc') _F_gnome_scrollkeeper="y" Finclude gnome gnome-scriptlet +sha1sums=('e3de92c19f9140cbdee9f6ad0b179e4e797b3505') -sha1sums=('8006f6c2c3cf41c6be0295b4ba48df0d4d4f51d1') # optimization OK From bouleetbil at frogdev.info Thu Oct 2 22:33:32 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Oct 2 22:33:34 2008 Subject: [Frugalware-git] bouleetbilgnome224: gnome-desktop-sharp-2.24.0-1-i686 Message-ID: <20081002203332.70F221190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=326920521e2173dd3ed092d86260904ccca43938 commit 326920521e2173dd3ed092d86260904ccca43938 Author: bouleetbil Date: Thu Oct 2 22:31:10 2008 +0200 gnome-desktop-sharp-2.24.0-1-i686 *version bump diff --git a/source/gnome/gnome-desktop-sharp/FrugalBuild b/source/gnome/gnome-desktop-sharp/FrugalBuild index 4baeea6..bee5c83 100644 --- a/source/gnome/gnome-desktop-sharp/FrugalBuild +++ b/source/gnome/gnome-desktop-sharp/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-desktop-sharp -pkgver=2.20.1 +pkgver=2.24.0 pkgrel=1 pkgdesc="C# bindings for the Gnome desktop" url="http://www.gnome.org" -depends=('gtk2-sharp>=2.12.0' 'libart_lgpl' 'librsvg>=2.22.2' 'gtkhtml>=3.18.1' 'vte>=0.16.13' \ - 'nautilus-cd-burner>=2.22.1' 'gtksourceview>=2.2.1' 'libwnck>=2.22.1' 'gnome-sharp>=2.20.0-2') +depends=('gtk2-sharp>=2.12.4' 'libart_lgpl' 'librsvg>=2.22.2' 'gtkhtml>=3.18.1' 'vte>=0.17.4' \ + 'nautilus-cd-burner>=2.24.0' 'gtksourceview>=2.2.1' 'libwnck>=2.22.1' 'gnome-sharp>=2.24.0') groups=('gnome') archs=('i686' 'x86_64' 'ppc') _F_mono_aot=0 Finclude gnome mono -sha1sums=('b99729f7a7265fb1cecf09ced31e009e3ccd66bb') +sha1sums=('bfc56b97d9fb19dd2b69c3b509d0b7bf95365c10') unset MAKEFLAGS From bouleetbil at frogdev.info Thu Oct 2 22:55:17 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Oct 2 22:55:21 2008 Subject: [Frugalware-git] bouleetbilgnome224: gnome-power-manager-2.24.0-1-i686 Message-ID: <20081002205517.ED4161190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=c273d45b13bf38a7477429adc494a3771432c229 commit c273d45b13bf38a7477429adc494a3771432c229 Author: bouleetbil Date: Thu Oct 2 22:51:39 2008 +0200 gnome-power-manager-2.24.0-1-i686 *version bump *added patch for disable pam I HATE PAM diff --git a/source/gnome/gnome-power-manager/DisableHelp.diff b/source/gnome/gnome-power-manager/DisableHelp.diff new file mode 100644 index 0000000..479eed2 --- /dev/null +++ b/source/gnome/gnome-power-manager/DisableHelp.diff @@ -0,0 +1,11 @@ +--- gnome-power-manager-2.24.0old/Makefile.am 2008-09-04 12:05:20.000000000 +0200 ++++ gnome-power-manager-2.24.0/Makefile.am 2008-10-02 22:26:05.000000000 +0200 +@@ -11,7 +11,6 @@ + docs \ + man \ + data \ +- help \ + tools + + if HAVE_APPLETS + diff --git a/source/gnome/gnome-power-manager/Fix_disablepam.diff b/source/gnome/gnome-power-manager/Fix_disablepam.diff new file mode 100644 index 0000000..5d27d4f --- /dev/null +++ b/source/gnome/gnome-power-manager/Fix_disablepam.diff @@ -0,0 +1,13257 @@ +--- gnome-power-manager-2.24.0old/configure 2008-09-22 22:46:09.000000000 +0200 ++++ gnome-power-manager-2.24.0/configure 2008-10-02 14:22:35.000000000 +0200 +@@ -1,9 +1,9 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.61 for gnome-power-manager 2.24.0. ++# Generated by GNU Autoconf 2.63 for gnome-power-manager 2.24.0. + # + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. + ## --------------------- ## +@@ -15,7 +15,7 @@ + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # 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 +@@ -37,17 +37,45 @@ + as_cr_digits='0123456789' + as_cr_alnum=$as_cr_Letters$as_cr_digits + +-# The user is always right. +-if test "${PATH_SEPARATOR+set}" != set; then +- echo "#! /bin/sh" >conf$$.sh +- echo "exit 0" >>conf$$.sh +- chmod +x conf$$.sh +- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then +- PATH_SEPARATOR=';' ++as_nl=' ++' ++export as_nl ++# Printing a long string crashes Solaris 7 /usr/bin/printf. ++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 ++ as_echo='printf %s\n' ++ as_echo_n='printf %s' ++else ++ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then ++ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' ++ as_echo_n='/usr/ucb/echo -n' + else +- PATH_SEPARATOR=: ++ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' ++ as_echo_n_body='eval ++ arg=$1; ++ case $arg in ++ *"$as_nl"*) ++ expr "X$arg" : "X\\(.*\\)$as_nl"; ++ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; ++ esac; ++ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" ++ ' ++ export as_echo_n_body ++ as_echo_n='sh -c $as_echo_n_body as_echo' + fi +- rm -f conf$$.sh ++ export as_echo_body ++ as_echo='sh -c $as_echo_body as_echo' ++fi ++ ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ PATH_SEPARATOR=: ++ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { ++ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || ++ PATH_SEPARATOR=';' ++ } + fi + + # Support unset when possible. +@@ -63,8 +91,6 @@ + # there to prevent editors from complaining about space-tab. + # (If _AS_PATH_WALK were called with IFS unset, it would disable word + # splitting by setting IFS to empty value.) +-as_nl=' +-' + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +@@ -87,7 +113,7 @@ + as_myself=$0 + fi + if test ! -f "$as_myself"; then +- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } + fi + +@@ -100,17 +126,10 @@ + PS4='+ ' + + # NLS nuisances. +-for as_var in \ +- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ +- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ +- LC_TELEPHONE LC_TIME +-do +- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then +- eval $as_var=C; export $as_var +- else +- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +- fi +-done ++LC_ALL=C ++export LC_ALL ++LANGUAGE=C ++export LANGUAGE + + # Required to use basename. + if expr a : '\(a\)' >/dev/null 2>&1 && +@@ -132,7 +151,7 @@ + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +-echo X/"$0" | ++$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q +@@ -158,7 +177,7 @@ + as_have_required=no + fi + +- if test $as_have_required = yes && (eval ": ++ if test $as_have_required = yes && (eval ": + (as_func_return () { + (exit \$1) + } +@@ -240,7 +259,7 @@ + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # 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 +@@ -261,7 +280,7 @@ + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # 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 +@@ -341,10 +360,10 @@ + + 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 +- export CONFIG_SHELL +- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} ++ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++ done ++ export CONFIG_SHELL ++ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + fi + + +@@ -413,9 +432,10 @@ + + test \$exitcode = 0") || { + echo No shell found that supports shell functions. +- echo Please tell autoconf@gnu.org about your system, +- echo including any error possibly output before this +- echo message ++ 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. + } + + +@@ -451,7 +471,7 @@ + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || +- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 ++ { $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 +@@ -479,7 +499,6 @@ + *) + ECHO_N='-n';; + esac +- + if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +@@ -492,19 +511,22 @@ + rm -f conf$$.dir/conf$$.file + else + rm -f conf$$.dir +- mkdir conf$$.dir ++ mkdir conf$$.dir 2>/dev/null + fi +-echo >conf$$.file +-if ln -s conf$$.file conf$$ 2>/dev/null; then +- as_ln_s='ln -s' +- # ... but there are two gotchas: +- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. +- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -p'. +- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || ++if (echo >conf$$.file) 2>/dev/null; then ++ if ln -s conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s='ln -s' ++ # ... but there are two gotchas: ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. ++ # In both cases, we have to default to `cp -p'. ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || ++ as_ln_s='cp -p' ++ elif ln conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s=ln ++ else + as_ln_s='cp -p' +-elif ln conf$$.file conf$$ 2>/dev/null; then +- as_ln_s=ln ++ fi + else + as_ln_s='cp -p' + fi +@@ -529,10 +551,10 @@ + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then +- test -d "$1/."; ++ test -d "$1/."; + else + case $1 in +- -*)set "./$1";; ++ -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi +@@ -767,235 +789,268 @@ + # include + #endif" + +-ac_subst_vars='SHELL +-PATH_SEPARATOR +-PACKAGE_NAME +-PACKAGE_TARNAME +-PACKAGE_VERSION +-PACKAGE_STRING +-PACKAGE_BUGREPORT +-exec_prefix +-prefix +-program_transform_name +-bindir +-sbindir +-libexecdir +-datarootdir +-datadir +-sysconfdir +-sharedstatedir +-localstatedir +-includedir +-oldincludedir +-docdir +-infodir +-htmldir +-dvidir +-pdfdir +-psdir +-libdir +-localedir +-mandir +-DEFS +-ECHO_C +-ECHO_N +-ECHO_T +-LIBS +-build_alias +-host_alias +-target_alias +-INSTALL_PROGRAM +-INSTALL_SCRIPT +-INSTALL_DATA +-am__isrc +-CYGPATH_W +-PACKAGE +-VERSION +-ACLOCAL +-AUTOCONF +-AUTOMAKE +-AUTOHEADER +-MAKEINFO +-install_sh +-STRIP +-INSTALL_STRIP_PROGRAM +-mkdir_p +-AWK +-SET_MAKE +-am__leading_dot +-AMTAR +-am__tar +-am__untar +-CC +-CFLAGS +-LDFLAGS +-CPPFLAGS +-ac_ct_CC +-EXEEXT +-OBJEXT +-DEPDIR +-am__include +-am__quote +-AMDEP_TRUE +-AMDEP_FALSE +-AMDEPBACKSLASH +-CCDEPMODE +-am__fastdepCC_TRUE +-am__fastdepCC_FALSE +-build +-build_cpu +-build_vendor +-build_os +-host +-host_cpu +-host_vendor +-host_os +-SED +-GREP +-EGREP +-LN_S +-ECHO +-AR +-RANLIB +-CPP +-CXX +-CXXFLAGS +-ac_ct_CXX +-CXXDEPMODE +-am__fastdepCXX_TRUE +-am__fastdepCXX_FALSE +-CXXCPP +-F77 +-FFLAGS +-ac_ct_F77 +-LIBTOOL +-INTLTOOL_DESKTOP_RULE +-INTLTOOL_DIRECTORY_RULE +-INTLTOOL_KEYS_RULE +-INTLTOOL_PROP_RULE +-INTLTOOL_OAF_RULE +-INTLTOOL_PONG_RULE +-INTLTOOL_SERVER_RULE +-INTLTOOL_SHEET_RULE +-INTLTOOL_SOUNDLIST_RULE +-INTLTOOL_UI_RULE +-INTLTOOL_XAM_RULE +-INTLTOOL_KBD_RULE +-INTLTOOL_XML_RULE +-INTLTOOL_XML_NOMERGE_RULE +-INTLTOOL_CAVES_RULE +-INTLTOOL_SCHEMAS_RULE +-INTLTOOL_THEME_RULE +-INTLTOOL_SERVICE_RULE +-INTLTOOL_POLICY_RULE +-XGETTEXT +-MSGMERGE +-MSGFMT +-INTLTOOL_EXTRACT +-INTLTOOL_MERGE +-INTLTOOL_UPDATE +-INTLTOOL_PERL +-ALL_LINGUAS +-DATADIRNAME +-WARN_CFLAGS +-PKG_CONFIG +-HELP_DIR +-OMF_DIR +-DOC_USER_FORMATS +-ENABLE_SK_TRUE +-ENABLE_SK_FALSE +-DISTCHECK_CONFIGURE_FLAGS +-HAVE_GNOME_DOC_UTILS_TRUE +-HAVE_GNOME_DOC_UTILS_FALSE +-GLIB_GENMARSHAL +-GETTEXT_PACKAGE +-USE_NLS +-MSGFMT_OPTS +-GMSGFMT +-CATALOGS +-CATOBJEXT +-GMOFILES +-INSTOBJEXT +-INTLLIBS +-PO_IN_DATADIR_TRUE +-PO_IN_DATADIR_FALSE +-POFILES +-POSUB +-MKINSTALLDIRS +-GLIB_REQUIRED +-GTK_REQUIRED +-GDK_REQUIRED +-LIBGNOME_REQUIRED +-LIBGNOMEUI_REQUIRED +-HAL_REQUIRED +-DBUS_REQUIRED +-LIBGLADE_REQUIRED +-LIBNOTIFY_REQUIRED +-LIBWNCK_REQUIRED +-CAIRO_REQUIRED +-UNIQUE_REQUIRED +-LIBPANEL_REQUIRED +-GSTREAMER_REQUIRED +-XRANDR_REQUIRED +-POLKIT_GNOME_REQUIRED +-GLIB_CFLAGS +-GLIB_LIBS +-HAL_CFLAGS +-HAL_LIBS +-GSTREAMER_CFLAGS +-GSTREAMER_LIBS +-DBUS_CFLAGS +-DBUS_LIBS +-GNOME_CFLAGS +-GNOME_LIBS +-GDK_CFLAGS +-GDK_LIBS +-XRANDR_CFLAGS +-XRANDR_LIBS +-GCONFTOOL +-GCONF_SCHEMA_CONFIG_SOURCE +-GCONF_SCHEMA_FILE_DIR +-GCONF_SCHEMAS_INSTALL_TRUE +-GCONF_SCHEMAS_INSTALL_FALSE +-XMKMF +-X_CFLAGS +-X_PRE_LIBS +-X_LIBS +-X_EXTRA_LIBS +-SYSCONFDIR +-DATADIR +-BINDIR +-SBINDIR +-DOCDIR +-POLKIT_CFLAGS +-POLKIT_LIBS +-HAVE_TESTS_TRUE +-HAVE_TESTS_FALSE +-POLKIT_GNOME_CFLAGS +-POLKIT_GNOME_LIBS +-HAVE_GCONF_DEFAULTS_TRUE +-HAVE_GCONF_DEFAULTS_FALSE +-HAVE_APPLETS_TRUE +-HAVE_APPLETS_FALSE +-XMLTO +-DOCBOOK_DOCS_ENABLED_TRUE +-DOCBOOK_DOCS_ENABLED_FALSE +-DBUS_SERVICES_DIR +-LIBNOTIFY_CFLAGS +-LIBNOTIFY_LIBS +-HAVE_LIBNOTIFY_TRUE +-HAVE_LIBNOTIFY_FALSE +-UNIQUE_CFLAGS +-UNIQUE_LIBS +-HAVE_UNIQUE_TRUE +-HAVE_UNIQUE_FALSE +-GPM_EXTRA_LIBS +-DOCBOOK2MAN +-HAVE_DOCBOOK2MAN_TRUE +-HAVE_DOCBOOK2MAN_FALSE ++ac_subst_vars='LTLIBOBJS + LIBOBJS +-LTLIBOBJS' ++HAVE_DOCBOOK2MAN_FALSE ++HAVE_DOCBOOK2MAN_TRUE ++DOCBOOK2MAN ++GPM_EXTRA_LIBS ++HAVE_UNIQUE_FALSE ++HAVE_UNIQUE_TRUE ++UNIQUE_LIBS ++UNIQUE_CFLAGS ++HAVE_LIBNOTIFY_FALSE ++HAVE_LIBNOTIFY_TRUE ++LIBNOTIFY_LIBS ++LIBNOTIFY_CFLAGS ++DBUS_SERVICES_DIR ++DOCBOOK_DOCS_ENABLED_FALSE ++DOCBOOK_DOCS_ENABLED_TRUE ++XMLTO ++HAVE_APPLETS_FALSE ++HAVE_APPLETS_TRUE ++HAVE_GCONF_DEFAULTS_FALSE ++HAVE_GCONF_DEFAULTS_TRUE ++POLKIT_GNOME_LIBS ++POLKIT_GNOME_CFLAGS ++HAVE_TESTS_FALSE ++HAVE_TESTS_TRUE ++POLKIT_LIBS ++POLKIT_CFLAGS ++DOCDIR ++SBINDIR ++BINDIR ++DATADIR ++SYSCONFDIR ++X_EXTRA_LIBS ++X_LIBS ++X_PRE_LIBS ++X_CFLAGS ++XMKMF ++GCONF_SCHEMAS_INSTALL_FALSE ++GCONF_SCHEMAS_INSTALL_TRUE ++GCONF_SCHEMA_FILE_DIR ++GCONF_SCHEMA_CONFIG_SOURCE ++GCONFTOOL ++XRANDR_LIBS ++XRANDR_CFLAGS ++GDK_LIBS ++GDK_CFLAGS ++GNOME_LIBS ++GNOME_CFLAGS ++DBUS_LIBS ++DBUS_CFLAGS ++GSTREAMER_LIBS ++GSTREAMER_CFLAGS ++HAL_LIBS ++HAL_CFLAGS ++GLIB_LIBS ++GLIB_CFLAGS ++POLKIT_GNOME_REQUIRED ++XRANDR_REQUIRED ++GSTREAMER_REQUIRED ++LIBPANEL_REQUIRED ++UNIQUE_REQUIRED ++CAIRO_REQUIRED ++LIBWNCK_REQUIRED ++LIBNOTIFY_REQUIRED ++LIBGLADE_REQUIRED ++DBUS_REQUIRED ++HAL_REQUIRED ++LIBGNOMEUI_REQUIRED ++LIBGNOME_REQUIRED ++GDK_REQUIRED ++GTK_REQUIRED ++GLIB_REQUIRED ++MKINSTALLDIRS ++POSUB ++POFILES ++PO_IN_DATADIR_FALSE ++PO_IN_DATADIR_TRUE ++INTLLIBS ++INSTOBJEXT ++GMOFILES ++CATOBJEXT ++CATALOGS ++GMSGFMT ++MSGFMT_OPTS ++USE_NLS ++GETTEXT_PACKAGE ++GLIB_GENMARSHAL ++HAVE_GNOME_DOC_UTILS_FALSE ++HAVE_GNOME_DOC_UTILS_TRUE ++DISTCHECK_CONFIGURE_FLAGS ++ENABLE_SK_FALSE ++ENABLE_SK_TRUE ++DOC_USER_FORMATS ++OMF_DIR ++HELP_DIR ++PKG_CONFIG ++WARN_CFLAGS ++DATADIRNAME ++ALL_LINGUAS ++INTLTOOL_PERL ++INTLTOOL_UPDATE ++INTLTOOL_MERGE ++INTLTOOL_EXTRACT ++MSGFMT ++MSGMERGE ++XGETTEXT ++INTLTOOL_POLICY_RULE ++INTLTOOL_SERVICE_RULE ++INTLTOOL_THEME_RULE ++INTLTOOL_SCHEMAS_RULE ++INTLTOOL_CAVES_RULE ++INTLTOOL_XML_NOMERGE_RULE ++INTLTOOL_XML_RULE ++INTLTOOL_KBD_RULE ++INTLTOOL_XAM_RULE ++INTLTOOL_UI_RULE ++INTLTOOL_SOUNDLIST_RULE ++INTLTOOL_SHEET_RULE ++INTLTOOL_SERVER_RULE ++INTLTOOL_PONG_RULE ++INTLTOOL_OAF_RULE ++INTLTOOL_PROP_RULE ++INTLTOOL_KEYS_RULE ++INTLTOOL_DIRECTORY_RULE ++INTLTOOL_DESKTOP_RULE ++LIBTOOL ++ac_ct_F77 ++FFLAGS ++F77 ++CXXCPP ++am__fastdepCXX_FALSE ++am__fastdepCXX_TRUE ++CXXDEPMODE ++ac_ct_CXX ++CXXFLAGS ++CXX ++CPP ++RANLIB ++AR ++ECHO ++LN_S ++EGREP ++GREP ++SED ++host_os ++host_vendor ++host_cpu ++host ++build_os ++build_vendor ++build_cpu ++build ++am__fastdepCC_FALSE ++am__fastdepCC_TRUE ++CCDEPMODE ++AMDEPBACKSLASH ++AMDEP_FALSE ++AMDEP_TRUE ++am__quote ++am__include ++DEPDIR ++OBJEXT ++EXEEXT ++ac_ct_CC ++CPPFLAGS ++LDFLAGS ++CFLAGS ++CC ++am__untar ++am__tar ++AMTAR ++am__leading_dot ++SET_MAKE ++AWK ++mkdir_p ++MKDIR_P ++INSTALL_STRIP_PROGRAM ++STRIP ++install_sh ++MAKEINFO ++AUTOHEADER ++AUTOMAKE ++AUTOCONF ++ACLOCAL ++VERSION ++PACKAGE ++CYGPATH_W ++am__isrc ++INSTALL_DATA ++INSTALL_SCRIPT ++INSTALL_PROGRAM ++target_alias ++host_alias ++build_alias ++LIBS ++ECHO_T ++ECHO_N ++ECHO_C ++DEFS ++mandir ++localedir ++libdir ++psdir ++pdfdir ++dvidir ++htmldir ++infodir ++docdir ++oldincludedir ++includedir ++localstatedir ++sharedstatedir ++sysconfdir ++datadir ++datarootdir ++libexecdir ++sbindir ++bindir ++program_transform_name ++prefix ++exec_prefix ++PACKAGE_BUGREPORT ++PACKAGE_STRING ++PACKAGE_VERSION ++PACKAGE_TARNAME ++PACKAGE_NAME ++PATH_SEPARATOR ++SHELL' + ac_subst_files='' ++ac_user_opts=' ++enable_option_checking ++enable_dependency_tracking ++enable_shared ++enable_static ++enable_fast_install ++with_gnu_ld ++enable_libtool_lock ++with_pic ++with_tags ++enable_compile_warnings ++enable_iso_c ++with_help_dir ++with_omf_dir ++with_help_formats ++enable_scrollkeeper ++with_gconf_source ++with_gconf_schema_file_dir ++enable_schemas_install ++with_x ++with_doc_dir ++enable_policykit ++enable_checkfg ++enable_xevents ++enable_tests ++enable_gconf_defaults ++enable_applets ++enable_docbook_docs ++with_dbus_services ++with_dpms_ext ++enable_more_warnings ++' + ac_precious_vars='build_alias + host_alias + target_alias +@@ -1040,6 +1095,8 @@ + # Initialize some variables set by options. + ac_init_help= + ac_init_version=false ++ac_unrecognized_opts= ++ac_unrecognized_sep= + # The variables have the same names as the options, with + # dashes changed to underlines. + cache_file=/dev/null +@@ -1138,13 +1195,21 @@ + datarootdir=$ac_optarg ;; + + -disable-* | --disable-*) +- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` ++ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 + { (exit 1); exit 1; }; } +- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` +- eval enable_$ac_feature=no ;; ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"enable_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval enable_$ac_useropt=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; +@@ -1157,13 +1222,21 @@ + dvidir=$ac_optarg ;; + + -enable-* | --enable-*) +- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` ++ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 + { (exit 1); exit 1; }; } +- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` +- eval enable_$ac_feature=\$ac_optarg ;; ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"enable_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval enable_$ac_useropt=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ +@@ -1354,22 +1427,38 @@ + ac_init_version=: ;; + + -with-* | --with-*) +- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` ++ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid package name: $ac_package" >&2 ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 + { (exit 1); exit 1; }; } +- ac_package=`echo $ac_package | sed 's/[-.]/_/g'` +- eval with_$ac_package=\$ac_optarg ;; ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"with_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval with_$ac_useropt=\$ac_optarg ;; + + -without-* | --without-*) +- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` ++ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid package name: $ac_package" >&2 ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 + { (exit 1); exit 1; }; } +- ac_package=`echo $ac_package | sed 's/[-.]/_/g'` +- eval with_$ac_package=no ;; ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"with_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval with_$ac_useropt=no ;; + + --x) + # Obsolete; use --with-x. +@@ -1389,7 +1478,7 @@ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + +- -*) { echo "$as_me: error: unrecognized option: $ac_option ++ -*) { $as_echo "$as_me: error: unrecognized option: $ac_option + Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } + ;; +@@ -1398,16 +1487,16 @@ + 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 && +- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 ++ { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { (exit 1); exit 1; }; } + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + + *) + # FIXME: should be removed in autoconf 3.0. +- echo "$as_me: WARNING: you should use --build, --host, --target" >&2 ++ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && +- echo "$as_me: WARNING: invalid host type: $ac_option" >&2 ++ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + ;; + +@@ -1416,22 +1505,38 @@ + + if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` +- { echo "$as_me: error: missing argument to $ac_option" >&2 ++ { $as_echo "$as_me: error: missing argument to $ac_option" >&2 + { (exit 1); exit 1; }; } + fi + +-# Be sure to have absolute directory names. ++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; }; } ;; ++ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; ++ esac ++fi ++ ++# Check all directory arguments for consistency. + for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir + do + eval ac_val=\$$ac_var ++ # Remove trailing slashes. ++ case $ac_val in ++ */ ) ++ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` ++ eval $ac_var=\$ac_val;; ++ esac ++ # Be sure to have absolute directory names. + case $ac_val in + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac +- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 ++ { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; } + done + +@@ -1446,7 +1551,7 @@ + if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe +- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. ++ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used." >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes +@@ -1462,10 +1567,10 @@ + ac_pwd=`pwd` && test -n "$ac_pwd" && + ac_ls_di=`ls -di .` && + ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || +- { echo "$as_me: error: Working directory cannot be determined" >&2 ++ { $as_echo "$as_me: error: working directory cannot be determined" >&2 + { (exit 1); exit 1; }; } + test "X$ac_ls_di" = "X$ac_pwd_ls_di" || +- { echo "$as_me: error: pwd does not report name of working directory" >&2 ++ { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 + { (exit 1); exit 1; }; } + + +@@ -1473,12 +1578,12 @@ + if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then the parent directory. +- ac_confdir=`$as_dirname -- "$0" || +-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$0" : 'X\(//\)[^/]' \| \ +- X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)' \| . 2>/dev/null || +-echo X"$0" | ++ ac_confdir=`$as_dirname -- "$as_myself" || ++$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_myself" : 'X\(//\)[^/]' \| \ ++ X"$as_myself" : 'X\(//\)$' \| \ ++ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$as_myself" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -1505,12 +1610,12 @@ + fi + if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." +- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 ++ { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 + { (exit 1); exit 1; }; } + fi + ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" + ac_abs_confdir=`( +- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 ++ cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 + { (exit 1); exit 1; }; } + pwd)` + # When building in place, set srcdir=. +@@ -1559,9 +1664,9 @@ + + Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX +- [$ac_default_prefix] ++ [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX +- [PREFIX] ++ [PREFIX] + + By default, \`make install' will install all the files in + \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +@@ -1571,25 +1676,26 @@ + For better control, use the options below. + + Fine tuning of the installation directories: +- --bindir=DIR user executables [EPREFIX/bin] +- --sbindir=DIR system admin executables [EPREFIX/sbin] +- --libexecdir=DIR program executables [EPREFIX/libexec] +- --sysconfdir=DIR read-only single-machine data [PREFIX/etc] +- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] +- --localstatedir=DIR modifiable single-machine data [PREFIX/var] +- --libdir=DIR object code libraries [EPREFIX/lib] +- --includedir=DIR C header files [PREFIX/include] +- --oldincludedir=DIR C header files for non-gcc [/usr/include] +- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] +- --datadir=DIR read-only architecture-independent data [DATAROOTDIR] +- --infodir=DIR info documentation [DATAROOTDIR/info] +- --localedir=DIR locale-dependent data [DATAROOTDIR/locale] +- --mandir=DIR man documentation [DATAROOTDIR/man] +- --docdir=DIR documentation root [DATAROOTDIR/doc/gnome-power-manager] +- --htmldir=DIR html documentation [DOCDIR] +- --dvidir=DIR dvi documentation [DOCDIR] +- --pdfdir=DIR pdf documentation [DOCDIR] +- --psdir=DIR ps documentation [DOCDIR] ++ --bindir=DIR user executables [EPREFIX/bin] ++ --sbindir=DIR system admin executables [EPREFIX/sbin] ++ --libexecdir=DIR program executables [EPREFIX/libexec] ++ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] ++ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] ++ --localstatedir=DIR modifiable single-machine data [PREFIX/var] ++ --libdir=DIR object code libraries [EPREFIX/lib] ++ --includedir=DIR C header files [PREFIX/include] ++ --oldincludedir=DIR C header files for non-gcc [/usr/include] ++ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] ++ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] ++ --infodir=DIR info documentation [DATAROOTDIR/info] ++ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] ++ --mandir=DIR man documentation [DATAROOTDIR/man] ++ --docdir=DIR documentation root ++ [DATAROOTDIR/doc/gnome-power-manager] ++ --htmldir=DIR html documentation [DOCDIR] ++ --dvidir=DIR dvi documentation [DOCDIR] ++ --pdfdir=DIR pdf documentation [DOCDIR] ++ --psdir=DIR ps documentation [DOCDIR] + _ACEOF + + cat <<\_ACEOF +@@ -1616,6 +1722,7 @@ + cat <<\_ACEOF + + Optional Features: ++ --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --disable-dependency-tracking speeds up one-time build +@@ -1719,15 +1826,17 @@ + if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue +- test -d "$ac_dir" || continue ++ test -d "$ac_dir" || ++ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || ++ continue + ac_builddir=. + + case "$ac_dir" in + .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) +- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` ++ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. +- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` ++ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; +@@ -1763,7 +1872,7 @@ + echo && + $SHELL "$ac_srcdir/configure" --help=recursive + else +- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 ++ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } + done +@@ -1773,10 +1882,10 @@ + if $ac_init_version; then + cat <<\_ACEOF + gnome-power-manager configure 2.24.0 +-generated by GNU Autoconf 2.61 ++generated by GNU Autoconf 2.63 + + Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + _ACEOF +@@ -1787,7 +1896,7 @@ + running configure, to aid debugging if configure makes a mistake. + + It was created by gnome-power-manager $as_me 2.24.0, which was +-generated by GNU Autoconf 2.61. Invocation command line was ++generated by GNU Autoconf 2.63. Invocation command line was + + $ $0 $@ + +@@ -1823,7 +1932,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- echo "PATH: $as_dir" ++ $as_echo "PATH: $as_dir" + done + IFS=$as_save_IFS + +@@ -1858,7 +1967,7 @@ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) +- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; +@@ -1910,11 +2019,12 @@ + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( +- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; ++ *_cv_*) { $as_echo "$as_me:$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 ;; + esac ;; + esac +@@ -1944,9 +2054,9 @@ + do + eval ac_val=\$$ac_var + case $ac_val in +- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac +- echo "$ac_var='\''$ac_val'\''" ++ $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + +@@ -1961,9 +2071,9 @@ + do + eval ac_val=\$$ac_var + case $ac_val in +- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac +- echo "$ac_var='\''$ac_val'\''" ++ $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi +@@ -1979,8 +2089,8 @@ + echo + fi + test "$ac_signal" != 0 && +- echo "$as_me: caught signal $ac_signal" +- echo "$as_me: exit $exit_status" ++ $as_echo "$as_me: caught signal $ac_signal" ++ $as_echo "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && +@@ -2022,21 +2132,24 @@ + + + # Let the site file select an alternate cache file if it wants to. +-# Prefer explicitly selected file to automatically selected ones. ++# Prefer an explicitly selected file to automatically selected ones. ++ac_site_file1=NONE ++ac_site_file2=NONE + if test -n "$CONFIG_SITE"; then +- set x "$CONFIG_SITE" ++ ac_site_file1=$CONFIG_SITE + elif test "x$prefix" != xNONE; then +- set x "$prefix/share/config.site" "$prefix/etc/config.site" ++ ac_site_file1=$prefix/share/config.site ++ ac_site_file2=$prefix/etc/config.site + else +- set x "$ac_default_prefix/share/config.site" \ +- "$ac_default_prefix/etc/config.site" ++ ac_site_file1=$ac_default_prefix/share/config.site ++ ac_site_file2=$ac_default_prefix/etc/config.site + fi +-shift +-for ac_site_file ++for ac_site_file in "$ac_site_file1" "$ac_site_file2" + do ++ test "x$ac_site_file" = xNONE && continue + if test -r "$ac_site_file"; then +- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +-echo "$as_me: loading site script $ac_site_file" >&6;} ++ { $as_echo "$as_me:$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" + fi +@@ -2046,16 +2159,16 @@ + # Some versions of bash will fail to source /dev/null (special + # files actually), so we avoid doing that. + if test -f "$cache_file"; then +- { echo "$as_me:$LINENO: loading cache $cache_file" >&5 +-echo "$as_me: loading cache $cache_file" >&6;} ++ { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 ++$as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi + else +- { echo "$as_me:$LINENO: creating cache $cache_file" >&5 +-echo "$as_me: creating cache $cache_file" >&6;} ++ { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 ++$as_echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file + fi + +@@ -2069,29 +2182,38 @@ + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) +- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ++ { $as_echo "$as_me:$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) +- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 +-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ++ { $as_echo "$as_me:$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=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then +- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 +-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} +- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 +-echo "$as_me: former value: $ac_old_val" >&2;} +- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 +-echo "$as_me: current value: $ac_new_val" >&2;} +- ac_cache_corrupted=: ++ # differences in whitespace do not lead to failure. ++ 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: 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: 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: former value: \`$ac_old_val'" >&2;} ++ { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 ++$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in +- *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; ++ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in +@@ -2101,10 +2223,12 @@ + fi + done + if $ac_cache_corrupted; then +- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 +-echo "$as_me: error: changes in the environment can compromise the build" >&2;} +- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} ++ { $as_echo "$as_me:$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: 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; }; } + fi + +@@ -2159,8 +2283,8 @@ + fi + done + if test -z "$ac_aux_dir"; then +- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} ++ { { $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; }; } + fi + +@@ -2186,11 +2310,12 @@ + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # OS/2's system install, which has a completely different semantic + # ./install, which can be erroneously created by make from ./install.sh. +-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } ++# Reject install programs that cannot install multiple files. ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -2219,17 +2344,29 @@ + # program-specific install script used by HP pwplus--don't use. + : + else +- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" +- break 3 ++ rm -rf conftest.one conftest.two conftest.dir ++ echo one > conftest.one ++ echo two > conftest.two ++ mkdir conftest.dir ++ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && ++ test -s conftest.one && test -s conftest.two && ++ test -s conftest.dir/conftest.one && ++ test -s conftest.dir/conftest.two ++ then ++ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" ++ break 3 ++ fi + fi + fi + done + done + ;; + esac ++ + done + IFS=$as_save_IFS + ++rm -rf conftest.one conftest.two conftest.dir + + fi + if test "${ac_cv_path_install+set}" = set; then +@@ -2242,8 +2379,8 @@ + INSTALL=$ac_install_sh + fi + fi +-{ echo "$as_me:$LINENO: result: $INSTALL" >&5 +-echo "${ECHO_T}$INSTALL" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 ++$as_echo "$INSTALL" >&6; } + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. + # It thinks the first close brace ends the variable substitution. +@@ -2253,8 +2390,8 @@ + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 ++$as_echo_n "checking whether build environment is sane... " >&6; } + # Just in case + sleep 1 + echo timestamp > conftest.file +@@ -2277,9 +2414,9 @@ + # 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". +- { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken ++ { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken + alias in your environment" >&5 +-echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken ++$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; }; } + fi +@@ -2290,26 +2427,23 @@ + # Ok. + : + else +- { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! ++ { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! + Check your system clock" >&5 +-echo "$as_me: error: newly created file is older than distributed files! ++$as_echo "$as_me: error: newly created file is older than distributed files! + Check your system clock" >&2;} + { (exit 1); exit 1; }; } + fi +-{ echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++{ $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" + # Use a double $ so make ignores it. + test "$program_suffix" != NONE && + program_transform_name="s&\$&$program_suffix&;$program_transform_name" +-# Double any \ or $. echo might interpret backslashes. ++# Double any \ or $. + # By default was `s,x,x', remove it if useless. +-cat <<\_ACEOF >conftest.sed +-s/[\\$]/&&/g;s/;s,x,x,$// +-_ACEOF +-program_transform_name=`echo $program_transform_name | sed -f conftest.sed` +-rm -f conftest.sed ++ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' ++program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` + + # expand $ac_aux_dir to an absolute path + am_aux_dir=`cd $ac_aux_dir && pwd` +@@ -2320,15 +2454,15 @@ + am_missing_run="$MISSING --run " + else + am_missing_run= +- { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 +-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 ++$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + fi + +-{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +-echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +@@ -2363,8 +2497,8 @@ + MKDIR_P="$ac_install_sh -d" + fi + fi +-{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +-echo "${ECHO_T}$MKDIR_P" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 ++$as_echo "$MKDIR_P" >&6; } + + mkdir_p="$MKDIR_P" + case $mkdir_p in +@@ -2376,10 +2510,10 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_prog_AWK+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +@@ -2392,7 +2526,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -2403,22 +2537,23 @@ + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then +- { echo "$as_me:$LINENO: result: $AWK" >&5 +-echo "${ECHO_T}$AWK" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $AWK" >&5 ++$as_echo "$AWK" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + + test -n "$AWK" && break + done + +-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } +-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.make <<\_ACEOF + SHELL = /bin/sh +@@ -2435,12 +2570,12 @@ + rm -f conftest.make + fi + if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + SET_MAKE= + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" + fi + +@@ -2459,8 +2594,8 @@ + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then +- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} ++ { { $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; }; } + fi + fi +@@ -2515,10 +2650,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_prog_STRIP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +@@ -2531,7 +2666,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -2542,11 +2677,11 @@ + fi + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then +- { echo "$as_me:$LINENO: result: $STRIP" >&5 +-echo "${ECHO_T}$STRIP" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 ++$as_echo "$STRIP" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -2555,10 +2690,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +@@ -2571,7 +2706,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -2582,11 +2717,11 @@ + fi + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then +- { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +-echo "${ECHO_T}$ac_ct_STRIP" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 ++$as_echo "$ac_ct_STRIP" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + if test "x$ac_ct_STRIP" = x; then +@@ -2594,12 +2729,8 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++{ $as_echo "$as_me:$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 + STRIP=$ac_ct_STRIP +@@ -2635,10 +2766,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -2651,7 +2782,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -2662,11 +2793,11 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -2675,10 +2806,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +@@ -2691,7 +2822,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -2702,11 +2833,11 @@ + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++$as_echo "$ac_ct_CC" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + if test "x$ac_ct_CC" = x; then +@@ -2714,12 +2845,8 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++{ $as_echo "$as_me:$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 + CC=$ac_ct_CC +@@ -2732,10 +2859,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -2748,7 +2875,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -2759,11 +2886,11 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -2772,10 +2899,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -2793,7 +2920,7 @@ + continue + fi + ac_cv_prog_CC="cc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -2816,11 +2943,11 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -2831,10 +2958,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -2847,7 +2974,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -2858,11 +2985,11 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -2875,10 +3002,10 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +@@ -2891,7 +3018,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -2902,11 +3029,11 @@ + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++$as_echo "$ac_ct_CC" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -2918,12 +3045,8 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++{ $as_echo "$as_me:$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 + CC=$ac_ct_CC +@@ -2933,44 +3056,50 @@ + fi + + +-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH ++test -z "$CC" && { { $as_echo "$as_me:$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 +-echo "$as_me: error: no acceptable C compiler found in \$PATH ++$as_echo "$as_me: error: no acceptable C compiler found in \$PATH + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { (exit 1); exit 1; }; }; } + + # Provide some information about the compiler. +-echo "$as_me:$LINENO: checking for C compiler version" >&5 +-ac_compiler=`set X $ac_compile; echo $2` ++$as_echo "$as_me:$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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + + cat >conftest.$ac_ext <<_ACEOF +@@ -2989,27 +3118,22 @@ + } + _ACEOF + ac_clean_files_save=$ac_clean_files +-ac_clean_files="$ac_clean_files a.out a.exe b.out" ++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.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. +-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } +-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +-# +-# List of possible output files, starting from the most likely. +-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) +-# only as a last resort. b.out is created by i960 compilers. +-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' +-# +-# The IRIX 6 linker writes into existing files which may not be +-# executable, retaining their permissions. Remove them first so a +-# subsequent execution test works. ++{ $as_echo "$as_me:$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[^ ]*//'` ++ ++# The possible output files: ++ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" ++ + ac_rmfiles= + for ac_file in $ac_files + do + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac + done +@@ -3020,10 +3144,11 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; 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' +@@ -3034,7 +3159,7 @@ + do + test -f "$ac_file" || continue + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most +@@ -3061,25 +3186,27 @@ + ac_file='' + fi + +-{ echo "$as_me:$LINENO: result: $ac_file" >&5 +-echo "${ECHO_T}$ac_file" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 ++$as_echo "$ac_file" >&6; } + if test -z "$ac_file"; then +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables ++{ { $as_echo "$as_me:$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 +-echo "$as_me: error: C compiler cannot create executables ++$as_echo "$as_me: error: C compiler cannot create executables + See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; } ++ { (exit 77); exit 77; }; }; } + 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. +-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +@@ -3088,49 +3215,53 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else +- { { echo "$as_me:$LINENO: error: cannot run C compiled programs. ++ { { $as_echo "$as_me:$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. + If you meant to cross compile, use \`--host'. + See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot run C compiled programs. ++$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; }; } ++ { (exit 1); exit 1; }; }; } + fi + fi + fi +-{ echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++{ $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + +-rm -f a.out a.exe conftest$ac_cv_exeext b.out ++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.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. +-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } +-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 +-echo "${ECHO_T}$cross_compiling" >&6; } ++{ $as_echo "$as_me:$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 "$cross_compiling" >&6; } + +-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 +-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 ++$as_echo_n "checking for suffix of executables... " >&6; } + if { (ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # If both `conftest.exe' and `conftest' are `present' (well, observable) + # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +@@ -3139,31 +3270,33 @@ + for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + break;; + * ) break;; + esac + done + else +- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link ++ { { $as_echo "$as_me:$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 +-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link ++$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; }; } ++ { (exit 1); exit 1; }; }; } + fi + + rm -f conftest$ac_cv_exeext +-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +-echo "${ECHO_T}$ac_cv_exeext" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 ++$as_echo "$ac_cv_exeext" >&6; } + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT +-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 +-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -3186,40 +3319,43 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac + done + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile ++{ { $as_echo "$as_me:$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 +-echo "$as_me: error: cannot compute suffix of object files: cannot compile ++$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { (exit 1); exit 1; }; }; } + fi + + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +-echo "${ECHO_T}$ac_cv_objext" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 ++$as_echo "$ac_cv_objext" >&6; } + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -3245,20 +3381,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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_compiler_gnu=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_compiler_gnu=no +@@ -3268,15 +3405,19 @@ + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } +-GCC=`test $ac_compiler_gnu = yes && echo yes` ++{ $as_echo "$as_me:$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 ++else ++ GCC= ++fi + ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS +-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes +@@ -3303,20 +3444,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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_prog_cc_g=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + CFLAGS="" +@@ -3341,20 +3483,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_c_werror_flag=$ac_save_c_werror_flag +@@ -3380,20 +3523,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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_prog_cc_g=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -3408,8 +3552,8 @@ + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } ++{ $as_echo "$as_me:$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 + elif test $ac_cv_prog_cc_g = yes; then +@@ -3425,10 +3569,10 @@ + CFLAGS= + fi + fi +-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_cv_prog_cc_c89=no + ac_save_CC=$CC +@@ -3499,20 +3643,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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_prog_cc_c89=$ac_arg + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -3528,15 +3673,15 @@ + # AC_CACHE_VAL + case "x$ac_cv_prog_cc_c89" in + x) +- { echo "$as_me:$LINENO: result: none needed" >&5 +-echo "${ECHO_T}none needed" >&6; } ;; ++ { $as_echo "$as_me:$LINENO: result: none needed" >&5 ++$as_echo "none needed" >&6; } ;; + xno) +- { echo "$as_me:$LINENO: result: unsupported" >&5 +-echo "${ECHO_T}unsupported" >&6; } ;; ++ { $as_echo "$as_me:$LINENO: result: unsupported" >&5 ++$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" +- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; ++ { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 ++$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; + esac + + +@@ -3557,8 +3702,8 @@ + .PHONY: am__doit + END + # If we don't find an include directive, just comment out the code. +-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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= + _am_result=none +@@ -3585,8 +3730,8 @@ + fi + + +-{ echo "$as_me:$LINENO: result: $_am_result" >&5 +-echo "${ECHO_T}$_am_result" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 ++$as_echo "$_am_result" >&6; } + rm -f confinc confmf + + # Check whether --enable-dependency-tracking was given. +@@ -3610,10 +3755,10 @@ + + depcc="$CC" am_compiler_list= + +-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up +@@ -3701,8 +3846,8 @@ + fi + + fi +-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } ++{ $as_echo "$as_me:$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 + + if +@@ -3717,16 +3862,16 @@ + + + if test "x$CC" != xcc; then +- { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5 +-echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5 ++$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } + else +- { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5 +-echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5 ++$as_echo_n "checking whether cc understands -c and -o together... " >&6; } + fi +-set dummy $CC; ac_cc=`echo $2 | ++set dummy $CC; ac_cc=`$as_echo "$2" | + sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` + if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -3752,19 +3897,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + test -f conftest2.$ac_objext && { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; + then + eval ac_cv_prog_cc_${ac_cc}_c_o=yes +@@ -3775,10 +3922,11 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' + rm -f conftest2.* +@@ -3786,19 +3934,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + test -f conftest2.$ac_objext && { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; + then + # cc works too. +@@ -3816,11 +3966,11 @@ + + fi + if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + + cat >>confdefs.h <<\_ACEOF + #define NO_MINUS_C_MINUS_O 1 +@@ -3856,11 +4006,12 @@ + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # OS/2's system install, which has a completely different semantic + # ./install, which can be erroneously created by make from ./install.sh. +-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } ++# Reject install programs that cannot install multiple files. ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -3889,17 +4040,29 @@ + # program-specific install script used by HP pwplus--don't use. + : + else +- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" +- break 3 ++ rm -rf conftest.one conftest.two conftest.dir ++ echo one > conftest.one ++ echo two > conftest.two ++ mkdir conftest.dir ++ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && ++ test -s conftest.one && test -s conftest.two && ++ test -s conftest.dir/conftest.one && ++ test -s conftest.dir/conftest.two ++ then ++ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" ++ break 3 ++ fi + fi + fi + done + done + ;; + esac ++ + done + IFS=$as_save_IFS + ++rm -rf conftest.one conftest.two conftest.dir + + fi + if test "${ac_cv_path_install+set}" = set; then +@@ -3912,8 +4075,8 @@ + INSTALL=$ac_install_sh + fi + fi +-{ echo "$as_me:$LINENO: result: $INSTALL" >&5 +-echo "${ECHO_T}$INSTALL" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 ++$as_echo "$INSTALL" >&6; } + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. + # It thinks the first close brace ends the variable substitution. +@@ -3997,34 +4160,34 @@ + + # Make sure we can run config.sub. + $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || +- { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} ++ { { $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; }; } + +-{ echo "$as_me:$LINENO: checking build system type" >&5 +-echo $ECHO_N "checking build system type... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking build system type" >&5 ++$as_echo_n "checking build system type... " >&6; } + if test "${ac_cv_build+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $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 && +- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +-echo "$as_me: error: cannot guess build type; you must specify one" >&2;} ++ { { $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; }; } + ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || +- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} ++ { { $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; }; } + + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +-echo "${ECHO_T}$ac_cv_build" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 ++$as_echo "$ac_cv_build" >&6; } + case $ac_cv_build in + *-*-*) ;; +-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +-echo "$as_me: error: invalid value of canonical build" >&2;} ++*) { { $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; }; };; + esac + build=$ac_cv_build +@@ -4041,27 +4204,27 @@ + case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +-{ echo "$as_me:$LINENO: checking host system type" >&5 +-echo $ECHO_N "checking host system type... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking host system type" >&5 ++$as_echo_n "checking host system type... " >&6; } + if test "${ac_cv_host+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $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` || +- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} ++ { { $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; }; } + fi + + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +-echo "${ECHO_T}$ac_cv_host" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 ++$as_echo "$ac_cv_host" >&6; } + case $ac_cv_host in + *-*-*) ;; +-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +-echo "$as_me: error: invalid value of canonical host" >&2;} ++*) { { $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; }; };; + esac + host=$ac_cv_host +@@ -4078,10 +4241,10 @@ + case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + +-{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 "${lt_cv_path_SED+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + # Loop through the user's path and test for sed and gsed. + # Then use that list of sed's as ones to test for truncation. +@@ -4134,45 +4297,40 @@ + + SED=$lt_cv_path_SED + +-{ echo "$as_me:$LINENO: result: $SED" >&5 +-echo "${ECHO_T}$SED" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $SED" >&5 ++$as_echo "$SED" >&6; } + +-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } +-if test "${ac_cv_path_GREP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- # Extract the first word of "grep ggrep" to use in msg output +-if test -z "$GREP"; then +-set dummy grep ggrep; ac_prog_name=$2 ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else ++ if test -z "$GREP"; then + ac_path_GREP_found=false +-# Loop through the user's path and test for each of PROGNAME-LIST +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++ # Loop through the user's path and test for each of PROGNAME-LIST ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + 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 +- # Check for GNU ac_path_GREP and select it if it is found. ++ 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 ++# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP + case `"$ac_path_GREP" --version 2>&1` in + *GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; + *) + ac_count=0 +- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" ++ $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" +- echo 'GREP' >> "conftest.nl" ++ $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` +@@ -4187,74 +4345,60 @@ + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; + esac + +- +- $ac_path_GREP_found && break 3 ++ $ac_path_GREP_found && break 3 ++ done + done + done +- +-done + IFS=$as_save_IFS +- +- +-fi +- +-GREP="$ac_cv_path_GREP" +-if test -z "$GREP"; then +- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} ++ 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; }; } +-fi +- ++ fi + else + ac_cv_path_GREP=$GREP + fi + +- + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +-echo "${ECHO_T}$ac_cv_path_GREP" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 ++$as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +-{ echo "$as_me:$LINENO: checking for egrep" >&5 +-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 ++$as_echo_n "checking for egrep... " >&6; } + if test "${ac_cv_path_EGREP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else +- # Extract the first word of "egrep" to use in msg output +-if test -z "$EGREP"; then +-set dummy egrep; ac_prog_name=$2 +-if test "${ac_cv_path_EGREP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else ++ if test -z "$EGREP"; then + ac_path_EGREP_found=false +-# Loop through the user's path and test for each of PROGNAME-LIST +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++ # Loop through the user's path and test for each of PROGNAME-LIST ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + 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 +- # Check for GNU ac_path_EGREP and select it if it is found. ++ 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 ++# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP + case `"$ac_path_EGREP" --version 2>&1` in + *GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; + *) + ac_count=0 +- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" ++ $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" +- echo 'EGREP' >> "conftest.nl" ++ $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` +@@ -4269,33 +4413,24 @@ + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; + esac + +- +- $ac_path_EGREP_found && break 3 ++ $ac_path_EGREP_found && break 3 ++ done + done + done +- +-done + IFS=$as_save_IFS +- +- +-fi +- +-EGREP="$ac_cv_path_EGREP" +-if test -z "$EGREP"; then +- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} ++ 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; }; } +-fi +- ++ fi + else + ac_cv_path_EGREP=$EGREP + fi + +- + fi + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 ++$as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +@@ -4310,8 +4445,8 @@ + ac_prog=ld + if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. +- { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 ++$as_echo_n "checking for ld used by $CC... " >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw +@@ -4340,14 +4475,14 @@ + ;; + esac + elif test "$with_gnu_ld" = yes; then +- { echo "$as_me:$LINENO: checking for GNU ld" >&5 +-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 ++$as_echo_n "checking for GNU ld... " >&6; } + else +- { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +@@ -4377,19 +4512,19 @@ + + LD="$lt_cv_path_LD" + if test -n "$LD"; then +- { echo "$as_me:$LINENO: result: $LD" >&5 +-echo "${ECHO_T}$LD" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $LD" >&5 ++$as_echo "$LD" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi +-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} ++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; }; } +-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + # I'd rather use --version here, but apparently some GNU lds only accept -v. + case `$LD -v 2>&1 &5 +-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 ++$as_echo "$lt_cv_prog_gnu_ld" >&6; } + with_gnu_ld=$lt_cv_prog_gnu_ld + + +-{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 +-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_cv_ld_reload_flag='-r' + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 +-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } ++{ $as_echo "$as_me:$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 + "" | " "*) ;; +@@ -4431,10 +4566,10 @@ + ;; + esac + +-{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 +-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 ++$as_echo_n "checking for BSD-compatible nm... " >&6; } + if test "${lt_cv_path_NM+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$NM"; then + # Let the user override the test. +@@ -4480,25 +4615,25 @@ + test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm + fi + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 +-echo "${ECHO_T}$lt_cv_path_NM" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 ++$as_echo "$lt_cv_path_NM" >&6; } + NM="$lt_cv_path_NM" + +-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 +-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + else +- { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +-echo "${ECHO_T}no, using $LN_S" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 ++$as_echo "no, using $LN_S" >&6; } + fi + +-{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 +-echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_cv_file_magic_cmd='$MAGIC_CMD' + lt_cv_file_magic_test_file= +@@ -4681,8 +4816,8 @@ + esac + + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 +-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } ++{ $as_echo "$as_me:$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 + test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -4716,7 +4851,7 @@ + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) +@@ -4731,11 +4866,11 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 4734 "configure"' > conftest.$ac_ext ++ echo '#line 4869 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in +@@ -4773,7 +4908,7 @@ + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.o` in + *32-bit*) +@@ -4824,10 +4959,10 @@ + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" +- { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 +-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -4856,26 +4991,30 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + lt_cv_cc_needs_belf=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + ac_ext=c +@@ -4885,8 +5024,8 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 +-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } ++{ $as_echo "$as_me:$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 + CFLAGS="$SAVE_CFLAGS" +@@ -4898,7 +5037,7 @@ + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.o` in + *64-bit*) +@@ -4923,15 +5062,15 @@ + 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 +-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" +@@ -4963,20 +5102,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +@@ -5000,13 +5140,14 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 +@@ -5014,7 +5155,7 @@ + # Broken: success on invalid input. + continue + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +@@ -5039,8 +5180,8 @@ + else + ac_cv_prog_CPP=$CPP + fi +-{ echo "$as_me:$LINENO: result: $CPP" >&5 +-echo "${ECHO_T}$CPP" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 ++$as_echo "$CPP" >&6; } + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes + do +@@ -5068,20 +5209,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +@@ -5105,13 +5247,14 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 +@@ -5119,7 +5262,7 @@ + # Broken: success on invalid input. + continue + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +@@ -5135,11 +5278,13 @@ + if $ac_preproc_ok; then + : + else +- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check ++ { { $as_echo "$as_me:$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 +-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check ++$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { (exit 1); exit 1; }; }; } + fi + + ac_ext=c +@@ -5149,10 +5294,10 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -5179,20 +5324,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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_stdc=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_stdc=no +@@ -5284,37 +5430,40 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 ++ $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 + + ( exit $ac_status ) + 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 + fi + + + fi + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +-echo "${ECHO_T}$ac_cv_header_stdc" >&6; } ++{ $as_echo "$as_me:$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 +@@ -5336,11 +5485,11 @@ + 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=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -5358,20 +5507,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Header=no" +@@ -5379,12 +5529,15 @@ + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-ac_res=`eval echo '${'$as_ac_Header'}'` +- { echo "$as_me:$LINENO: result: $ac_res" >&5 +-echo "${ECHO_T}$ac_res" >&6; } +-if test `eval echo '${'$as_ac_Header'}'` = yes; then ++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 + cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -5395,20 +5548,21 @@ + + for ac_header in dlfcn.h + do +-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++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 +- { echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + fi +-ac_res=`eval echo '${'$as_ac_Header'}'` +- { echo "$as_me:$LINENO: result: $ac_res" >&5 +-echo "${ECHO_T}$ac_res" >&6; } ++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? +-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++{ $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 +@@ -5424,32 +5578,33 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 +- echo "$as_me: failed program was:" >&5 ++ $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 +-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++$as_echo "$ac_header_compiler" >&6; } + + # Is the header present? +-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++{ $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 +@@ -5463,69 +5618,73 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 +- echo "$as_me: failed program was:" >&5 ++ $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 +-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6; } ++{ $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: ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ { $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:* ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ { $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;} + + ;; + esac +-{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++{ $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + eval "$as_ac_Header=\$ac_header_preproc" + fi +-ac_res=`eval echo '${'$as_ac_Header'}'` +- { echo "$as_me:$LINENO: result: $ac_res" >&5 +-echo "${ECHO_T}$ac_res" >&6; } ++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 +-if test `eval echo '${'$as_ac_Header'}'` = yes; then ++as_val=`eval 'as_val=${'$as_ac_Header'} ++ $as_echo "$as_val"'` ++ if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -5546,10 +5705,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_prog_CXX+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +@@ -5562,7 +5721,7 @@ + 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_CXX="$ac_tool_prefix$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -5573,11 +5732,11 @@ + fi + CXX=$ac_cv_prog_CXX + if test -n "$CXX"; then +- { echo "$as_me:$LINENO: result: $CXX" >&5 +-echo "${ECHO_T}$CXX" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $CXX" >&5 ++$as_echo "$CXX" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -5590,10 +5749,10 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. +@@ -5606,7 +5765,7 @@ + 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_CXX="$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -5617,11 +5776,11 @@ + fi + ac_ct_CXX=$ac_cv_prog_ac_ct_CXX + if test -n "$ac_ct_CXX"; then +- { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +-echo "${ECHO_T}$ac_ct_CXX" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 ++$as_echo "$ac_ct_CXX" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -5633,12 +5792,8 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++{ $as_echo "$as_me:$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 + CXX=$ac_ct_CXX +@@ -5648,43 +5803,47 @@ + fi + fi + # Provide some information about the compiler. +-echo "$as_me:$LINENO: checking for C++ compiler version" >&5 +-ac_compiler=`set X $ac_compile; echo $2` ++$as_echo "$as_me:$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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + +-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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_cxx_compiler_gnu+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -5710,20 +5869,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_compiler_gnu=no +@@ -5733,15 +5893,19 @@ + ac_cv_cxx_compiler_gnu=$ac_compiler_gnu + + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } +-GXX=`test $ac_compiler_gnu = yes && echo yes` ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 ++$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } ++if test $ac_compiler_gnu = yes; then ++ GXX=yes ++else ++ GXX= ++fi + ac_test_CXXFLAGS=${CXXFLAGS+set} + ac_save_CXXFLAGS=$CXXFLAGS +-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 ++$as_echo_n "checking whether $CXX accepts -g... " >&6; } + if test "${ac_cv_prog_cxx_g+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes +@@ -5768,20 +5932,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + CXXFLAGS="" +@@ -5806,20 +5971,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +@@ -5845,20 +6011,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -5873,8 +6040,8 @@ + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 ++$as_echo "$ac_cv_prog_cxx_g" >&6; } + if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS + elif test $ac_cv_prog_cxx_g = yes; then +@@ -5898,10 +6065,10 @@ + + depcc="$CXX" am_compiler_list= + +-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++$as_echo_n "checking dependency style of $depcc... " >&6; } + if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up +@@ -5989,8 +6156,8 @@ + fi + + fi +-{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 ++$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } + CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + + if +@@ -6014,11 +6181,11 @@ + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +-{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 ++$as_echo_n "checking how to run the C++ preprocessor... " >&6; } + if test -z "$CXXCPP"; then + if test "${ac_cv_prog_CXXCPP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + # Double quotes because CXXCPP needs to be expanded + for CXXCPP in "$CXX -E" "/lib/cpp" +@@ -6050,20 +6217,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then + : + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +@@ -6087,13 +6255,14 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err +@@ -6101,7 +6270,7 @@ + # Broken: success on invalid input. + continue + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +@@ -6126,8 +6295,8 @@ + else + ac_cv_prog_CXXCPP=$CXXCPP + fi +-{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 +-echo "${ECHO_T}$CXXCPP" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5 ++$as_echo "$CXXCPP" >&6; } + ac_preproc_ok=false + for ac_cxx_preproc_warn_flag in '' yes + do +@@ -6155,20 +6324,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then + : + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +@@ -6192,13 +6362,14 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err +@@ -6206,7 +6377,7 @@ + # Broken: success on invalid input. + continue + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +@@ -6222,11 +6393,13 @@ + if $ac_preproc_ok; then + : + else +- { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check ++ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check + See \`config.log' for more details." >&5 +-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check ++$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { (exit 1); exit 1; }; }; } + fi + + ac_ext=cpp +@@ -6247,10 +6420,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_prog_F77+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$F77"; then + ac_cv_prog_F77="$F77" # Let the user override the test. +@@ -6263,7 +6436,7 @@ + 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_F77="$ac_tool_prefix$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -6274,11 +6447,11 @@ + fi + F77=$ac_cv_prog_F77 + if test -n "$F77"; then +- { echo "$as_me:$LINENO: result: $F77" >&5 +-echo "${ECHO_T}$F77" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $F77" >&5 ++$as_echo "$F77" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -6291,10 +6464,10 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_prog_ac_ct_F77+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_F77"; then + ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. +@@ -6307,7 +6480,7 @@ + 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_F77="$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -6318,11 +6491,11 @@ + fi + ac_ct_F77=$ac_cv_prog_ac_ct_F77 + if test -n "$ac_ct_F77"; then +- { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 +-echo "${ECHO_T}$ac_ct_F77" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 ++$as_echo "$ac_ct_F77" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -6334,12 +6507,8 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++{ $as_echo "$as_me:$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 + F77=$ac_ct_F77 +@@ -6348,37 +6517,41 @@ + + + # Provide some information about the compiler. +-echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 +-ac_compiler=`set X $ac_compile; echo $2` ++$as_echo "$as_me:$LINENO: checking for Fortran 77 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + rm -f a.out + +@@ -6386,10 +6559,10 @@ + # input file. (Note that this only needs to work for GNU compilers.) + ac_save_ext=$ac_ext + ac_ext=F +-{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 +-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 ++$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; } + if test "${ac_cv_f77_compiler_gnu+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + program main +@@ -6405,20 +6578,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_compiler_gnu=no +@@ -6428,16 +6602,16 @@ + ac_cv_f77_compiler_gnu=$ac_compiler_gnu + + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 +-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 ++$as_echo "$ac_cv_f77_compiler_gnu" >&6; } + ac_ext=$ac_save_ext + ac_test_FFLAGS=${FFLAGS+set} + ac_save_FFLAGS=$FFLAGS + FFLAGS= +-{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 +-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 ++$as_echo_n "checking whether $F77 accepts -g... " >&6; } + if test "${ac_cv_prog_f77_g+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + FFLAGS=-g + cat >conftest.$ac_ext <<_ACEOF +@@ -6451,20 +6625,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_f77_g=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_prog_f77_g=no +@@ -6473,8 +6648,8 @@ + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 +-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 ++$as_echo "$ac_cv_prog_f77_g" >&6; } + if test "$ac_test_FFLAGS" = set; then + FFLAGS=$ac_save_FFLAGS + elif test $ac_cv_prog_f77_g = yes; then +@@ -6491,7 +6666,11 @@ + fi + fi + +-G77=`test $ac_compiler_gnu = yes && echo yes` ++if test $ac_compiler_gnu = yes; then ++ G77=yes ++else ++ G77= ++fi + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -6503,10 +6682,10 @@ + # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! + + # find the maximum length of command line arguments +-{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 +-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + i=0 + teststring="ABCD" +@@ -6615,11 +6794,11 @@ + fi + + if test -n $lt_cv_sys_max_cmd_len ; then +- { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 +-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 ++$as_echo "$lt_cv_sys_max_cmd_len" >&6; } + else +- { echo "$as_me:$LINENO: result: none" >&5 +-echo "${ECHO_T}none" >&6; } ++ { $as_echo "$as_me:$LINENO: result: none" >&5 ++$as_echo "none" >&6; } + fi + + +@@ -6627,10 +6806,10 @@ + + + # Check for command to grab the raw symbol name followed by C symbol from nm. +-{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 +-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + + # These are sane defaults that work on at least a few old systems. +@@ -6735,14 +6914,14 @@ + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; 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 + (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then +@@ -6797,7 +6976,7 @@ + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext}; then + pipe_works=yes + fi +@@ -6832,17 +7011,17 @@ + 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 +- { echo "$as_me:$LINENO: result: failed" >&5 +-echo "${ECHO_T}failed" >&6; } ++ { $as_echo "$as_me:$LINENO: result: failed" >&5 ++$as_echo "failed" >&6; } + else +- { echo "$as_me:$LINENO: result: ok" >&5 +-echo "${ECHO_T}ok" >&6; } ++ { $as_echo "$as_me:$LINENO: result: ok" >&5 ++$as_echo "ok" >&6; } + fi + +-{ echo "$as_me:$LINENO: checking for objdir" >&5 +-echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for objdir" >&5 ++$as_echo_n "checking for objdir... " >&6; } + if test "${lt_cv_objdir+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + rm -f .libs 2>/dev/null + mkdir .libs 2>/dev/null +@@ -6854,8 +7033,8 @@ + fi + rmdir .libs 2>/dev/null + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 +-echo "${ECHO_T}$lt_cv_objdir" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 ++$as_echo "$lt_cv_objdir" >&6; } + objdir=$lt_cv_objdir + + +@@ -6906,10 +7085,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_prog_AR+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +@@ -6922,7 +7101,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -6933,11 +7112,11 @@ + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- { echo "$as_me:$LINENO: result: $AR" >&5 +-echo "${ECHO_T}$AR" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $AR" >&5 ++$as_echo "$AR" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -6946,10 +7125,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. +@@ -6962,7 +7141,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -6973,11 +7152,11 @@ + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 +-echo "${ECHO_T}$ac_ct_AR" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 ++$as_echo "$ac_ct_AR" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + if test "x$ac_ct_AR" = x; then +@@ -6985,12 +7164,8 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++{ $as_echo "$as_me:$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 + AR=$ac_ct_AR +@@ -7002,10 +7177,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_prog_RANLIB+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +@@ -7018,7 +7193,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -7029,11 +7204,11 @@ + fi + RANLIB=$ac_cv_prog_RANLIB + if test -n "$RANLIB"; then +- { echo "$as_me:$LINENO: result: $RANLIB" >&5 +-echo "${ECHO_T}$RANLIB" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 ++$as_echo "$RANLIB" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -7042,10 +7217,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +@@ -7058,7 +7233,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -7069,11 +7244,11 @@ + fi + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB + if test -n "$ac_ct_RANLIB"; then +- { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +-echo "${ECHO_T}$ac_ct_RANLIB" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 ++$as_echo "$ac_ct_RANLIB" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + if test "x$ac_ct_RANLIB" = x; then +@@ -7081,12 +7256,8 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++{ $as_echo "$as_me:$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 + RANLIB=$ac_ct_RANLIB +@@ -7098,10 +7269,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_prog_STRIP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +@@ -7114,7 +7285,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -7125,11 +7296,11 @@ + fi + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then +- { echo "$as_me:$LINENO: result: $STRIP" >&5 +-echo "${ECHO_T}$STRIP" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 ++$as_echo "$STRIP" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -7138,10 +7309,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +@@ -7154,7 +7325,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -7165,11 +7336,11 @@ + fi + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then +- { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +-echo "${ECHO_T}$ac_ct_STRIP" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 ++$as_echo "$ac_ct_STRIP" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + if test "x$ac_ct_STRIP" = x; then +@@ -7177,12 +7348,8 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++{ $as_echo "$as_me:$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 + STRIP=$ac_ct_STRIP +@@ -7245,10 +7412,10 @@ + case $deplibs_check_method in + file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then +- { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 +-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case $MAGIC_CMD in + [\\/*] | ?:[\\/]*) +@@ -7298,19 +7465,19 @@ + + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if test -n "$MAGIC_CMD"; then +- { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +-echo "${ECHO_T}$MAGIC_CMD" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 ++$as_echo "$MAGIC_CMD" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then +- { echo "$as_me:$LINENO: checking for file" >&5 +-echo $ECHO_N "checking for file... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for file" >&5 ++$as_echo_n "checking for file... " >&6; } + if test "${lt_cv_path_MAGIC_CMD+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case $MAGIC_CMD in + [\\/*] | ?:[\\/]*) +@@ -7360,11 +7527,11 @@ + + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if test -n "$MAGIC_CMD"; then +- { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +-echo "${ECHO_T}$MAGIC_CMD" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 ++$as_echo "$MAGIC_CMD" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + else +@@ -7451,10 +7618,10 @@ + lt_prog_compiler_no_builtin_flag=' -fno-builtin' + + +-{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext +@@ -7469,11 +7636,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:7472: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7639: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7476: \$? = $ac_status" >&5 ++ echo "$as_me:7643: \$? = $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. +@@ -7486,8 +7653,8 @@ + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } ++{ $as_echo "$as_me:$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 + lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" +@@ -7501,8 +7668,8 @@ + lt_prog_compiler_pic= + lt_prog_compiler_static= + +-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 + lt_prog_compiler_wl='-Wl,' +@@ -7733,18 +7900,18 @@ + esac + fi + +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 ++$as_echo "$lt_prog_compiler_pic" >&6; } + + # + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic"; then + +-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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_prog_compiler_pic_works+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_prog_compiler_pic_works=no + ac_outfile=conftest.$ac_objext +@@ -7759,11 +7926,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:7762: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7929: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7766: \$? = $ac_status" >&5 ++ echo "$as_me:7933: \$? = $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. +@@ -7776,8 +7943,8 @@ + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 ++$as_echo "$lt_prog_compiler_pic_works" >&6; } + + if test x"$lt_prog_compiler_pic_works" = xyes; then + case $lt_prog_compiler_pic in +@@ -7804,10 +7971,10 @@ + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" +-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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_prog_compiler_static_works+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_prog_compiler_static_works=no + save_LDFLAGS="$LDFLAGS" +@@ -7832,8 +7999,8 @@ + LDFLAGS="$save_LDFLAGS" + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 +-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 ++$as_echo "$lt_prog_compiler_static_works" >&6; } + + if test x"$lt_prog_compiler_static_works" = xyes; then + : +@@ -7842,10 +8009,10 @@ + fi + + +-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_c_o=no + $rm -r conftest 2>/dev/null +@@ -7863,11 +8030,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:7866: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8033: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:7870: \$? = $ac_status" >&5 ++ echo "$as_me:8037: \$? = $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 +@@ -7889,34 +8056,34 @@ + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 ++$as_echo "$lt_cv_prog_compiler_c_o" >&6; } + + + 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 +- { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no +- { echo "$as_me:$LINENO: result: $hard_links" >&5 +-echo "${ECHO_T}$hard_links" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 ++$as_echo "$hard_links" >&6; } + if test "$hard_links" = no; then +- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} ++ { $as_echo "$as_me:$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 + else + need_locks=no + fi + +-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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= + allow_undefined_flag= +@@ -8345,18 +8512,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -8371,12 +8541,13 @@ + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi + else +- echo "$as_me: failed program was:" >&5 ++ $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 + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8411,18 +8582,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -8437,12 +8611,13 @@ + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi + else +- echo "$as_me: failed program was:" >&5 ++ $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 + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8895,8 +9070,8 @@ + esac + fi + +-{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 +-echo "${ECHO_T}$ld_shlibs" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5 ++$as_echo "$ld_shlibs" >&6; } + test "$ld_shlibs" = no && can_build_shared=no + + # +@@ -8916,15 +9091,15 @@ + # 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. +- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } 2>conftest.err; then + soname=conftest + lib=conftest +@@ -8942,7 +9117,7 @@ + if { (eval echo "$as_me:$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=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + then + archive_cmds_need_lc=no +@@ -8954,16 +9129,16 @@ + cat conftest.err 1>&5 + fi + $rm conftest* +- { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 +-echo "${ECHO_T}$archive_cmds_need_lc" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 ++$as_echo "$archive_cmds_need_lc" >&6; } + ;; + esac + fi + ;; + esac + +-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++$as_echo_n "checking dynamic linker characteristics... " >&6; } + library_names_spec= + libname_spec='lib$name' + soname_spec= +@@ -9566,8 +9741,8 @@ + dynamic_linker=no + ;; + esac +-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +-echo "${ECHO_T}$dynamic_linker" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++$as_echo "$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +@@ -9575,8 +9750,8 @@ + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" + fi + +-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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" || \ + test -n "$runpath_var" || \ +@@ -9600,8 +9775,8 @@ + # directories. + hardcode_action=unsupported + fi +-{ echo "$as_me:$LINENO: result: $hardcode_action" >&5 +-echo "${ECHO_T}$hardcode_action" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 ++$as_echo "$hardcode_action" >&6; } + + if test "$hardcode_action" = relink; then + # Fast installation is not supported +@@ -9614,13 +9789,13 @@ + + striplib= + old_striplib= +-{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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" +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + else + # FIXME - insert some real tests, host_os isn't really good enough + case $host_os in +@@ -9628,16 +9803,16 @@ + if test -n "$STRIP" ; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + ;; + *) +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + ;; + esac + fi +@@ -9669,10 +9844,10 @@ + + darwin*) + # if libdl is installed we need to link against it +- { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldl $LIBS" +@@ -9704,33 +9879,37 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_dl_dlopen=yes + else +- echo "$as_me: failed program was:" >&5 ++ $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 +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } +-if test $ac_cv_lib_dl_dlopen = yes; then ++{ $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 + +@@ -9743,10 +9922,10 @@ + ;; + + *) +- { echo "$as_me:$LINENO: checking for shl_load" >&5 +-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -9799,38 +9978,42 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_func_shl_load=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_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 + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +-echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } +-if test $ac_cv_func_shl_load = yes; then ++{ $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" + else +- { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldld $LIBS" +@@ -9862,39 +10045,43 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_dld_shl_load=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } +-if test $ac_cv_lib_dld_shl_load = yes; then ++{ $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="-dld" + else +- { echo "$as_me:$LINENO: checking for dlopen" >&5 +-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -9947,38 +10134,42 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_func_dlopen=yes + else +- echo "$as_me: failed program was:" >&5 ++ $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 +-{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } +-if test $ac_cv_func_dlopen = yes; then ++{ $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 +- { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldl $LIBS" +@@ -10010,39 +10201,43 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_dl_dlopen=yes + else +- echo "$as_me: failed program was:" >&5 ++ $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 +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } +-if test $ac_cv_lib_dl_dlopen = yes; then ++{ $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 +- { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsvld $LIBS" +@@ -10074,39 +10269,43 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_svld_dlopen=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } +-if test $ac_cv_lib_svld_dlopen = yes; then ++{ $as_echo "$as_me:$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 + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" + else +- { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 +-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldld $LIBS" +@@ -10138,33 +10337,37 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_dld_dld_link=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } +-if test $ac_cv_lib_dld_dld_link = yes; then ++{ $as_echo "$as_me:$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 + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" + fi + +@@ -10203,10 +10406,10 @@ + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + +- { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 +-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self=cross +@@ -10214,7 +10417,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? +@@ -10298,15 +10501,15 @@ + + + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +-echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } ++{ $as_echo "$as_me:$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\" +- { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 +-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self_static=cross +@@ -10314,7 +10517,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? +@@ -10398,8 +10601,8 @@ + + + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 ++$as_echo "$lt_cv_dlopen_self_static" >&6; } + fi + + CPPFLAGS="$save_CPPFLAGS" +@@ -10421,13 +10624,13 @@ + + + # Report which library types will actually be built +-{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } +-{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 +-echo "${ECHO_T}$can_build_shared" >&6; } ++{ $as_echo "$as_me:$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 "$can_build_shared" >&6; } + +-{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 + + # On AIX, shared libraries and static libraries use the same namespace, and +@@ -10447,15 +10650,15 @@ + fi + ;; + esac +-{ echo "$as_me:$LINENO: result: $enable_shared" >&5 +-echo "${ECHO_T}$enable_shared" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 ++$as_echo "$enable_shared" >&6; } + +-{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +-{ echo "$as_me:$LINENO: result: $enable_static" >&5 +-echo "${ECHO_T}$enable_static" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5 ++$as_echo "$enable_static" >&6; } + + # The else clause should only fire when bootstrapping the + # libtool distribution, otherwise you forgot to ship ltmain.sh +@@ -10547,8 +10750,8 @@ + cfgfile="${ofile}T" + trap "$rm \"$cfgfile\"; exit 1" 1 2 15 + $rm -f "$cfgfile" +- { echo "$as_me:$LINENO: creating $ofile" >&5 +-echo "$as_me: creating $ofile" >&6;} ++ { $as_echo "$as_me:$LINENO: creating $ofile" >&5 ++$as_echo "$as_me: creating $ofile" >&6;} + + cat <<__EOF__ >> "$cfgfile" + #! $SHELL +@@ -10956,18 +11159,18 @@ + + if test -f "$ltmain" && test -n "$tagnames"; then + if test ! -f "${ofile}"; then +- { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 +-echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 ++$as_echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} + fi + + if test -z "$LTCC"; then + eval "`$SHELL ${ofile} --config | grep '^LTCC='`" + if test -z "$LTCC"; then +- { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5 +-echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5 ++$as_echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;} + else +- { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5 +-echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5 ++$as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} + fi + fi + if test -z "$LTCFLAGS"; then +@@ -10984,16 +11187,16 @@ + # Check whether tagname contains only valid characters + case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in + "") ;; +- *) { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5 +-echo "$as_me: error: invalid tag name: $tagname" >&2;} ++ *) { { $as_echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5 ++$as_echo "$as_me: error: invalid tag name: $tagname" >&2;} + { (exit 1); exit 1; }; } + ;; + esac + + if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null + then +- { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 +-echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} ++ { { $as_echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 ++$as_echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} + { (exit 1); exit 1; }; } + fi + +@@ -11135,8 +11338,8 @@ + ac_prog=ld + if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. +- { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 ++$as_echo_n "checking for ld used by $CC... " >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw +@@ -11165,14 +11368,14 @@ + ;; + esac + elif test "$with_gnu_ld" = yes; then +- { echo "$as_me:$LINENO: checking for GNU ld" >&5 +-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 ++$as_echo_n "checking for GNU ld... " >&6; } + else +- { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +@@ -11202,19 +11405,19 @@ + + LD="$lt_cv_path_LD" + if test -n "$LD"; then +- { echo "$as_me:$LINENO: result: $LD" >&5 +-echo "${ECHO_T}$LD" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $LD" >&5 ++$as_echo "$LD" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi +-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} ++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; }; } +-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + # I'd rather use --version here, but apparently some GNU lds only accept -v. + case `$LD -v 2>&1 &5 +-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 ++$as_echo "$lt_cv_prog_gnu_ld" >&6; } + with_gnu_ld=$lt_cv_prog_gnu_ld + + +@@ -11277,8 +11480,8 @@ + fi + + # PORTME: fill in a description of your system's C++ link characteristics +-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + ld_shlibs_CXX=yes + case $host_os in + aix3*) +@@ -11395,18 +11598,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -11421,12 +11627,13 @@ + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi + else +- echo "$as_me: failed program was:" >&5 ++ $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 + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -11462,18 +11669,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -11488,12 +11698,13 @@ + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi + else +- echo "$as_me: failed program was:" >&5 ++ $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 + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -12251,8 +12462,8 @@ + ld_shlibs_CXX=no + ;; + esac +-{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +-echo "${ECHO_T}$ld_shlibs_CXX" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 ++$as_echo "$ld_shlibs_CXX" >&6; } + test "$ld_shlibs_CXX" = no && can_build_shared=no + + GCC_CXX="$GXX" +@@ -12272,7 +12483,7 @@ + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. +@@ -12424,8 +12635,8 @@ + lt_prog_compiler_pic_CXX= + lt_prog_compiler_static_CXX= + +-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 ++$as_echo_n "checking for $compiler option to produce PIC... " >&6; } + + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then +@@ -12708,18 +12919,18 @@ + esac + fi + +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 ++$as_echo "$lt_prog_compiler_pic_CXX" >&6; } + + # + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic_CXX"; then + +-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 +-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 ++$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } + if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_prog_compiler_pic_works_CXX=no + ac_outfile=conftest.$ac_objext +@@ -12734,11 +12945,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:12737: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:12948: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:12741: \$? = $ac_status" >&5 ++ echo "$as_me:12952: \$? = $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. +@@ -12751,8 +12962,8 @@ + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 ++$as_echo "$lt_prog_compiler_pic_works_CXX" >&6; } + + if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then + case $lt_prog_compiler_pic_CXX in +@@ -12779,10 +12990,10 @@ + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" +-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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_prog_compiler_static_works_CXX+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_prog_compiler_static_works_CXX=no + save_LDFLAGS="$LDFLAGS" +@@ -12807,8 +13018,8 @@ + LDFLAGS="$save_LDFLAGS" + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 +-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 ++$as_echo "$lt_prog_compiler_static_works_CXX" >&6; } + + if test x"$lt_prog_compiler_static_works_CXX" = xyes; then + : +@@ -12817,10 +13028,10 @@ + fi + + +-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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_CXX+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_c_o_CXX=no + $rm -r conftest 2>/dev/null +@@ -12838,11 +13049,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:12841: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13052: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:12845: \$? = $ac_status" >&5 ++ echo "$as_me:13056: \$? = $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 +@@ -12864,34 +13075,34 @@ + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 ++$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } + + + hard_links="nottested" + if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user +- { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no +- { echo "$as_me:$LINENO: result: $hard_links" >&5 +-echo "${ECHO_T}$hard_links" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 ++$as_echo "$hard_links" >&6; } + if test "$hard_links" = no; then +- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} ++ { $as_echo "$as_me:$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 + else + need_locks=no + fi + +-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + case $host_os in +@@ -12915,8 +13126,8 @@ + ;; + esac + +-{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +-echo "${ECHO_T}$ld_shlibs_CXX" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 ++$as_echo "$ld_shlibs_CXX" >&6; } + test "$ld_shlibs_CXX" = no && can_build_shared=no + + # +@@ -12936,15 +13147,15 @@ + # 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. +- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } 2>conftest.err; then + soname=conftest + lib=conftest +@@ -12962,7 +13173,7 @@ + if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 + (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + then + archive_cmds_need_lc_CXX=no +@@ -12974,16 +13185,16 @@ + cat conftest.err 1>&5 + fi + $rm conftest* +- { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 +-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 ++$as_echo "$archive_cmds_need_lc_CXX" >&6; } + ;; + esac + fi + ;; + esac + +-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++$as_echo_n "checking dynamic linker characteristics... " >&6; } + library_names_spec= + libname_spec='lib$name' + soname_spec= +@@ -13534,8 +13745,8 @@ + dynamic_linker=no + ;; + esac +-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +-echo "${ECHO_T}$dynamic_linker" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++$as_echo "$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +@@ -13543,8 +13754,8 @@ + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" + fi + +-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++$as_echo_n "checking how to hardcode library paths into programs... " >&6; } + hardcode_action_CXX= + if test -n "$hardcode_libdir_flag_spec_CXX" || \ + test -n "$runpath_var_CXX" || \ +@@ -13568,8 +13779,8 @@ + # directories. + hardcode_action_CXX=unsupported + fi +-{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 +-echo "${ECHO_T}$hardcode_action_CXX" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 ++$as_echo "$hardcode_action_CXX" >&6; } + + if test "$hardcode_action_CXX" = relink; then + # Fast installation is not supported +@@ -14102,13 +14313,13 @@ + cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + + +-{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } +-{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 +-echo "${ECHO_T}$can_build_shared" >&6; } ++{ $as_echo "$as_me:$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 "$can_build_shared" >&6; } + +-{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 + + # On AIX, shared libraries and static libraries use the same namespace, and +@@ -14127,15 +14338,15 @@ + fi + ;; + esac +-{ echo "$as_me:$LINENO: result: $enable_shared" >&5 +-echo "${ECHO_T}$enable_shared" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 ++$as_echo "$enable_shared" >&6; } + +-{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +-{ echo "$as_me:$LINENO: result: $enable_static" >&5 +-echo "${ECHO_T}$enable_static" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5 ++$as_echo "$enable_static" >&6; } + + GCC_F77="$G77" + LD_F77="$LD" +@@ -14144,8 +14355,8 @@ + lt_prog_compiler_pic_F77= + lt_prog_compiler_static_F77= + +-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 + lt_prog_compiler_wl_F77='-Wl,' +@@ -14376,18 +14587,18 @@ + esac + fi + +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 ++$as_echo "$lt_prog_compiler_pic_F77" >&6; } + + # + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic_F77"; then + +-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 +-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 ++$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; } + if test "${lt_prog_compiler_pic_works_F77+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_prog_compiler_pic_works_F77=no + ac_outfile=conftest.$ac_objext +@@ -14402,11 +14613,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:14405: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14616: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:14409: \$? = $ac_status" >&5 ++ echo "$as_me:14620: \$? = $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. +@@ -14419,8 +14630,8 @@ + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 ++$as_echo "$lt_prog_compiler_pic_works_F77" >&6; } + + if test x"$lt_prog_compiler_pic_works_F77" = xyes; then + case $lt_prog_compiler_pic_F77 in +@@ -14447,10 +14658,10 @@ + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" +-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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_prog_compiler_static_works_F77+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_prog_compiler_static_works_F77=no + save_LDFLAGS="$LDFLAGS" +@@ -14475,8 +14686,8 @@ + LDFLAGS="$save_LDFLAGS" + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 +-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 ++$as_echo "$lt_prog_compiler_static_works_F77" >&6; } + + if test x"$lt_prog_compiler_static_works_F77" = xyes; then + : +@@ -14485,10 +14696,10 @@ + fi + + +-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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_F77+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_c_o_F77=no + $rm -r conftest 2>/dev/null +@@ -14506,11 +14717,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:14509: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14720: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:14513: \$? = $ac_status" >&5 ++ echo "$as_me:14724: \$? = $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 +@@ -14532,34 +14743,34 @@ + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 ++$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; } + + + hard_links="nottested" + if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user +- { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no +- { echo "$as_me:$LINENO: result: $hard_links" >&5 +-echo "${ECHO_T}$hard_links" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 ++$as_echo "$hard_links" >&6; } + if test "$hard_links" = no; then +- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} ++ { $as_echo "$as_me:$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 + else + need_locks=no + fi + +-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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= + allow_undefined_flag_F77= +@@ -14978,18 +15189,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -15004,12 +15218,13 @@ + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi + else +- echo "$as_me: failed program was:" >&5 ++ $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 + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -15034,18 +15249,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -15060,12 +15278,13 @@ + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi + else +- echo "$as_me: failed program was:" >&5 ++ $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 + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -15518,8 +15737,8 @@ + esac + fi + +-{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 +-echo "${ECHO_T}$ld_shlibs_F77" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 ++$as_echo "$ld_shlibs_F77" >&6; } + test "$ld_shlibs_F77" = no && can_build_shared=no + + # +@@ -15539,15 +15758,15 @@ + # 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. +- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } 2>conftest.err; then + soname=conftest + lib=conftest +@@ -15565,7 +15784,7 @@ + if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 + (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + then + archive_cmds_need_lc_F77=no +@@ -15577,16 +15796,16 @@ + cat conftest.err 1>&5 + fi + $rm conftest* +- { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 +-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 ++$as_echo "$archive_cmds_need_lc_F77" >&6; } + ;; + esac + fi + ;; + esac + +-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++$as_echo_n "checking dynamic linker characteristics... " >&6; } + library_names_spec= + libname_spec='lib$name' + soname_spec= +@@ -16137,8 +16356,8 @@ + dynamic_linker=no + ;; + esac +-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +-echo "${ECHO_T}$dynamic_linker" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++$as_echo "$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +@@ -16146,8 +16365,8 @@ + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" + fi + +-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++$as_echo_n "checking how to hardcode library paths into programs... " >&6; } + hardcode_action_F77= + if test -n "$hardcode_libdir_flag_spec_F77" || \ + test -n "$runpath_var_F77" || \ +@@ -16171,8 +16390,8 @@ + # directories. + hardcode_action_F77=unsupported + fi +-{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 +-echo "${ECHO_T}$hardcode_action_F77" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 ++$as_echo "$hardcode_action_F77" >&6; } + + if test "$hardcode_action_F77" = relink; then + # Fast installation is not supported +@@ -16677,10 +16896,10 @@ + lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' + + +-{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext +@@ -16695,11 +16914,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:16698: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16917: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:16702: \$? = $ac_status" >&5 ++ echo "$as_me:16921: \$? = $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. +@@ -16712,8 +16931,8 @@ + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } ++{ $as_echo "$as_me:$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 + lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" +@@ -16727,8 +16946,8 @@ + lt_prog_compiler_pic_GCJ= + lt_prog_compiler_static_GCJ= + +-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 + lt_prog_compiler_wl_GCJ='-Wl,' +@@ -16959,18 +17178,18 @@ + esac + fi + +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 ++$as_echo "$lt_prog_compiler_pic_GCJ" >&6; } + + # + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic_GCJ"; then + +-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 +-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 ++$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; } + if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_prog_compiler_pic_works_GCJ=no + ac_outfile=conftest.$ac_objext +@@ -16985,11 +17204,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:16988: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17207: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:16992: \$? = $ac_status" >&5 ++ echo "$as_me:17211: \$? = $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. +@@ -17002,8 +17221,8 @@ + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 ++$as_echo "$lt_prog_compiler_pic_works_GCJ" >&6; } + + if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then + case $lt_prog_compiler_pic_GCJ in +@@ -17030,10 +17249,10 @@ + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" +-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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_prog_compiler_static_works_GCJ+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_prog_compiler_static_works_GCJ=no + save_LDFLAGS="$LDFLAGS" +@@ -17058,8 +17277,8 @@ + LDFLAGS="$save_LDFLAGS" + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 +-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 ++$as_echo "$lt_prog_compiler_static_works_GCJ" >&6; } + + if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then + : +@@ -17068,10 +17287,10 @@ + fi + + +-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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_GCJ+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_c_o_GCJ=no + $rm -r conftest 2>/dev/null +@@ -17089,11 +17308,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:17092: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17311: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:17096: \$? = $ac_status" >&5 ++ echo "$as_me:17315: \$? = $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 +@@ -17115,34 +17334,34 @@ + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 ++$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; } + + + hard_links="nottested" + if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user +- { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no +- { echo "$as_me:$LINENO: result: $hard_links" >&5 +-echo "${ECHO_T}$hard_links" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 ++$as_echo "$hard_links" >&6; } + if test "$hard_links" = no; then +- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} ++ { $as_echo "$as_me:$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 + else + need_locks=no + fi + +-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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= + allow_undefined_flag_GCJ= +@@ -17571,18 +17790,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -17597,12 +17819,13 @@ + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi + else +- echo "$as_me: failed program was:" >&5 ++ $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 + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -17637,18 +17860,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -17663,12 +17889,13 @@ + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi + else +- echo "$as_me: failed program was:" >&5 ++ $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 + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -18121,8 +18348,8 @@ + esac + fi + +-{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 +-echo "${ECHO_T}$ld_shlibs_GCJ" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 ++$as_echo "$ld_shlibs_GCJ" >&6; } + test "$ld_shlibs_GCJ" = no && can_build_shared=no + + # +@@ -18142,15 +18369,15 @@ + # 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. +- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } 2>conftest.err; then + soname=conftest + lib=conftest +@@ -18168,7 +18395,7 @@ + if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 + (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + then + archive_cmds_need_lc_GCJ=no +@@ -18180,16 +18407,16 @@ + cat conftest.err 1>&5 + fi + $rm conftest* +- { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 +-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 ++$as_echo "$archive_cmds_need_lc_GCJ" >&6; } + ;; + esac + fi + ;; + esac + +-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++$as_echo_n "checking dynamic linker characteristics... " >&6; } + library_names_spec= + libname_spec='lib$name' + soname_spec= +@@ -18740,8 +18967,8 @@ + dynamic_linker=no + ;; + esac +-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +-echo "${ECHO_T}$dynamic_linker" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++$as_echo "$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +@@ -18749,8 +18976,8 @@ + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" + fi + +-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++$as_echo_n "checking how to hardcode library paths into programs... " >&6; } + hardcode_action_GCJ= + if test -n "$hardcode_libdir_flag_spec_GCJ" || \ + test -n "$runpath_var_GCJ" || \ +@@ -18774,8 +19001,8 @@ + # directories. + hardcode_action_GCJ=unsupported + fi +-{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 +-echo "${ECHO_T}$hardcode_action_GCJ" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 ++$as_echo "$hardcode_action_GCJ" >&6; } + + if test "$hardcode_action_GCJ" = relink; then + # Fast installation is not supported +@@ -19688,8 +19915,8 @@ + ;; + + *) +- { { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5 +-echo "$as_me: error: Unsupported tag name: $tagname" >&2;} ++ { { $as_echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5 ++$as_echo "$as_me: error: Unsupported tag name: $tagname" >&2;} + { (exit 1); exit 1; }; } + ;; + esac +@@ -19708,8 +19935,8 @@ + chmod +x "$ofile" + else + rm -f "${ofile}T" +- { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 +-echo "$as_me: error: unable to update list of available tagged configurations." >&2;} ++ { { $as_echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 ++$as_echo "$as_me: error: unable to update list of available tagged configurations." >&2;} + { (exit 1); exit 1; }; } + fi + fi +@@ -19746,8 +19973,8 @@ + + case "$am__api_version" in + 1.01234) +- { { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5 +-echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;} ++ { { $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; }; } + ;; + *) +@@ -19755,18 +19982,18 @@ + esac + + if test -n "0.35.0"; then +- { echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5 +-echo $ECHO_N "checking for intltool >= 0.35.0... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5 ++$as_echo_n "checking for intltool >= 0.35.0... " >&6; } + + INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` + INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in` + +- { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5 +-echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; } ++ { $as_echo "$as_me:$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" || +- { { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.0 or later." >&5 +-echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;} ++ { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.0 or later." >&5 ++$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;} + { (exit 1); exit 1; }; } + fi + +@@ -19813,10 +20040,10 @@ + # 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_path_XGETTEXT+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case $XGETTEXT in + [\\/]* | ?:[\\/]*) +@@ -19831,7 +20058,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -19843,20 +20070,20 @@ + fi + XGETTEXT=$ac_cv_path_XGETTEXT + if test -n "$XGETTEXT"; then +- { echo "$as_me:$LINENO: result: $XGETTEXT" >&5 +-echo "${ECHO_T}$XGETTEXT" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 ++$as_echo "$XGETTEXT" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_path_MSGMERGE+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case $MSGMERGE in + [\\/]* | ?:[\\/]*) +@@ -19871,7 +20098,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -19883,20 +20110,20 @@ + fi + MSGMERGE=$ac_cv_path_MSGMERGE + if test -n "$MSGMERGE"; then +- { echo "$as_me:$LINENO: result: $MSGMERGE" >&5 +-echo "${ECHO_T}$MSGMERGE" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5 ++$as_echo "$MSGMERGE" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_path_MSGFMT+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case $MSGFMT in + [\\/]* | ?:[\\/]*) +@@ -19911,7 +20138,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -19923,25 +20150,25 @@ + fi + MSGFMT=$ac_cv_path_MSGFMT + if test -n "$MSGFMT"; then +- { echo "$as_me:$LINENO: result: $MSGFMT" >&5 +-echo "${ECHO_T}$MSGFMT" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 ++$as_echo "$MSGFMT" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + + if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then +- { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 +-echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} ++ { { $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; }; } + 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 +- { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 +-echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} ++ { { $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; }; } + fi + +@@ -19955,10 +20182,10 @@ + + # Extract the first word of "perl", so it can be a program name with args. + set dummy perl; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case $INTLTOOL_PERL in + [\\/]* | ?:[\\/]*) +@@ -19973,7 +20200,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -19985,33 +20212,33 @@ + fi + INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL + if test -n "$INTLTOOL_PERL"; then +- { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5 +-echo "${ECHO_T}$INTLTOOL_PERL" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5 ++$as_echo "$INTLTOOL_PERL" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + + if test -z "$INTLTOOL_PERL"; then +- { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5 +-echo "$as_me: error: perl not found; required for intltool" >&2;} ++ { { $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; }; } + fi + if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then +- { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5 +-echo "$as_me: error: perl 5.x required for intltool" >&2;} ++ { { $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; }; } + fi + if test "x" != "xno-xml"; then +- { echo "$as_me:$LINENO: checking for XML::Parser" >&5 +-echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- { echo "$as_me:$LINENO: result: ok" >&5 +-echo "${ECHO_T}ok" >&6; } ++ { $as_echo "$as_me:$LINENO: result: ok" >&5 ++$as_echo "ok" >&6; } + else +- { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5 +-echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;} ++ { { $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; }; } + fi + fi +@@ -20044,29 +20271,32 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + DATADIRNAME=share + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + case $host in + *-*-solaris*) +- { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 +-echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -20119,32 +20349,36 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_func_bind_textdomain_codeset=yes + else +- echo "$as_me: failed program was:" >&5 ++ $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 +-{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 +-echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; } +-if test $ac_cv_func_bind_textdomain_codeset = yes; then ++{ $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 + DATADIRNAME=share + else + DATADIRNAME=lib +@@ -20157,6 +20391,7 @@ + esac + fi + ++rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +@@ -20204,8 +20439,8 @@ + for option in -Wno-sign-compare; do + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $option" +- { echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 +-echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 ++$as_echo_n "checking whether gcc understands $option... " >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -20227,20 +20462,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 + has_option=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + has_option=no +@@ -20248,8 +20484,8 @@ + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$SAVE_CFLAGS" +- { echo "$as_me:$LINENO: result: $has_option" >&5 +-echo "${ECHO_T}$has_option" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $has_option" >&5 ++$as_echo "$has_option" >&6; } + if test $has_option = yes; then + warning_flags="$warning_flags $option" + fi +@@ -20262,16 +20498,16 @@ + fi + ;; + *) +- { { echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5 +-echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;} ++ { { $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; }; } + ;; + esac + CFLAGS="$realsave_CFLAGS" +- { echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5 +-echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6; } +- { echo "$as_me:$LINENO: result: $warning_flags" >&5 +-echo "${ECHO_T}$warning_flags" >&6; } ++ { $as_echo "$as_me:$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 "$warning_flags" >&6; } + + # Check whether --enable-iso-c was given. + if test "${enable_iso_c+set}" = set; then +@@ -20281,8 +20517,8 @@ + fi + + +- { echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5 +-echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 + if test "x$GCC" = "xyes"; then +@@ -20296,8 +20532,8 @@ + esac + fi + fi +- { echo "$as_me:$LINENO: result: $complCFLAGS" >&5 +-echo "${ECHO_T}$complCFLAGS" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $complCFLAGS" >&5 ++$as_echo "$complCFLAGS" >&6; } + + WARN_CFLAGS="$warning_flags $complCFLAGS" + +@@ -20308,10 +20544,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) +@@ -20326,7 +20562,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -20338,11 +20574,11 @@ + fi + PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then +- { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +-echo "${ECHO_T}$PKG_CONFIG" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 ++$as_echo "$PKG_CONFIG" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -20351,10 +20587,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) +@@ -20369,7 +20605,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -20381,11 +20617,11 @@ + fi + ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG + if test -n "$ac_pt_PKG_CONFIG"; then +- { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 ++$as_echo "$ac_pt_PKG_CONFIG" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + if test "x$ac_pt_PKG_CONFIG" = x; then +@@ -20393,12 +20629,8 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++{ $as_echo "$as_me:$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 + PKG_CONFIG=$ac_pt_PKG_CONFIG +@@ -20410,14 +20642,14 @@ + fi + if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 +- { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + PKG_CONFIG="" + fi + +@@ -20426,10 +20658,10 @@ + gdu_cv_version_required=0.3.2 + + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5 + ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + gdu_cv_have_gdu=yes + else +@@ -20439,8 +20671,8 @@ + if test "$gdu_cv_have_gdu" = "yes"; then + : + else +- { { echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5 +-echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;} ++ { { $as_echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5 ++$as_echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;} + { (exit 1); exit 1; }; } + fi + +@@ -20510,10 +20742,10 @@ + + # Extract the first word of "glib-genmarshal", so it can be a program name with args. + set dummy glib-genmarshal; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_path_GLIB_GENMARSHAL+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case $GLIB_GENMARSHAL in + [\\/]* | ?:[\\/]*) +@@ -20528,7 +20760,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -20540,11 +20772,11 @@ + fi + GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL + if test -n "$GLIB_GENMARSHAL"; then +- { echo "$as_me:$LINENO: result: $GLIB_GENMARSHAL" >&5 +-echo "${ECHO_T}$GLIB_GENMARSHAL" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $GLIB_GENMARSHAL" >&5 ++$as_echo "$GLIB_GENMARSHAL" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -20572,20 +20804,21 @@ + + for ac_header in locale.h + do +-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++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 +- { echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + fi +-ac_res=`eval echo '${'$as_ac_Header'}'` +- { echo "$as_me:$LINENO: result: $ac_res" >&5 +-echo "${ECHO_T}$ac_res" >&6; } ++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? +-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++{ $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 +@@ -20601,32 +20834,33 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 +- echo "$as_me: failed program was:" >&5 ++ $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 +-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++$as_echo "$ac_header_compiler" >&6; } + + # Is the header present? +-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++{ $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 +@@ -20640,69 +20874,73 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 +- echo "$as_me: failed program was:" >&5 ++ $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 +-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6; } ++{ $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: ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ { $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:* ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ { $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;} + + ;; + esac +-{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++{ $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + eval "$as_ac_Header=\$ac_header_preproc" + fi +-ac_res=`eval echo '${'$as_ac_Header'}'` +- { echo "$as_me:$LINENO: result: $ac_res" >&5 +-echo "${ECHO_T}$ac_res" >&6; } ++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 +-if test `eval echo '${'$as_ac_Header'}'` = yes; then ++as_val=`eval 'as_val=${'$as_ac_Header'} ++ $as_echo "$as_val"'` ++ if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -20710,10 +20948,10 @@ + done + + if test $ac_cv_header_locale_h = yes; then +- { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 +-echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 ++$as_echo_n "checking for LC_MESSAGES... " >&6; } + if test "${am_cv_val_LC_MESSAGES+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -20736,31 +20974,35 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + am_cv_val_LC_MESSAGES=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + fi +-{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 +-echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; } ++{ $as_echo "$as_me:$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 +@@ -20779,17 +21021,17 @@ + INTLLIBS= + + if test "${ac_cv_header_libintl_h+set}" = set; then +- { echo "$as_me:$LINENO: checking for libintl.h" >&5 +-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 +-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; } ++{ $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? +-{ echo "$as_me:$LINENO: checking libintl.h usability" >&5 +-echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; } ++{ $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 +@@ -20805,32 +21047,33 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 +- echo "$as_me: failed program was:" >&5 ++ $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 +-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++$as_echo "$ac_header_compiler" >&6; } + + # Is the header present? +-{ echo "$as_me:$LINENO: checking libintl.h presence" >&5 +-echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; } ++{ $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 +@@ -20844,76 +21087,77 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 +- echo "$as_me: failed program was:" >&5 ++ $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 +-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6; } ++{ $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: ) +- { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} ++ { $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:* ) +- { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} ++ { $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;} + + ;; + esac +-{ echo "$as_me:$LINENO: checking for libintl.h" >&5 +-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; } ++{ $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_cv_header_libintl_h=$ac_header_preproc + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 +-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 ++$as_echo "$ac_cv_header_libintl_h" >&6; } + + fi +-if test $ac_cv_header_libintl_h = yes; then ++if test "x$ac_cv_header_libintl_h" = x""yes; then + gt_cv_func_dgettext_libintl="no" + libintl_extra_libs="" + + # + # First check in libc + # +- { echo "$as_me:$LINENO: checking for ngettext in libc" >&5 +-echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -20938,38 +21182,42 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + gt_cv_func_ngettext_libc=yes + else +- echo "$as_me: failed program was:" >&5 ++ $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 + + fi +-{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 +-echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; } ++{ $as_echo "$as_me:$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 +- { echo "$as_me:$LINENO: checking for dgettext in libc" >&5 +-echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -20994,43 +21242,47 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + gt_cv_func_dgettext_libc=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + + fi +-{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 +-echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; } ++{ $as_echo "$as_me:$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=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -21083,35 +21335,42 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + eval "$as_ac_var=yes" + else +- echo "$as_me: failed program was:" >&5 ++ $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 echo '${'$as_ac_var'}'` +- { echo "$as_me:$LINENO: result: $ac_res" >&5 +-echo "${ECHO_T}$ac_res" >&6; } +-if test `eval echo '${'$as_ac_var'}'` = yes; then ++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 `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -21126,10 +21385,10 @@ + || test "$gt_cv_func_ngettext_libc" != "yes" \ + || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then + +- { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 +-echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $LIBS" +@@ -21161,37 +21420,41 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_intl_bindtextdomain=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 +-echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; } +-if test $ac_cv_lib_intl_bindtextdomain = yes; then +- { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 +-echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 ++$as_echo_n "checking for ngettext in -lintl... " >&6; } + if test "${ac_cv_lib_intl_ngettext+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $LIBS" +@@ -21223,37 +21486,41 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_intl_ngettext=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 +-echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; } +-if test $ac_cv_lib_intl_ngettext = yes; then +- { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 +-echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 ++$as_echo_n "checking for dgettext in -lintl... " >&6; } + if test "${ac_cv_lib_intl_dgettext+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $LIBS" +@@ -21285,33 +21552,37 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_intl_dgettext=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 +-echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; } +-if test $ac_cv_lib_intl_dgettext = yes; then ++{ $as_echo "$as_me:$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 + gt_cv_func_dgettext_libintl=yes + fi + +@@ -21321,14 +21592,14 @@ + + + if test "$gt_cv_func_dgettext_libintl" != "yes" ; then +- { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 +-echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; } +- { echo "$as_me:$LINENO: result: " >&5 +-echo "${ECHO_T}" >&6; } +- { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 +-echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 "" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl -liconv $LIBS" +@@ -21360,37 +21631,41 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_intl_ngettext=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 +-echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; } +-if test $ac_cv_lib_intl_ngettext = yes; then +- { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 +-echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 ++$as_echo_n "checking for dcgettext in -lintl... " >&6; } + if test "${ac_cv_lib_intl_dcgettext+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl -liconv $LIBS" +@@ -21422,33 +21697,37 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_intl_dcgettext=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 +-echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; } +-if test $ac_cv_lib_intl_dcgettext = yes; then ++{ $as_echo "$as_me:$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 + gt_cv_func_dgettext_libintl=yes + libintl_extra_libs=-liconv + else +@@ -21473,11 +21752,11 @@ + + for ac_func in bind_textdomain_codeset + do +-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -21530,35 +21809,42 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + eval "$as_ac_var=yes" + else +- echo "$as_me: failed program was:" >&5 ++ $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 echo '${'$as_ac_var'}'` +- { echo "$as_me:$LINENO: result: $ac_res" >&5 +-echo "${ECHO_T}$ac_res" >&6; } +-if test `eval echo '${'$as_ac_var'}'` = yes; then ++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 `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -21594,10 +21880,10 @@ + + # Extract the first word of "msgfmt", so it can be a program name with args. + set dummy msgfmt; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_path_MSGFMT+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case "$MSGFMT" in + /*) +@@ -21621,11 +21907,11 @@ + fi + MSGFMT="$ac_cv_path_MSGFMT" + if test "$MSGFMT" != "no"; then +- { echo "$as_me:$LINENO: result: $MSGFMT" >&5 +-echo "${ECHO_T}$MSGFMT" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 ++$as_echo "$MSGFMT" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + if test "$MSGFMT" != "no"; then + glib_save_LIBS="$LIBS" +@@ -21633,11 +21919,11 @@ + + for ac_func in dcgettext + do +-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -21690,43 +21976,50 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + eval "$as_ac_var=yes" + else +- echo "$as_me: failed program was:" >&5 ++ $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 echo '${'$as_ac_var'}'` +- { echo "$as_me:$LINENO: result: $ac_res" >&5 +-echo "${ECHO_T}$ac_res" >&6; } +-if test `eval echo '${'$as_ac_var'}'` = yes; then ++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 `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi + done + + MSGFMT_OPTS= +- { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 +-echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 ++$as_echo_n "checking if msgfmt accepts -c... " >&6; } + cat >conftest.foo <<_ACEOF + + msgid "" +@@ -21740,25 +22033,25 @@ + "Content-Transfer-Encoding: 8bit\n" + + _ACEOF +-if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5 ++if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5 + ($MSGFMT -c -o /dev/null conftest.foo) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +-else { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } ++else { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + echo "$as_me: failed input was:" >&5 + sed 's/^/| /' conftest.foo >&5 + fi + + # Extract the first word of "gmsgfmt", so it can be a program name with args. + set dummy gmsgfmt; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_path_GMSGFMT+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case $GMSGFMT in + [\\/]* | ?:[\\/]*) +@@ -21773,7 +22066,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -21786,20 +22079,20 @@ + fi + GMSGFMT=$ac_cv_path_GMSGFMT + if test -n "$GMSGFMT"; then +- { echo "$as_me:$LINENO: result: $GMSGFMT" >&5 +-echo "${ECHO_T}$GMSGFMT" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 ++$as_echo "$GMSGFMT" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_path_XGETTEXT+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case "$XGETTEXT" in + /*) +@@ -21823,11 +22116,11 @@ + fi + XGETTEXT="$ac_cv_path_XGETTEXT" + if test "$XGETTEXT" != ":"; then +- { echo "$as_me:$LINENO: result: $XGETTEXT" >&5 +-echo "${ECHO_T}$XGETTEXT" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 ++$as_echo "$XGETTEXT" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + cat >conftest.$ac_ext <<_ACEOF +@@ -21852,30 +22145,33 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + CATOBJEXT=.gmo + DATADIRNAME=share + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + case $host in + *-*-solaris*) +- { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 +-echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -21928,32 +22224,36 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_func_bind_textdomain_codeset=yes + else +- echo "$as_me: failed program was:" >&5 ++ $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 +-{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 +-echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; } +-if test $ac_cv_func_bind_textdomain_codeset = yes; then ++{ $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 + CATOBJEXT=.gmo + DATADIRNAME=share + else +@@ -21969,6 +22269,7 @@ + esac + fi + ++rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$glib_save_LIBS" +@@ -21994,8 +22295,8 @@ + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else +- { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 +-echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; } ++ { $as_echo "$as_me:$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 + fi +@@ -22027,8 +22328,8 @@ + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else +- { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 +-echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 + useit=no +@@ -22052,8 +22353,8 @@ + fi + done + LINGUAS=$NEW_LINGUAS +- { echo "$as_me:$LINENO: result: $LINGUAS" >&5 +-echo "${ECHO_T}$LINGUAS" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5 ++$as_echo "$LINGUAS" >&6; } + fi + + if test -n "$LINGUAS"; then +@@ -22122,17 +22423,17 @@ + + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for GLIB" >&5 +-echo $ECHO_N "checking for GLIB... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for GLIB" >&5 ++$as_echo_n "checking for GLIB... " >&6; } + + if test -n "$GLIB_CFLAGS"; then + pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gobject-2.0" 2>/dev/null` + else +@@ -22145,10 +22446,10 @@ + pkg_cv_GLIB_LIBS="$GLIB_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gobject-2.0" 2>/dev/null` + else +@@ -22175,7 +22476,7 @@ + # Put the nasty error message in config.log where it belongs + echo "$GLIB_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gobject-2.0) were not met: ++ { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gobject-2.0) were not met: + + $GLIB_PKG_ERRORS + +@@ -22186,7 +22487,7 @@ + and GLIB_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gobject-2.0) were not met: ++$as_echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gobject-2.0) were not met: + + $GLIB_PKG_ERRORS + +@@ -22199,7 +22500,9 @@ + " >&2;} + { (exit 1); exit 1; }; } + elif test $pkg_failed = untried; then +- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it ++ { { $as_echo "$as_me:$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. + +@@ -22209,7 +22512,7 @@ + + To get pkg-config, see . + See \`config.log' for more details." >&5 +-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++$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. + +@@ -22219,12 +22522,12 @@ + + To get pkg-config, see . + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { (exit 1); exit 1; }; }; } + else + GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS + GLIB_LIBS=$pkg_cv_GLIB_LIBS +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + : + fi + +@@ -22232,17 +22535,17 @@ + + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for HAL" >&5 +-echo $ECHO_N "checking for HAL... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for HAL" >&5 ++$as_echo_n "checking for HAL... " >&6; } + + if test -n "$HAL_CFLAGS"; then + pkg_cv_HAL_CFLAGS="$HAL_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= \$HAL_REQUIRED\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= \$HAL_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors "hal >= $HAL_REQUIRED") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "hal >= $HAL_REQUIRED" 2>/dev/null` + else +@@ -22255,10 +22558,10 @@ + pkg_cv_HAL_LIBS="$HAL_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= \$HAL_REQUIRED\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= \$HAL_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors "hal >= $HAL_REQUIRED") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "hal >= $HAL_REQUIRED" 2>/dev/null` + else +@@ -22285,7 +22588,7 @@ + # Put the nasty error message in config.log where it belongs + echo "$HAL_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (hal >= $HAL_REQUIRED) were not met: ++ { { $as_echo "$as_me:$LINENO: error: Package requirements (hal >= $HAL_REQUIRED) were not met: + + $HAL_PKG_ERRORS + +@@ -22296,7 +22599,7 @@ + and HAL_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (hal >= $HAL_REQUIRED) were not met: ++$as_echo "$as_me: error: Package requirements (hal >= $HAL_REQUIRED) were not met: + + $HAL_PKG_ERRORS + +@@ -22309,7 +22612,9 @@ + " >&2;} + { (exit 1); exit 1; }; } + elif test $pkg_failed = untried; then +- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it ++ { { $as_echo "$as_me:$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. + +@@ -22319,7 +22624,7 @@ + + To get pkg-config, see . + See \`config.log' for more details." >&5 +-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++$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. + +@@ -22329,12 +22634,12 @@ + + To get pkg-config, see . + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { (exit 1); exit 1; }; }; } + else + HAL_CFLAGS=$pkg_cv_HAL_CFLAGS + HAL_LIBS=$pkg_cv_HAL_LIBS +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + : + fi + +@@ -22342,17 +22647,17 @@ + + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for GSTREAMER" >&5 +-echo $ECHO_N "checking for GSTREAMER... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for GSTREAMER" >&5 ++$as_echo_n "checking for GSTREAMER... " >&6; } + + if test -n "$GSTREAMER_CFLAGS"; then + pkg_cv_GSTREAMER_CFLAGS="$GSTREAMER_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 >= \$GSTREAMER_REQUIRED\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 >= \$GSTREAMER_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors "gstreamer-0.10 >= $GSTREAMER_REQUIRED") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-0.10 >= $GSTREAMER_REQUIRED" 2>/dev/null` + else +@@ -22365,10 +22670,10 @@ + pkg_cv_GSTREAMER_LIBS="$GSTREAMER_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 >= \$GSTREAMER_REQUIRED\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 >= \$GSTREAMER_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors "gstreamer-0.10 >= $GSTREAMER_REQUIRED") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GSTREAMER_LIBS=`$PKG_CONFIG --libs "gstreamer-0.10 >= $GSTREAMER_REQUIRED" 2>/dev/null` + else +@@ -22395,7 +22700,7 @@ + # Put the nasty error message in config.log where it belongs + echo "$GSTREAMER_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (gstreamer-0.10 >= $GSTREAMER_REQUIRED) were not met: ++ { { $as_echo "$as_me:$LINENO: error: Package requirements (gstreamer-0.10 >= $GSTREAMER_REQUIRED) were not met: + + $GSTREAMER_PKG_ERRORS + +@@ -22406,7 +22711,7 @@ + and GSTREAMER_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (gstreamer-0.10 >= $GSTREAMER_REQUIRED) were not met: ++$as_echo "$as_me: error: Package requirements (gstreamer-0.10 >= $GSTREAMER_REQUIRED) were not met: + + $GSTREAMER_PKG_ERRORS + +@@ -22419,7 +22724,9 @@ + " >&2;} + { (exit 1); exit 1; }; } + elif test $pkg_failed = untried; then +- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it ++ { { $as_echo "$as_me:$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. + +@@ -22429,7 +22736,7 @@ + + To get pkg-config, see . + See \`config.log' for more details." >&5 +-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++$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. + +@@ -22439,12 +22746,12 @@ + + To get pkg-config, see . + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { (exit 1); exit 1; }; }; } + else + GSTREAMER_CFLAGS=$pkg_cv_GSTREAMER_CFLAGS + GSTREAMER_LIBS=$pkg_cv_GSTREAMER_LIBS +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + : + fi + +@@ -22452,14 +22759,14 @@ + + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for DBUS" >&5 +-echo $ECHO_N "checking for DBUS... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for DBUS" >&5 ++$as_echo_n "checking for DBUS... " >&6; } + + if test -n "$DBUS_CFLAGS"; then + pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + dbus-glib-1 >= \$DBUS_REQUIRED + dbus-1 >= \$DBUS_REQUIRED + gthread-2.0\"") >&5 +@@ -22468,7 +22775,7 @@ + dbus-1 >= $DBUS_REQUIRED + gthread-2.0") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags " + dbus-glib-1 >= $DBUS_REQUIRED +@@ -22484,7 +22791,7 @@ + pkg_cv_DBUS_LIBS="$DBUS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + dbus-glib-1 >= \$DBUS_REQUIRED + dbus-1 >= \$DBUS_REQUIRED + gthread-2.0\"") >&5 +@@ -22493,7 +22800,7 @@ + dbus-1 >= $DBUS_REQUIRED + gthread-2.0") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs " + dbus-glib-1 >= $DBUS_REQUIRED +@@ -22529,7 +22836,7 @@ + # Put the nasty error message in config.log where it belongs + echo "$DBUS_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements ( ++ { { $as_echo "$as_me:$LINENO: error: Package requirements ( + dbus-glib-1 >= $DBUS_REQUIRED + dbus-1 >= $DBUS_REQUIRED + gthread-2.0) were not met: +@@ -22543,7 +22850,7 @@ + and DBUS_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements ( ++$as_echo "$as_me: error: Package requirements ( + dbus-glib-1 >= $DBUS_REQUIRED + dbus-1 >= $DBUS_REQUIRED + gthread-2.0) were not met: +@@ -22559,7 +22866,9 @@ + " >&2;} + { (exit 1); exit 1; }; } + elif test $pkg_failed = untried; then +- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it ++ { { $as_echo "$as_me:$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. + +@@ -22569,7 +22878,7 @@ + + To get pkg-config, see . + See \`config.log' for more details." >&5 +-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++$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. + +@@ -22579,12 +22888,12 @@ + + To get pkg-config, see . + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { (exit 1); exit 1; }; }; } + else + DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS + DBUS_LIBS=$pkg_cv_DBUS_LIBS +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + : + fi + +@@ -22592,14 +22901,14 @@ + + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for GNOME" >&5 +-echo $ECHO_N "checking for GNOME... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for GNOME" >&5 ++$as_echo_n "checking for GNOME... " >&6; } + + if test -n "$GNOME_CFLAGS"; then + pkg_cv_GNOME_CFLAGS="$GNOME_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED + libglade-2.0 >= \$LIBGLADE_REQUIRED + libwnck-1.0 >= \$LIBWNCK_REQUIRED +@@ -22616,7 +22925,7 @@ + libpanelapplet-2.0 >= $LIBPANEL_REQUIRED + cairo >= $CAIRO_REQUIRED") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GNOME_CFLAGS=`$PKG_CONFIG --cflags " + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED +@@ -22636,7 +22945,7 @@ + pkg_cv_GNOME_LIBS="$GNOME_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED + libglade-2.0 >= \$LIBGLADE_REQUIRED + libwnck-1.0 >= \$LIBWNCK_REQUIRED +@@ -22653,7 +22962,7 @@ + libpanelapplet-2.0 >= $LIBPANEL_REQUIRED + cairo >= $CAIRO_REQUIRED") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GNOME_LIBS=`$PKG_CONFIG --libs " + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED +@@ -22701,7 +23010,7 @@ + # Put the nasty error message in config.log where it belongs + echo "$GNOME_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements ( ++ { { $as_echo "$as_me:$LINENO: error: Package requirements ( + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED + libglade-2.0 >= $LIBGLADE_REQUIRED + libwnck-1.0 >= $LIBWNCK_REQUIRED +@@ -22719,7 +23028,7 @@ + and GNOME_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements ( ++$as_echo "$as_me: error: Package requirements ( + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED + libglade-2.0 >= $LIBGLADE_REQUIRED + libwnck-1.0 >= $LIBWNCK_REQUIRED +@@ -22739,7 +23048,9 @@ + " >&2;} + { (exit 1); exit 1; }; } + elif test $pkg_failed = untried; then +- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it ++ { { $as_echo "$as_me:$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. + +@@ -22749,7 +23060,7 @@ + + To get pkg-config, see . + See \`config.log' for more details." >&5 +-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++$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. + +@@ -22759,12 +23070,12 @@ + + To get pkg-config, see . + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { (exit 1); exit 1; }; }; } + else + GNOME_CFLAGS=$pkg_cv_GNOME_CFLAGS + GNOME_LIBS=$pkg_cv_GNOME_LIBS +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + : + fi + +@@ -22772,21 +23083,21 @@ + + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for GDK" >&5 +-echo $ECHO_N "checking for GDK... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for GDK" >&5 ++$as_echo_n "checking for GDK... " >&6; } + + if test -n "$GDK_CFLAGS"; then + pkg_cv_GDK_CFLAGS="$GDK_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + gdk-2.0 >= \$GDK_REQUIRED + gdk-x11-2.0 >= \$GDK_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors " + gdk-2.0 >= $GDK_REQUIRED + gdk-x11-2.0 >= $GDK_REQUIRED") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GDK_CFLAGS=`$PKG_CONFIG --cflags " + gdk-2.0 >= $GDK_REQUIRED +@@ -22801,14 +23112,14 @@ + pkg_cv_GDK_LIBS="$GDK_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + gdk-2.0 >= \$GDK_REQUIRED + gdk-x11-2.0 >= \$GDK_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors " + gdk-2.0 >= $GDK_REQUIRED + gdk-x11-2.0 >= $GDK_REQUIRED") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GDK_LIBS=`$PKG_CONFIG --libs " + gdk-2.0 >= $GDK_REQUIRED +@@ -22841,7 +23152,7 @@ + # Put the nasty error message in config.log where it belongs + echo "$GDK_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements ( ++ { { $as_echo "$as_me:$LINENO: error: Package requirements ( + gdk-2.0 >= $GDK_REQUIRED + gdk-x11-2.0 >= $GDK_REQUIRED) were not met: + +@@ -22854,7 +23165,7 @@ + and GDK_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements ( ++$as_echo "$as_me: error: Package requirements ( + gdk-2.0 >= $GDK_REQUIRED + gdk-x11-2.0 >= $GDK_REQUIRED) were not met: + +@@ -22869,7 +23180,9 @@ + " >&2;} + { (exit 1); exit 1; }; } + elif test $pkg_failed = untried; then +- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it ++ { { $as_echo "$as_me:$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. + +@@ -22879,7 +23192,7 @@ + + To get pkg-config, see . + See \`config.log' for more details." >&5 +-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++$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. + +@@ -22889,12 +23202,12 @@ + + To get pkg-config, see . + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { (exit 1); exit 1; }; }; } + else + GDK_CFLAGS=$pkg_cv_GDK_CFLAGS + GDK_LIBS=$pkg_cv_GDK_LIBS +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + : + fi + +@@ -22902,21 +23215,21 @@ + + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for XRANDR" >&5 +-echo $ECHO_N "checking for XRANDR... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for XRANDR" >&5 ++$as_echo_n "checking for XRANDR... " >&6; } + + if test -n "$XRANDR_CFLAGS"; then + pkg_cv_XRANDR_CFLAGS="$XRANDR_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + xrandr >= \$XRANDR_REQUIRED + xrender x11\"") >&5 + ($PKG_CONFIG --exists --print-errors " + xrandr >= $XRANDR_REQUIRED + xrender x11") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_XRANDR_CFLAGS=`$PKG_CONFIG --cflags " + xrandr >= $XRANDR_REQUIRED +@@ -22931,14 +23244,14 @@ + pkg_cv_XRANDR_LIBS="$XRANDR_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + xrandr >= \$XRANDR_REQUIRED + xrender x11\"") >&5 + ($PKG_CONFIG --exists --print-errors " + xrandr >= $XRANDR_REQUIRED + xrender x11") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_XRANDR_LIBS=`$PKG_CONFIG --libs " + xrandr >= $XRANDR_REQUIRED +@@ -22971,7 +23284,7 @@ + # Put the nasty error message in config.log where it belongs + echo "$XRANDR_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements ( ++ { { $as_echo "$as_me:$LINENO: error: Package requirements ( + xrandr >= $XRANDR_REQUIRED + xrender x11) were not met: + +@@ -22984,7 +23297,7 @@ + and XRANDR_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements ( ++$as_echo "$as_me: error: Package requirements ( + xrandr >= $XRANDR_REQUIRED + xrender x11) were not met: + +@@ -22999,7 +23312,9 @@ + " >&2;} + { (exit 1); exit 1; }; } + elif test $pkg_failed = untried; then +- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it ++ { { $as_echo "$as_me:$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. + +@@ -23009,7 +23324,7 @@ + + To get pkg-config, see . + See \`config.log' for more details." >&5 +-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++$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. + +@@ -23019,12 +23334,12 @@ + + To get pkg-config, see . + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { (exit 1); exit 1; }; }; } + else + XRANDR_CFLAGS=$pkg_cv_XRANDR_CFLAGS + XRANDR_LIBS=$pkg_cv_XRANDR_LIBS +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + : + fi + +@@ -23032,10 +23347,10 @@ + + # Extract the first word of "gconftool-2", so it can be a program name with args. + set dummy gconftool-2; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_path_GCONFTOOL+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case $GCONFTOOL in + [\\/]* | ?:[\\/]*) +@@ -23050,7 +23365,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -23062,11 +23377,11 @@ + fi + GCONFTOOL=$ac_cv_path_GCONFTOOL + if test -n "$GCONFTOOL"; then +- { echo "$as_me:$LINENO: result: $GCONFTOOL" >&5 +-echo "${ECHO_T}$GCONFTOOL" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $GCONFTOOL" >&5 ++$as_echo "$GCONFTOOL" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -23085,8 +23400,8 @@ + + + +- { echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5 +-echo "${ECHO_T}Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; } ++ { $as_echo "$as_me:$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 + GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' +@@ -23100,15 +23415,15 @@ + + + +- { echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5 +-echo "${ECHO_T}Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; } ++ { $as_echo "$as_me:$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 + enableval=$enable_schemas_install; case ${enableval} in + yes|no) ;; +- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5 +-echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;} ++ *) { { $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; }; } ;; + esac + fi +@@ -23123,8 +23438,8 @@ + + + +-{ echo "$as_me:$LINENO: checking for X" >&5 +-echo $ECHO_N "checking for X... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for X" >&5 ++$as_echo_n "checking for X... " >&6; } + + + # Check whether --with-x was given. +@@ -23138,11 +23453,11 @@ + have_x=disabled + else + case $x_includes,$x_libraries in #( +- *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5 +-echo "$as_me: error: Cannot use X directory names containing '" >&2;} ++ *\'*) { { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + # One or both of the vars are not set, and there is no cached value. + ac_x_includes=no ac_x_libraries=no +@@ -23163,7 +23478,7 @@ + eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" + done + # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. +- for ac_extension in a so sl; do ++ for ac_extension in a so sl dylib la dll; do + if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && + test -f "$ac_im_libdir/libX11.$ac_extension"; then + ac_im_usrlibdir=$ac_im_libdir; break +@@ -23177,7 +23492,7 @@ + *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; + esac + case $ac_im_usrlibdir in +- /usr/lib | /lib) ;; ++ /usr/lib | /usr/lib64 | /lib | /lib64) ;; + *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; + esac + fi +@@ -23238,13 +23553,14 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 +@@ -23252,7 +23568,7 @@ + # We can compile using X headers with no special include directory. + ac_x_includes= + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + for ac_dir in $ac_x_header_dirs; do +@@ -23293,30 +23609,33 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + LIBS=$ac_save_LIBS + # We can link X programs with no special library path. + ac_x_libraries= + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + LIBS=$ac_save_LIBS +-for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` ++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! +- for ac_extension in a so sl; do ++ for ac_extension in a so sl dylib la dll; do + if test -r "$ac_dir/libX11.$ac_extension"; then + ac_x_libraries=$ac_dir + break 2 +@@ -23325,6 +23644,7 @@ + done + 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_x_libraries = no +@@ -23347,8 +23667,8 @@ + fi # $with_x != no + + if test "$have_x" != yes; then +- { echo "$as_me:$LINENO: result: $have_x" >&5 +-echo "${ECHO_T}$have_x" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $have_x" >&5 ++$as_echo "$have_x" >&6; } + no_x=yes + else + # If each of the values was on the command line, it overrides each guess. +@@ -23358,8 +23678,8 @@ + ac_cv_have_x="have_x=yes\ + ac_x_includes='$x_includes'\ + ac_x_libraries='$x_libraries'" +- { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 +-echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; } ++ { $as_echo "$as_me:$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 +@@ -23380,8 +23700,8 @@ + 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 . . . . +- { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 +-echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +@@ -23406,23 +23726,26 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + X_LIBS="$X_LIBS -R$x_libraries" + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + LIBS="$ac_xsave_LIBS -R $x_libraries" +@@ -23447,33 +23770,38 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + X_LIBS="$X_LIBS -R $x_libraries" + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- { echo "$as_me:$LINENO: result: neither works" >&5 +-echo "${ECHO_T}neither works" >&6; } ++ { $as_echo "$as_me:$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 + fi + ++rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + ac_c_werror_flag=$ac_xsave_c_werror_flag +@@ -23519,27 +23847,30 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + : + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 +-echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldnet $LIBS" +@@ -23571,41 +23902,45 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_dnet_dnet_ntoa=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +-echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; } +-if test $ac_cv_lib_dnet_dnet_ntoa = yes; then ++{ $as_echo "$as_me:$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 + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" + fi + + if test $ac_cv_lib_dnet_dnet_ntoa = no; then +- { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 +-echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldnet_stub $LIBS" +@@ -23637,39 +23972,44 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_dnet_stub_dnet_ntoa=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +-echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } +-if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then ++{ $as_echo "$as_me:$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 + 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 + LIBS="$ac_xsave_LIBS" +@@ -23682,10 +24022,10 @@ + # 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. +- { echo "$as_me:$LINENO: checking for gethostbyname" >&5 +-echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -23738,37 +24078,41 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_func_gethostbyname=yes + else +- echo "$as_me: failed program was:" >&5 ++ $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 +-{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 +-echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; } ++{ $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 +- { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 +-echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lnsl $LIBS" +@@ -23800,41 +24144,45 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_nsl_gethostbyname=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 +-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; } +-if test $ac_cv_lib_nsl_gethostbyname = yes; then ++{ $as_echo "$as_me:$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 + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" + fi + + if test $ac_cv_lib_nsl_gethostbyname = no; then +- { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 +-echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" +@@ -23866,33 +24214,37 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_bsd_gethostbyname=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 +-echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; } +-if test $ac_cv_lib_bsd_gethostbyname = yes; then ++{ $as_echo "$as_me:$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 + X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" + fi + +@@ -23906,10 +24258,10 @@ + # 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. +- { echo "$as_me:$LINENO: checking for connect" >&5 +-echo $ECHO_N "checking for connect... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -23962,37 +24314,41 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_func_connect=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_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 + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 +-echo "${ECHO_T}$ac_cv_func_connect" >&6; } ++{ $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 +- { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 +-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsocket $X_EXTRA_LIBS $LIBS" +@@ -24024,43 +24380,47 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_socket_connect=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 +-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; } +-if test $ac_cv_lib_socket_connect = yes; then ++{ $as_echo "$as_me:$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 + X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" + fi + + fi + + # Guillermo Gomez says -lposix is necessary on A/UX. +- { echo "$as_me:$LINENO: checking for remove" >&5 +-echo $ECHO_N "checking for remove... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -24113,37 +24473,41 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_func_remove=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_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 + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 +-echo "${ECHO_T}$ac_cv_func_remove" >&6; } ++{ $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 +- { echo "$as_me:$LINENO: checking for remove in -lposix" >&5 +-echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lposix $LIBS" +@@ -24175,43 +24539,47 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_posix_remove=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 +-echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; } +-if test $ac_cv_lib_posix_remove = yes; then ++{ $as_echo "$as_me:$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 + X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" + fi + + fi + + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. +- { echo "$as_me:$LINENO: checking for shmat" >&5 +-echo $ECHO_N "checking for shmat... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -24264,37 +24632,41 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_func_shmat=yes + else +- echo "$as_me: failed program was:" >&5 ++ $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 +-{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 +-echo "${ECHO_T}$ac_cv_func_shmat" >&6; } ++{ $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 +- { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 +-echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lipc $LIBS" +@@ -24326,33 +24698,37 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_ipc_shmat=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 +-echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; } +-if test $ac_cv_lib_ipc_shmat = yes; then ++{ $as_echo "$as_me:$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 + X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" + fi + +@@ -24368,10 +24744,10 @@ + # 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 +- { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 +-echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lICE $X_EXTRA_LIBS $LIBS" +@@ -24403,33 +24779,37 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_ICE_IceConnectionNumber=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +-echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; } +-if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then ++{ $as_echo "$as_me:$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 + X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" + fi + +@@ -24470,28 +24850,28 @@ + enable_policykit=no + fi + +- +-{ echo "$as_me:$LINENO: checking whether to support PolicyKit" >&5 +-echo $ECHO_N "checking whether to support PolicyKit... $ECHO_C" >&6; } ++enable_policykit=no ++{ $as_echo "$as_me:$LINENO: checking whether to support PolicyKit" >&5 ++$as_echo_n "checking whether to support PolicyKit... " >&6; } + have_polkit=no + if test x$enable_policykit = xyes ; then + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for POLKIT" >&5 +-echo $ECHO_N "checking for POLKIT... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for POLKIT" >&5 ++$as_echo_n "checking for POLKIT... " >&6; } + + if test -n "$POLKIT_CFLAGS"; then + pkg_cv_POLKIT_CFLAGS="$POLKIT_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\ + polkit-grant >= \$POLKIT_GNOME_REQUIRED\\ + polkit-dbus >= \$POLKIT_GNOME_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors "\ + polkit-grant >= $POLKIT_GNOME_REQUIRED\ + polkit-dbus >= $POLKIT_GNOME_REQUIRED") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_POLKIT_CFLAGS=`$PKG_CONFIG --cflags "\ + polkit-grant >= $POLKIT_GNOME_REQUIRED\ +@@ -24506,14 +24886,14 @@ + pkg_cv_POLKIT_LIBS="$POLKIT_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\ + polkit-grant >= \$POLKIT_GNOME_REQUIRED\\ + polkit-dbus >= \$POLKIT_GNOME_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors "\ + polkit-grant >= $POLKIT_GNOME_REQUIRED\ + polkit-dbus >= $POLKIT_GNOME_REQUIRED") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_POLKIT_LIBS=`$PKG_CONFIG --libs "\ + polkit-grant >= $POLKIT_GNOME_REQUIRED\ +@@ -24546,7 +24926,7 @@ + # Put the nasty error message in config.log where it belongs + echo "$POLKIT_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (\ ++ { { $as_echo "$as_me:$LINENO: error: Package requirements (\ + polkit-grant >= $POLKIT_GNOME_REQUIRED\ + polkit-dbus >= $POLKIT_GNOME_REQUIRED) were not met: + +@@ -24559,7 +24939,7 @@ + and POLKIT_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (\ ++$as_echo "$as_me: error: Package requirements (\ + polkit-grant >= $POLKIT_GNOME_REQUIRED\ + polkit-dbus >= $POLKIT_GNOME_REQUIRED) were not met: + +@@ -24574,7 +24954,9 @@ + " >&2;} + { (exit 1); exit 1; }; } + elif test $pkg_failed = untried; then +- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it ++ { { $as_echo "$as_me:$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. + +@@ -24584,7 +24966,7 @@ + + To get pkg-config, see . + See \`config.log' for more details." >&5 +-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++$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. + +@@ -24594,12 +24976,12 @@ + + To get pkg-config, see . + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { (exit 1); exit 1; }; }; } + else + POLKIT_CFLAGS=$pkg_cv_POLKIT_CFLAGS + POLKIT_LIBS=$pkg_cv_POLKIT_LIBS +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + : + fi + +@@ -24610,11 +24992,11 @@ + #define HAVE_POLKIT 1 + _ACEOF + +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + # Check whether --enable-checkfg was given. +@@ -24625,8 +25007,8 @@ + fi + + +-{ echo "$as_me:$LINENO: checking whether to use check-foreground-console" >&5 +-echo $ECHO_N "checking whether to use check-foreground-console... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking whether to use check-foreground-console" >&5 ++$as_echo_n "checking whether to use check-foreground-console... " >&6; } + have_checkfg=no + if test x$enable_checkfg = xyes ; then + have_checkfg=yes +@@ -24635,11 +25017,11 @@ + #define HAVE_CHECK_FG 1 + _ACEOF + +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + # Check whether --enable-xevents was given. +@@ -24650,8 +25032,8 @@ + fi + + +-{ echo "$as_me:$LINENO: checking whether to support xevents" >&5 +-echo $ECHO_N "checking whether to support xevents... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking whether to support xevents" >&5 ++$as_echo_n "checking whether to support xevents... " >&6; } + have_xevents=no + if test x$enable_xevents = xyes ; then + have_xevents=yes +@@ -24660,11 +25042,11 @@ + #define HAVE_XEVENTS 1 + _ACEOF + +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + # Check whether --enable-tests was given. +@@ -24675,8 +25057,8 @@ + fi + + +-{ echo "$as_me:$LINENO: checking whether to support tests" >&5 +-echo $ECHO_N "checking whether to support tests... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking whether to support tests" >&5 ++$as_echo_n "checking whether to support tests... " >&6; } + have_tests=no + if test x$enable_tests = xyes ; then + have_tests=yes +@@ -24685,11 +25067,11 @@ + #define HAVE_TESTS 1 + _ACEOF + +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + if test $have_tests = yes; then + HAVE_TESTS_TRUE= +@@ -24708,54 +25090,12 @@ + fi + + +-{ echo "$as_me:$LINENO: checking whether to support gconf defaults" >&5 +-echo $ECHO_N "checking whether to support gconf defaults... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking whether to support gconf defaults" >&5 ++$as_echo_n "checking whether to support gconf defaults... " >&6; } + have_gconfdefaults=no + if test x$enable_gconfdefaults = xyes ; then + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for POLKIT_GNOME" >&5 +-echo $ECHO_N "checking for POLKIT_GNOME... $ECHO_C" >&6; } +- +-if test -n "$POLKIT_GNOME_CFLAGS"; then +- pkg_cv_POLKIT_GNOME_CFLAGS="$POLKIT_GNOME_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" +- polkit-gnome >= \$POLKIT_GNOME_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors " +- polkit-gnome >= $POLKIT_GNOME_REQUIRED") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- pkg_cv_POLKIT_GNOME_CFLAGS=`$PKG_CONFIG --cflags " +- polkit-gnome >= $POLKIT_GNOME_REQUIRED" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +-if test -n "$POLKIT_GNOME_LIBS"; then +- pkg_cv_POLKIT_GNOME_LIBS="$POLKIT_GNOME_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" +- polkit-gnome >= \$POLKIT_GNOME_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors " +- polkit-gnome >= $POLKIT_GNOME_REQUIRED") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- pkg_cv_POLKIT_GNOME_LIBS=`$PKG_CONFIG --libs " +- polkit-gnome >= $POLKIT_GNOME_REQUIRED" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +- + + + if test $pkg_failed = yes; then +@@ -24775,7 +25115,7 @@ + # Put the nasty error message in config.log where it belongs + echo "$POLKIT_GNOME_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements ( ++ { { $as_echo "$as_me:$LINENO: error: Package requirements ( + polkit-gnome >= $POLKIT_GNOME_REQUIRED) were not met: + + $POLKIT_GNOME_PKG_ERRORS +@@ -24787,7 +25127,7 @@ + and POLKIT_GNOME_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements ( ++$as_echo "$as_me: error: Package requirements ( + polkit-gnome >= $POLKIT_GNOME_REQUIRED) were not met: + + $POLKIT_GNOME_PKG_ERRORS +@@ -24801,7 +25141,9 @@ + " >&2;} + { (exit 1); exit 1; }; } + elif test $pkg_failed = untried; then +- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it ++ { { $as_echo "$as_me:$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. + +@@ -24811,7 +25153,7 @@ + + To get pkg-config, see . + See \`config.log' for more details." >&5 +-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++$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. + +@@ -24821,12 +25163,12 @@ + + To get pkg-config, see . + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { (exit 1); exit 1; }; }; } + else + POLKIT_GNOME_CFLAGS=$pkg_cv_POLKIT_GNOME_CFLAGS + POLKIT_GNOME_LIBS=$pkg_cv_POLKIT_GNOME_LIBS +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + : + fi + +@@ -24837,11 +25179,11 @@ + #define HAVE_GCONF_DEFAULTS 1 + _ACEOF + +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + if test $have_gconfdefaults = yes; then + HAVE_GCONF_DEFAULTS_TRUE= +@@ -24860,8 +25202,8 @@ + fi + + +-{ echo "$as_me:$LINENO: checking whether to build applet support" >&5 +-echo $ECHO_N "checking whether to build applet support... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking whether to build applet support" >&5 ++$as_echo_n "checking whether to build applet support... " >&6; } + have_applets=no + if test x$enable_applets = xyes ; then + have_applets=yes +@@ -24870,11 +25212,11 @@ + #define HAVE_APPLETS 1 + _ACEOF + +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + if test $have_applets = yes; then + HAVE_APPLETS_TRUE= +@@ -24895,10 +25237,10 @@ + + # Extract the first word of "xmlto", so it can be a program name with args. + set dummy xmlto; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_path_XMLTO+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case $XMLTO in + [\\/]* | ?:[\\/]*) +@@ -24913,7 +25255,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -24926,16 +25268,16 @@ + fi + XMLTO=$ac_cv_path_XMLTO + if test -n "$XMLTO"; then +- { echo "$as_me:$LINENO: result: $XMLTO" >&5 +-echo "${ECHO_T}$XMLTO" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $XMLTO" >&5 ++$as_echo "$XMLTO" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +-{ echo "$as_me:$LINENO: checking whether to build DocBook documentation" >&5 +-echo $ECHO_N "checking whether to build DocBook documentation... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 + else +@@ -24950,8 +25292,8 @@ + fi + if test x$enable_docbook_docs = xyes; then + if test x$have_docbook = xno; then +- { { echo "$as_me:$LINENO: error: Building DocBook docs explicitly required, but DocBook not found" >&5 +-echo "$as_me: error: Building DocBook docs explicitly required, but DocBook not found" >&2;} ++ { { $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; }; } + fi + fi +@@ -24963,8 +25305,8 @@ + DOCBOOK_DOCS_ENABLED_FALSE= + fi + +-{ echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++{ $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + + + # Check whether --with-dbus-services was given. +@@ -24985,17 +25327,17 @@ + have_libnotify=yes + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for LIBNOTIFY" >&5 +-echo $ECHO_N "checking for LIBNOTIFY... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for LIBNOTIFY" >&5 ++$as_echo_n "checking for LIBNOTIFY... " >&6; } + + if test -n "$LIBNOTIFY_CFLAGS"; then + pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= $LIBNOTIFY_REQUIRED" 2>/dev/null` + else +@@ -25008,10 +25350,10 @@ + pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= $LIBNOTIFY_REQUIRED" 2>/dev/null` + else +@@ -25038,7 +25380,7 @@ + # Put the nasty error message in config.log where it belongs + echo "$LIBNOTIFY_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (libnotify >= $LIBNOTIFY_REQUIRED) were not met: ++ { { $as_echo "$as_me:$LINENO: error: Package requirements (libnotify >= $LIBNOTIFY_REQUIRED) were not met: + + $LIBNOTIFY_PKG_ERRORS + +@@ -25049,7 +25391,7 @@ + and LIBNOTIFY_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (libnotify >= $LIBNOTIFY_REQUIRED) were not met: ++$as_echo "$as_me: error: Package requirements (libnotify >= $LIBNOTIFY_REQUIRED) were not met: + + $LIBNOTIFY_PKG_ERRORS + +@@ -25062,7 +25404,9 @@ + " >&2;} + { (exit 1); exit 1; }; } + elif test $pkg_failed = untried; then +- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it ++ { { $as_echo "$as_me:$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. + +@@ -25072,7 +25416,7 @@ + + To get pkg-config, see . + See \`config.log' for more details." >&5 +-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++$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. + +@@ -25082,12 +25426,12 @@ + + To get pkg-config, see . + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { (exit 1); exit 1; }; }; } + else + LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS + LIBNOTIFY_LIBS=$pkg_cv_LIBNOTIFY_LIBS +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + : + fi + +@@ -25113,17 +25457,17 @@ + have_unique=yes + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for UNIQUE" >&5 +-echo $ECHO_N "checking for UNIQUE... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for UNIQUE" >&5 ++$as_echo_n "checking for UNIQUE... " >&6; } + + if test -n "$UNIQUE_CFLAGS"; then + pkg_cv_UNIQUE_CFLAGS="$UNIQUE_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"unique-1.0 >= \$UNIQUE_REQUIRED\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"unique-1.0 >= \$UNIQUE_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors "unique-1.0 >= $UNIQUE_REQUIRED") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_UNIQUE_CFLAGS=`$PKG_CONFIG --cflags "unique-1.0 >= $UNIQUE_REQUIRED" 2>/dev/null` + else +@@ -25136,10 +25480,10 @@ + pkg_cv_UNIQUE_LIBS="$UNIQUE_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"unique-1.0 >= \$UNIQUE_REQUIRED\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"unique-1.0 >= \$UNIQUE_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors "unique-1.0 >= $UNIQUE_REQUIRED") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_UNIQUE_LIBS=`$PKG_CONFIG --libs "unique-1.0 >= $UNIQUE_REQUIRED" 2>/dev/null` + else +@@ -25166,7 +25510,7 @@ + # Put the nasty error message in config.log where it belongs + echo "$UNIQUE_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (unique-1.0 >= $UNIQUE_REQUIRED) were not met: ++ { { $as_echo "$as_me:$LINENO: error: Package requirements (unique-1.0 >= $UNIQUE_REQUIRED) were not met: + + $UNIQUE_PKG_ERRORS + +@@ -25177,7 +25521,7 @@ + and UNIQUE_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (unique-1.0 >= $UNIQUE_REQUIRED) were not met: ++$as_echo "$as_me: error: Package requirements (unique-1.0 >= $UNIQUE_REQUIRED) were not met: + + $UNIQUE_PKG_ERRORS + +@@ -25190,7 +25534,9 @@ + " >&2;} + { (exit 1); exit 1; }; } + elif test $pkg_failed = untried; then +- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it ++ { { $as_echo "$as_me:$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. + +@@ -25200,7 +25546,7 @@ + + To get pkg-config, see . + See \`config.log' for more details." >&5 +-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++$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. + +@@ -25210,12 +25556,12 @@ + + To get pkg-config, see . + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { (exit 1); exit 1; }; }; } + else + UNIQUE_CFLAGS=$pkg_cv_UNIQUE_CFLAGS + UNIQUE_LIBS=$pkg_cv_UNIQUE_LIBS +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + : + fi + +@@ -25296,28 +25642,28 @@ + no) ;; + + /*) +- { echo "$as_me:$LINENO: checking for DPMS headers" >&5 +-echo $ECHO_N "checking for DPMS headers... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for DPMS headers" >&5 ++$as_echo_n "checking for DPMS headers... " >&6; } + d=$with_dpms/include + if test -d $d; then + X_CFLAGS="-I$d $X_CFLAGS" +- { echo "$as_me:$LINENO: result: $d" >&5 +-echo "${ECHO_T}$d" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $d" >&5 ++$as_echo "$d" >&6; } + else +- { echo "$as_me:$LINENO: result: not found ($d: no such directory)" >&5 +-echo "${ECHO_T}not found ($d: no such directory)" >&6; } ++ { $as_echo "$as_me:$LINENO: result: not found ($d: no such directory)" >&5 ++$as_echo "not found ($d: no such directory)" >&6; } + fi + +- { echo "$as_me:$LINENO: checking for DPMS libs" >&5 +-echo $ECHO_N "checking for DPMS libs... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for DPMS libs" >&5 ++$as_echo_n "checking for DPMS libs... " >&6; } + d=$with_dpms/lib + if test -d $d; then + X_LIBS="-L$d $X_LIBS" +- { echo "$as_me:$LINENO: result: $d" >&5 +-echo "${ECHO_T}$d" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $d" >&5 ++$as_echo "$d" >&6; } + else +- { echo "$as_me:$LINENO: result: not found ($d: no such directory)" >&5 +-echo "${ECHO_T}not found ($d: no such directory)" >&6; } ++ { $as_echo "$as_me:$LINENO: result: not found ($d: no such directory)" >&5 ++$as_echo "not found ($d: no such directory)" >&6; } + fi + + # replace the directory string with "yes". +@@ -25344,10 +25690,10 @@ + CPPFLAGS="$CPPFLAGS -I$includedir" + fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS" +- { echo "$as_me:$LINENO: checking for X11/extensions/dpms.h" >&5 +-echo $ECHO_N "checking for X11/extensions/dpms.h... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for X11/extensions/dpms.h" >&5 ++$as_echo_n "checking for X11/extensions/dpms.h... " >&6; } + if test "${ac_cv_header_X11_extensions_dpms_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -25366,20 +25712,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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_dpms_h=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_X11_extensions_dpms_h=no +@@ -25387,9 +25734,9 @@ + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_dpms_h" >&5 +-echo "${ECHO_T}$ac_cv_header_X11_extensions_dpms_h" >&6; } +-if test $ac_cv_header_X11_extensions_dpms_h = yes; then ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_dpms_h" >&5 ++$as_echo "$ac_cv_header_X11_extensions_dpms_h" >&6; } ++if test "x$ac_cv_header_X11_extensions_dpms_h" = x""yes; then + have_dpms=yes + fi + +@@ -25418,10 +25765,10 @@ + # note: $X_LIBS includes $x_libraries + LDFLAGS="$LDFLAGS $ALL_X_LIBS" + +- { echo "$as_me:$LINENO: checking for DPMSInfo in -lXext" >&5 +-echo $ECHO_N "checking for DPMSInfo in -lXext... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for DPMSInfo in -lXext" >&5 ++$as_echo_n "checking for DPMSInfo in -lXext... " >&6; } + if test "${ac_cv_lib_Xext_DPMSInfo+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lXext -lXext -lX11 $LIBS" +@@ -25453,33 +25800,37 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_Xext_DPMSInfo=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_Xext_DPMSInfo=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 +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_DPMSInfo" >&5 +-echo "${ECHO_T}$ac_cv_lib_Xext_DPMSInfo" >&6; } +-if test $ac_cv_lib_Xext_DPMSInfo = yes; then ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_DPMSInfo" >&5 ++$as_echo "$ac_cv_lib_Xext_DPMSInfo" >&6; } ++if test "x$ac_cv_lib_Xext_DPMSInfo" = x""yes; then + have_dpms=yes + else + true +@@ -25509,10 +25860,10 @@ + # note: $X_LIBS includes $x_libraries + LDFLAGS="$LDFLAGS $ALL_X_LIBS" + +- { echo "$as_me:$LINENO: checking for DPMSInfo in -lXdpms" >&5 +-echo $ECHO_N "checking for DPMSInfo in -lXdpms... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for DPMSInfo in -lXdpms" >&5 ++$as_echo_n "checking for DPMSInfo in -lXdpms... " >&6; } + if test "${ac_cv_lib_Xdpms_DPMSInfo+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lXdpms -lXext -lX11 $LIBS" +@@ -25544,33 +25895,37 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_Xdpms_DPMSInfo=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_Xdpms_DPMSInfo=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 +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xdpms_DPMSInfo" >&5 +-echo "${ECHO_T}$ac_cv_lib_Xdpms_DPMSInfo" >&6; } +-if test $ac_cv_lib_Xdpms_DPMSInfo = yes; then ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xdpms_DPMSInfo" >&5 ++$as_echo "$ac_cv_lib_Xdpms_DPMSInfo" >&6; } ++if test "x$ac_cv_lib_Xdpms_DPMSInfo" = x""yes; then + have_dpms=yes; XDPMS_LIBS="-lXdpms" + else + true +@@ -25599,12 +25954,12 @@ + exit 1 + fi + +-{ echo "$as_me:$LINENO: checking for Solaris kstat" >&5 +-echo $ECHO_N "checking for Solaris kstat... $ECHO_C" >&6; } +-{ echo "$as_me:$LINENO: checking for kstat_open in -lkstat" >&5 +-echo $ECHO_N "checking for kstat_open in -lkstat... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for Solaris kstat" >&5 ++$as_echo_n "checking for Solaris kstat... " >&6; } ++{ $as_echo "$as_me:$LINENO: checking for kstat_open in -lkstat" >&5 ++$as_echo_n "checking for kstat_open in -lkstat... " >&6; } + if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lkstat $LIBS" +@@ -25636,33 +25991,37 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_kstat_kstat_open=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_kstat_kstat_open=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 +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_kstat_kstat_open" >&5 +-echo "${ECHO_T}$ac_cv_lib_kstat_kstat_open" >&6; } +-if test $ac_cv_lib_kstat_kstat_open = yes; then ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kstat_kstat_open" >&5 ++$as_echo "$ac_cv_lib_kstat_kstat_open" >&6; } ++if test "x$ac_cv_lib_kstat_kstat_open" = x""yes; then + + + cat >>confdefs.h <<\_ACEOF +@@ -25677,10 +26036,10 @@ + + # Extract the first word of "docbook2man", so it can be a program name with args. + set dummy docbook2man; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_path_DOCBOOK2MAN+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case $DOCBOOK2MAN in + [\\/]* | ?:[\\/]*) +@@ -25695,7 +26054,7 @@ + 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_DOCBOOK2MAN="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -25708,17 +26067,17 @@ + fi + DOCBOOK2MAN=$ac_cv_path_DOCBOOK2MAN + if test -n "$DOCBOOK2MAN"; then +- { echo "$as_me:$LINENO: result: $DOCBOOK2MAN" >&5 +-echo "${ECHO_T}$DOCBOOK2MAN" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $DOCBOOK2MAN" >&5 ++$as_echo "$DOCBOOK2MAN" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + + if test "$DOCBOOK2MAN" = "no" ; then +- { echo "$as_me:$LINENO: WARNING: docbook2man not found, will not be able to build man documentation" >&5 +-echo "$as_me: WARNING: docbook2man not found, will not be able to build man documentation" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: docbook2man not found, will not be able to build man documentation" >&5 ++$as_echo "$as_me: WARNING: docbook2man not found, will not be able to build man documentation" >&2;} + fi + if test "$DOCBOOK2MAN" != "no"; then + HAVE_DOCBOOK2MAN_TRUE= +@@ -25744,11 +26103,11 @@ + + fi + +-{ echo "$as_me:$LINENO: checking for more warnings" >&5 +-echo $ECHO_N "checking for more warnings... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for more warnings" >&5 ++$as_echo_n "checking for more warnings... " >&6; } + if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + CFLAGS="\ + -Wall \ + -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \ +@@ -25759,8 +26118,8 @@ + for option in -Wno-strict-aliasing -Wno-sign-compare; do + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $option" +- { echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 +-echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 ++$as_echo_n "checking whether gcc understands $option... " >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -25782,20 +26141,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 + has_option=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + has_option=no +@@ -25805,15 +26165,15 @@ + if test $has_option = no; then + CFLAGS="$SAVE_CFLAGS" + fi +- { echo "$as_me:$LINENO: result: $has_option" >&5 +-echo "${ECHO_T}$has_option" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $has_option" >&5 ++$as_echo "$has_option" >&6; } + unset has_option + unset SAVE_CFLAGS + done + unset option + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + ac_config_files="$ac_config_files Makefile src/Makefile src/dbus/Makefile applets/Makefile applets/brightness/Makefile applets/inhibit/Makefile libhal-glib/Makefile libdbus-glib/Makefile libidletime/Makefile libunique/Makefile docs/Makefile man/Makefile help/Makefile po/Makefile.in tools/Makefile test/Makefile data/Makefile data/gnome-power-manager.desktop.in data/gnome-power-preferences.desktop.in data/gnome-power-statistics.desktop.in data/sounds/Makefile data/icons/Makefile data/icons/16x16/Makefile data/icons/16x16/actions/Makefile data/icons/16x16/apps/Makefile data/icons/16x16/status/Makefile data/icons/22x22/Makefile data/icons/22x22/actions/Makefile data/icons/22x22/apps/Makefile data/icons/22x22/status/Makefile data/icons/24x24/Makefile data/icons/24x24/actions/Makefile data/icons/24x24/apps/Makefile data/icons/24x24/status/Makefile data/icons/48x48/Makefile data/icons/48x48/actions/Makefile data/icons/48x48/apps/Makefile data/icons/48x48/status/Makefile data/icons/scalable/Makefile data/icons/scalable/actions/Makefile data/icons/scalable/apps/Makefile data/icons/scalable/status/Makefile" +@@ -25846,11 +26206,12 @@ + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( +- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; ++ *_cv_*) { $as_echo "$as_me:$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 ;; + esac ;; + esac +@@ -25883,12 +26244,12 @@ + if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + test "x$cache_file" != "x/dev/null" && +- { echo "$as_me:$LINENO: updating cache $cache_file" >&5 +-echo "$as_me: updating cache $cache_file" >&6;} ++ { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 +-echo "$as_me: not updating unwritable cache $cache_file" >&6;} ++ { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -25904,7 +26265,7 @@ + for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' +- ac_i=`echo "$ac_i" | sed "$ac_script"` ++ 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" +@@ -25916,23 +26277,23 @@ + + + if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"AMDEP\" was never defined. ++$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. ++$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; }; } + fi + if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. ++$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi +@@ -25941,82 +26302,83 @@ + + + if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"ENABLE_SK\" was never defined. ++$as_echo "$as_me: error: conditional \"ENABLE_SK\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. ++$as_echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. ++$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; }; } + fi + if test -z "${HAVE_TESTS_TRUE}" && test -z "${HAVE_TESTS_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"HAVE_TESTS\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_TESTS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"HAVE_TESTS\" was never defined. ++$as_echo "$as_me: error: conditional \"HAVE_TESTS\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_GCONF_DEFAULTS_TRUE}" && test -z "${HAVE_GCONF_DEFAULTS_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"HAVE_GCONF_DEFAULTS\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GCONF_DEFAULTS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"HAVE_GCONF_DEFAULTS\" was never defined. ++$as_echo "$as_me: error: conditional \"HAVE_GCONF_DEFAULTS\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_APPLETS_TRUE}" && test -z "${HAVE_APPLETS_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"HAVE_APPLETS\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_APPLETS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"HAVE_APPLETS\" was never defined. ++$as_echo "$as_me: error: conditional \"HAVE_APPLETS\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${DOCBOOK_DOCS_ENABLED_TRUE}" && test -z "${DOCBOOK_DOCS_ENABLED_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"DOCBOOK_DOCS_ENABLED\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"DOCBOOK_DOCS_ENABLED\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"DOCBOOK_DOCS_ENABLED\" was never defined. ++$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; }; } + fi + if test -z "${HAVE_LIBNOTIFY_TRUE}" && test -z "${HAVE_LIBNOTIFY_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"HAVE_LIBNOTIFY\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_LIBNOTIFY\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"HAVE_LIBNOTIFY\" was never defined. ++$as_echo "$as_me: error: conditional \"HAVE_LIBNOTIFY\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_UNIQUE_TRUE}" && test -z "${HAVE_UNIQUE_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"HAVE_UNIQUE\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_UNIQUE\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"HAVE_UNIQUE\" was never defined. ++$as_echo "$as_me: error: conditional \"HAVE_UNIQUE\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_DOCBOOK2MAN_TRUE}" && test -z "${HAVE_DOCBOOK2MAN_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"HAVE_DOCBOOK2MAN\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_DOCBOOK2MAN\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"HAVE_DOCBOOK2MAN\" was never defined. ++$as_echo "$as_me: error: conditional \"HAVE_DOCBOOK2MAN\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + + : ${CONFIG_STATUS=./config.status} ++ac_write_fail=0 + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +-echo "$as_me: creating $CONFIG_STATUS" >&6;} +-cat >$CONFIG_STATUS <<_ACEOF ++{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 ++$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} ++cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + #! $SHELL + # Generated by $as_me. + # Run this file to recreate the current configuration. +@@ -26029,7 +26391,7 @@ + SHELL=\${CONFIG_SHELL-$SHELL} + _ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + ## --------------------- ## + ## M4sh Initialization. ## + ## --------------------- ## +@@ -26039,7 +26401,7 @@ + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # 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 +@@ -26061,17 +26423,45 @@ + as_cr_digits='0123456789' + as_cr_alnum=$as_cr_Letters$as_cr_digits + +-# The user is always right. +-if test "${PATH_SEPARATOR+set}" != set; then +- echo "#! /bin/sh" >conf$$.sh +- echo "exit 0" >>conf$$.sh +- chmod +x conf$$.sh +- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then +- PATH_SEPARATOR=';' ++as_nl=' ++' ++export as_nl ++# Printing a long string crashes Solaris 7 /usr/bin/printf. ++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 ++ as_echo='printf %s\n' ++ as_echo_n='printf %s' ++else ++ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then ++ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' ++ as_echo_n='/usr/ucb/echo -n' + else +- PATH_SEPARATOR=: ++ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' ++ as_echo_n_body='eval ++ arg=$1; ++ case $arg in ++ *"$as_nl"*) ++ expr "X$arg" : "X\\(.*\\)$as_nl"; ++ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; ++ esac; ++ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" ++ ' ++ export as_echo_n_body ++ as_echo_n='sh -c $as_echo_n_body as_echo' + fi +- rm -f conf$$.sh ++ export as_echo_body ++ as_echo='sh -c $as_echo_body as_echo' ++fi ++ ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ PATH_SEPARATOR=: ++ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { ++ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || ++ PATH_SEPARATOR=';' ++ } + fi + + # Support unset when possible. +@@ -26087,8 +26477,6 @@ + # there to prevent editors from complaining about space-tab. + # (If _AS_PATH_WALK were called with IFS unset, it would disable word + # splitting by setting IFS to empty value.) +-as_nl=' +-' + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +@@ -26111,7 +26499,7 @@ + as_myself=$0 + fi + if test ! -f "$as_myself"; then +- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } + fi + +@@ -26124,17 +26512,10 @@ + PS4='+ ' + + # NLS nuisances. +-for as_var in \ +- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ +- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ +- LC_TELEPHONE LC_TIME +-do +- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then +- eval $as_var=C; export $as_var +- else +- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +- fi +-done ++LC_ALL=C ++export LC_ALL ++LANGUAGE=C ++export LANGUAGE + + # Required to use basename. + if expr a : '\(a\)' >/dev/null 2>&1 && +@@ -26156,7 +26537,7 @@ + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +-echo X/"$0" | ++$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q +@@ -26207,7 +26588,7 @@ + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || +- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 ++ { $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 +@@ -26235,7 +26616,6 @@ + *) + ECHO_N='-n';; + esac +- + if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +@@ -26248,19 +26628,22 @@ + rm -f conf$$.dir/conf$$.file + else + rm -f conf$$.dir +- mkdir conf$$.dir ++ mkdir conf$$.dir 2>/dev/null + fi +-echo >conf$$.file +-if ln -s conf$$.file conf$$ 2>/dev/null; then +- as_ln_s='ln -s' +- # ... but there are two gotchas: +- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. +- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -p'. +- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || ++if (echo >conf$$.file) 2>/dev/null; then ++ if ln -s conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s='ln -s' ++ # ... but there are two gotchas: ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. ++ # In both cases, we have to default to `cp -p'. ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || ++ as_ln_s='cp -p' ++ elif ln conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s=ln ++ else + as_ln_s='cp -p' +-elif ln conf$$.file conf$$ 2>/dev/null; then +- as_ln_s=ln ++ fi + else + as_ln_s='cp -p' + fi +@@ -26285,10 +26668,10 @@ + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then +- test -d "$1/."; ++ test -d "$1/."; + else + case $1 in +- -*)set "./$1";; ++ -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi +@@ -26311,7 +26694,7 @@ + # values after options handling. + ac_log=" + This file was extended by gnome-power-manager $as_me 2.24.0, which was +-generated by GNU Autoconf 2.61. Invocation command line was ++generated by GNU Autoconf 2.63. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -26324,7 +26707,16 @@ + + _ACEOF + +-cat >>$CONFIG_STATUS <<_ACEOF ++case $ac_config_files in *" ++"*) set x $ac_config_files; shift; ac_config_files=$*;; ++esac ++ ++case $ac_config_headers in *" ++"*) set x $ac_config_headers; shift; ac_config_headers=$*;; ++esac ++ ++ ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + # Files that config.status was made for. + config_files="$ac_config_files" + config_headers="$ac_config_headers" +@@ -26332,22 +26724,23 @@ + + _ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + ac_cs_usage="\ + \`$as_me' instantiates files from templates according to the + current configuration. + +-Usage: $0 [OPTIONS] [FILE]... ++Usage: $0 [OPTION]... [FILE]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit +- -q, --quiet do not print progress messages ++ -q, --quiet, --silent ++ do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions +- --file=FILE[:TEMPLATE] +- instantiate the configuration file FILE +- --header=FILE[:TEMPLATE] +- instantiate the configuration header FILE ++ --file=FILE[:TEMPLATE] ++ instantiate the configuration file FILE ++ --header=FILE[:TEMPLATE] ++ instantiate the configuration header FILE + + Configuration files: + $config_files +@@ -26361,13 +26754,13 @@ + Report bugs to ." + + _ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_version="\\ + gnome-power-manager config.status 2.24.0 +-configured by $0, generated by GNU Autoconf 2.61, +- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" ++configured by $0, generated by GNU Autoconf 2.63, ++ with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" + +-Copyright (C) 2006 Free Software Foundation, Inc. ++Copyright (C) 2008 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." + +@@ -26375,11 +26768,12 @@ + srcdir='$srcdir' + INSTALL='$INSTALL' + MKDIR_P='$MKDIR_P' ++AWK='$AWK' ++test -n "\$AWK" || AWK=awk + _ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF +-# If no file are specified by the user, then we need to provide default +-# value. By we need to know if files were specified by the user. ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++# The default lists apply if the user does not specify any file. + ac_need_defaults=: + while test $# != 0 + do +@@ -26401,30 +26795,36 @@ + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) +- echo "$ac_cs_version"; exit ;; ++ $as_echo "$ac_cs_version"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift +- CONFIG_FILES="$CONFIG_FILES $ac_optarg" ++ case $ac_optarg in ++ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ esac ++ CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + $ac_shift +- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ++ case $ac_optarg in ++ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ esac ++ CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header +- { echo "$as_me: error: ambiguous option: $1 ++ { $as_echo "$as_me: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; };; + --help | --hel | -h ) +- echo "$ac_cs_usage"; exit ;; ++ $as_echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. +- -*) { echo "$as_me: error: unrecognized option: $1 ++ -*) { $as_echo "$as_me: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } ;; + +@@ -26443,27 +26843,29 @@ + fi + + _ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + if \$ac_cs_recheck; then +- echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 +- CONFIG_SHELL=$SHELL ++ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion ++ shift ++ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 ++ CONFIG_SHELL='$SHELL' + export CONFIG_SHELL +- exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion ++ exec "\$@" + fi + + _ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + exec 5>>config.log + { + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX + ## Running $as_me. ## + _ASBOX +- echo "$ac_log" ++ $as_echo "$ac_log" + } >&5 + + _ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + # + # INIT-COMMANDS + # +@@ -26475,7 +26877,7 @@ + + _ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + + # Handling of arguments. + for ac_config_target in $ac_config_targets +@@ -26529,8 +26931,8 @@ + "data/icons/scalable/status/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/scalable/status/Makefile" ;; + "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; + +- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +-echo "$as_me: error: invalid argument: $ac_config_target" >&2;} ++ *) { { $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; }; };; + esac + done +@@ -26571,375 +26973,144 @@ + (umask 077 && mkdir "$tmp") + } || + { +- echo "$me: cannot create a temporary directory in ." >&2 ++ $as_echo "$as_me: cannot create a temporary directory in ." >&2 + { (exit 1); exit 1; } + } + +-# +-# Set up the sed scripts for CONFIG_FILES section. +-# +- +-# No need to generate the scripts if there are no CONFIG_FILES. +-# This happens for instance when ./config.status config.h ++# Set up the scripts for CONFIG_FILES section. ++# No need to generate them if there are no CONFIG_FILES. ++# This happens for instance with `./config.status config.h'. + if test -n "$CONFIG_FILES"; then + +-_ACEOF +- +- +- +-ac_delim='%!_!# ' +-for ac_last_try in false false false false false :; do +- cat >conf$$subs.sed <<_ACEOF +-SHELL!$SHELL$ac_delim +-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim +-PACKAGE_NAME!$PACKAGE_NAME$ac_delim +-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim +-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim +-PACKAGE_STRING!$PACKAGE_STRING$ac_delim +-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim +-exec_prefix!$exec_prefix$ac_delim +-prefix!$prefix$ac_delim +-program_transform_name!$program_transform_name$ac_delim +-bindir!$bindir$ac_delim +-sbindir!$sbindir$ac_delim +-libexecdir!$libexecdir$ac_delim +-datarootdir!$datarootdir$ac_delim +-datadir!$datadir$ac_delim +-sysconfdir!$sysconfdir$ac_delim +-sharedstatedir!$sharedstatedir$ac_delim +-localstatedir!$localstatedir$ac_delim +-includedir!$includedir$ac_delim +-oldincludedir!$oldincludedir$ac_delim +-docdir!$docdir$ac_delim +-infodir!$infodir$ac_delim +-htmldir!$htmldir$ac_delim +-dvidir!$dvidir$ac_delim +-pdfdir!$pdfdir$ac_delim +-psdir!$psdir$ac_delim +-libdir!$libdir$ac_delim +-localedir!$localedir$ac_delim +-mandir!$mandir$ac_delim +-DEFS!$DEFS$ac_delim +-ECHO_C!$ECHO_C$ac_delim +-ECHO_N!$ECHO_N$ac_delim +-ECHO_T!$ECHO_T$ac_delim +-LIBS!$LIBS$ac_delim +-build_alias!$build_alias$ac_delim +-host_alias!$host_alias$ac_delim +-target_alias!$target_alias$ac_delim +-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim +-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim +-INSTALL_DATA!$INSTALL_DATA$ac_delim +-am__isrc!$am__isrc$ac_delim +-CYGPATH_W!$CYGPATH_W$ac_delim +-PACKAGE!$PACKAGE$ac_delim +-VERSION!$VERSION$ac_delim +-ACLOCAL!$ACLOCAL$ac_delim +-AUTOCONF!$AUTOCONF$ac_delim +-AUTOMAKE!$AUTOMAKE$ac_delim +-AUTOHEADER!$AUTOHEADER$ac_delim +-MAKEINFO!$MAKEINFO$ac_delim +-install_sh!$install_sh$ac_delim +-STRIP!$STRIP$ac_delim +-INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim +-mkdir_p!$mkdir_p$ac_delim +-AWK!$AWK$ac_delim +-SET_MAKE!$SET_MAKE$ac_delim +-am__leading_dot!$am__leading_dot$ac_delim +-AMTAR!$AMTAR$ac_delim +-am__tar!$am__tar$ac_delim +-am__untar!$am__untar$ac_delim +-CC!$CC$ac_delim +-CFLAGS!$CFLAGS$ac_delim +-LDFLAGS!$LDFLAGS$ac_delim +-CPPFLAGS!$CPPFLAGS$ac_delim +-ac_ct_CC!$ac_ct_CC$ac_delim +-EXEEXT!$EXEEXT$ac_delim +-OBJEXT!$OBJEXT$ac_delim +-DEPDIR!$DEPDIR$ac_delim +-am__include!$am__include$ac_delim +-am__quote!$am__quote$ac_delim +-AMDEP_TRUE!$AMDEP_TRUE$ac_delim +-AMDEP_FALSE!$AMDEP_FALSE$ac_delim +-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim +-CCDEPMODE!$CCDEPMODE$ac_delim +-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim +-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim +-build!$build$ac_delim +-build_cpu!$build_cpu$ac_delim +-build_vendor!$build_vendor$ac_delim +-build_os!$build_os$ac_delim +-host!$host$ac_delim +-host_cpu!$host_cpu$ac_delim +-host_vendor!$host_vendor$ac_delim +-host_os!$host_os$ac_delim +-SED!$SED$ac_delim +-GREP!$GREP$ac_delim +-EGREP!$EGREP$ac_delim +-LN_S!$LN_S$ac_delim +-ECHO!$ECHO$ac_delim +-AR!$AR$ac_delim +-RANLIB!$RANLIB$ac_delim +-CPP!$CPP$ac_delim +-CXX!$CXX$ac_delim +-CXXFLAGS!$CXXFLAGS$ac_delim +-ac_ct_CXX!$ac_ct_CXX$ac_delim +-CXXDEPMODE!$CXXDEPMODE$ac_delim +-am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim +-am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim +-_ACEOF +- +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +- break +- elif $ac_last_try; then +- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } +- else +- ac_delim="$ac_delim!$ac_delim _$ac_delim!! " +- fi +-done + +-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +-if test -n "$ac_eof"; then +- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` +- ac_eof=`expr $ac_eof + 1` ++ac_cr=' ' ++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' ++else ++ ac_cs_awk_cr=$ac_cr + fi + +-cat >>$CONFIG_STATUS <<_ACEOF +-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof +-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +-_ACEOF +-sed ' +-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +-s/^/s,@/; s/!/@,|#_!!_#|/ +-:n +-t n +-s/'"$ac_delim"'$/,g/; t +-s/$/\\/; p +-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +-' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +-CEOF$ac_eof ++echo 'BEGIN {' >"$tmp/subs1.awk" && + _ACEOF + + ++{ ++ echo "cat >conf$$subs.awk <<_ACEOF" && ++ 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; }; } ++ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do +- cat >conf$$subs.sed <<_ACEOF +-CXXCPP!$CXXCPP$ac_delim +-F77!$F77$ac_delim +-FFLAGS!$FFLAGS$ac_delim +-ac_ct_F77!$ac_ct_F77$ac_delim +-LIBTOOL!$LIBTOOL$ac_delim +-INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim +-INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim +-INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim +-INTLTOOL_PROP_RULE!$INTLTOOL_PROP_RULE$ac_delim +-INTLTOOL_OAF_RULE!$INTLTOOL_OAF_RULE$ac_delim +-INTLTOOL_PONG_RULE!$INTLTOOL_PONG_RULE$ac_delim +-INTLTOOL_SERVER_RULE!$INTLTOOL_SERVER_RULE$ac_delim +-INTLTOOL_SHEET_RULE!$INTLTOOL_SHEET_RULE$ac_delim +-INTLTOOL_SOUNDLIST_RULE!$INTLTOOL_SOUNDLIST_RULE$ac_delim +-INTLTOOL_UI_RULE!$INTLTOOL_UI_RULE$ac_delim +-INTLTOOL_XAM_RULE!$INTLTOOL_XAM_RULE$ac_delim +-INTLTOOL_KBD_RULE!$INTLTOOL_KBD_RULE$ac_delim +-INTLTOOL_XML_RULE!$INTLTOOL_XML_RULE$ac_delim +-INTLTOOL_XML_NOMERGE_RULE!$INTLTOOL_XML_NOMERGE_RULE$ac_delim +-INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE$ac_delim +-INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim +-INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim +-INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim +-INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim +-XGETTEXT!$XGETTEXT$ac_delim +-MSGMERGE!$MSGMERGE$ac_delim +-MSGFMT!$MSGFMT$ac_delim +-INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim +-INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim +-INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim +-INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim +-ALL_LINGUAS!$ALL_LINGUAS$ac_delim +-DATADIRNAME!$DATADIRNAME$ac_delim +-WARN_CFLAGS!$WARN_CFLAGS$ac_delim +-PKG_CONFIG!$PKG_CONFIG$ac_delim +-HELP_DIR!$HELP_DIR$ac_delim +-OMF_DIR!$OMF_DIR$ac_delim +-DOC_USER_FORMATS!$DOC_USER_FORMATS$ac_delim +-ENABLE_SK_TRUE!$ENABLE_SK_TRUE$ac_delim +-ENABLE_SK_FALSE!$ENABLE_SK_FALSE$ac_delim +-DISTCHECK_CONFIGURE_FLAGS!$DISTCHECK_CONFIGURE_FLAGS$ac_delim +-HAVE_GNOME_DOC_UTILS_TRUE!$HAVE_GNOME_DOC_UTILS_TRUE$ac_delim +-HAVE_GNOME_DOC_UTILS_FALSE!$HAVE_GNOME_DOC_UTILS_FALSE$ac_delim +-GLIB_GENMARSHAL!$GLIB_GENMARSHAL$ac_delim +-GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim +-USE_NLS!$USE_NLS$ac_delim +-MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim +-GMSGFMT!$GMSGFMT$ac_delim +-CATALOGS!$CATALOGS$ac_delim +-CATOBJEXT!$CATOBJEXT$ac_delim +-GMOFILES!$GMOFILES$ac_delim +-INSTOBJEXT!$INSTOBJEXT$ac_delim +-INTLLIBS!$INTLLIBS$ac_delim +-PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim +-PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim +-POFILES!$POFILES$ac_delim +-POSUB!$POSUB$ac_delim +-MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim +-GLIB_REQUIRED!$GLIB_REQUIRED$ac_delim +-GTK_REQUIRED!$GTK_REQUIRED$ac_delim +-GDK_REQUIRED!$GDK_REQUIRED$ac_delim +-LIBGNOME_REQUIRED!$LIBGNOME_REQUIRED$ac_delim +-LIBGNOMEUI_REQUIRED!$LIBGNOMEUI_REQUIRED$ac_delim +-HAL_REQUIRED!$HAL_REQUIRED$ac_delim +-DBUS_REQUIRED!$DBUS_REQUIRED$ac_delim +-LIBGLADE_REQUIRED!$LIBGLADE_REQUIRED$ac_delim +-LIBNOTIFY_REQUIRED!$LIBNOTIFY_REQUIRED$ac_delim +-LIBWNCK_REQUIRED!$LIBWNCK_REQUIRED$ac_delim +-CAIRO_REQUIRED!$CAIRO_REQUIRED$ac_delim +-UNIQUE_REQUIRED!$UNIQUE_REQUIRED$ac_delim +-LIBPANEL_REQUIRED!$LIBPANEL_REQUIRED$ac_delim +-GSTREAMER_REQUIRED!$GSTREAMER_REQUIRED$ac_delim +-XRANDR_REQUIRED!$XRANDR_REQUIRED$ac_delim +-POLKIT_GNOME_REQUIRED!$POLKIT_GNOME_REQUIRED$ac_delim +-GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim +-GLIB_LIBS!$GLIB_LIBS$ac_delim +-HAL_CFLAGS!$HAL_CFLAGS$ac_delim +-HAL_LIBS!$HAL_LIBS$ac_delim +-GSTREAMER_CFLAGS!$GSTREAMER_CFLAGS$ac_delim +-GSTREAMER_LIBS!$GSTREAMER_LIBS$ac_delim +-DBUS_CFLAGS!$DBUS_CFLAGS$ac_delim +-DBUS_LIBS!$DBUS_LIBS$ac_delim +-GNOME_CFLAGS!$GNOME_CFLAGS$ac_delim +-GNOME_LIBS!$GNOME_LIBS$ac_delim +-GDK_CFLAGS!$GDK_CFLAGS$ac_delim +-GDK_LIBS!$GDK_LIBS$ac_delim +-XRANDR_CFLAGS!$XRANDR_CFLAGS$ac_delim +-XRANDR_LIBS!$XRANDR_LIBS$ac_delim +-GCONFTOOL!$GCONFTOOL$ac_delim +-GCONF_SCHEMA_CONFIG_SOURCE!$GCONF_SCHEMA_CONFIG_SOURCE$ac_delim +-GCONF_SCHEMA_FILE_DIR!$GCONF_SCHEMA_FILE_DIR$ac_delim +-GCONF_SCHEMAS_INSTALL_TRUE!$GCONF_SCHEMAS_INSTALL_TRUE$ac_delim +-GCONF_SCHEMAS_INSTALL_FALSE!$GCONF_SCHEMAS_INSTALL_FALSE$ac_delim +-XMKMF!$XMKMF$ac_delim +-X_CFLAGS!$X_CFLAGS$ac_delim +-X_PRE_LIBS!$X_PRE_LIBS$ac_delim +-X_LIBS!$X_LIBS$ac_delim +-_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; }; } + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then ++ 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 +- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} ++ { { $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; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi + done ++rm -f conf$$subs.sh + +-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +-if test -n "$ac_eof"; then +- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` +- ac_eof=`expr $ac_eof + 1` +-fi +- +-cat >>$CONFIG_STATUS <<_ACEOF +-cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof +-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +-_ACEOF +-sed ' +-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +-s/^/s,@/; s/!/@,|#_!!_#|/ +-:n +-t n +-s/'"$ac_delim"'$/,g/; t +-s/$/\\/; p +-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +-' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +-CEOF$ac_eof ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++cat >>"\$tmp/subs1.awk" <<\\_ACAWK && + _ACEOF ++sed -n ' ++h ++s/^/S["/; s/!.*/"]=/ ++p ++g ++s/^[^!]*!// ++:repl ++t repl ++s/'"$ac_delim"'$// ++t delim ++:nl ++h ++s/\(.\{148\}\).*/\1/ ++t more1 ++s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ ++p ++n ++b repl ++:more1 ++s/["\\]/\\&/g; s/^/"/; s/$/"\\/ ++p ++g ++s/.\{148\}// ++t nl ++:delim ++h ++s/\(.\{148\}\).*/\1/ ++t more2 ++s/["\\]/\\&/g; s/^/"/; s/$/"/ ++p ++b ++:more2 ++s/["\\]/\\&/g; s/^/"/; s/$/"\\/ ++p ++g ++s/.\{148\}// ++t delim ++' >$CONFIG_STATUS || ac_write_fail=1 ++rm -f conf$$subs.awk ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++_ACAWK ++cat >>"\$tmp/subs1.awk" <<_ACAWK && ++ for (key in S) S_is_set[key] = 1 ++ FS = "" ++ ++} ++{ ++ line = $ 0 ++ nfields = split(line, field, "@") ++ substed = 0 ++ len = length(field[1]) ++ for (i = 2; i < nfields; i++) { ++ key = field[i] ++ keylen = length(key) ++ if (S_is_set[key]) { ++ value = S[key] ++ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) ++ len += length(value) + length(field[++i]) ++ substed = 1 ++ } else ++ len += 1 + keylen ++ } + ++ print line ++} + +-ac_delim='%!_!# ' +-for ac_last_try in false false false false false :; do +- cat >conf$$subs.sed <<_ACEOF +-X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim +-SYSCONFDIR!$SYSCONFDIR$ac_delim +-DATADIR!$DATADIR$ac_delim +-BINDIR!$BINDIR$ac_delim +-SBINDIR!$SBINDIR$ac_delim +-DOCDIR!$DOCDIR$ac_delim +-POLKIT_CFLAGS!$POLKIT_CFLAGS$ac_delim +-POLKIT_LIBS!$POLKIT_LIBS$ac_delim +-HAVE_TESTS_TRUE!$HAVE_TESTS_TRUE$ac_delim +-HAVE_TESTS_FALSE!$HAVE_TESTS_FALSE$ac_delim +-POLKIT_GNOME_CFLAGS!$POLKIT_GNOME_CFLAGS$ac_delim +-POLKIT_GNOME_LIBS!$POLKIT_GNOME_LIBS$ac_delim +-HAVE_GCONF_DEFAULTS_TRUE!$HAVE_GCONF_DEFAULTS_TRUE$ac_delim +-HAVE_GCONF_DEFAULTS_FALSE!$HAVE_GCONF_DEFAULTS_FALSE$ac_delim +-HAVE_APPLETS_TRUE!$HAVE_APPLETS_TRUE$ac_delim +-HAVE_APPLETS_FALSE!$HAVE_APPLETS_FALSE$ac_delim +-XMLTO!$XMLTO$ac_delim +-DOCBOOK_DOCS_ENABLED_TRUE!$DOCBOOK_DOCS_ENABLED_TRUE$ac_delim +-DOCBOOK_DOCS_ENABLED_FALSE!$DOCBOOK_DOCS_ENABLED_FALSE$ac_delim +-DBUS_SERVICES_DIR!$DBUS_SERVICES_DIR$ac_delim +-LIBNOTIFY_CFLAGS!$LIBNOTIFY_CFLAGS$ac_delim +-LIBNOTIFY_LIBS!$LIBNOTIFY_LIBS$ac_delim +-HAVE_LIBNOTIFY_TRUE!$HAVE_LIBNOTIFY_TRUE$ac_delim +-HAVE_LIBNOTIFY_FALSE!$HAVE_LIBNOTIFY_FALSE$ac_delim +-UNIQUE_CFLAGS!$UNIQUE_CFLAGS$ac_delim +-UNIQUE_LIBS!$UNIQUE_LIBS$ac_delim +-HAVE_UNIQUE_TRUE!$HAVE_UNIQUE_TRUE$ac_delim +-HAVE_UNIQUE_FALSE!$HAVE_UNIQUE_FALSE$ac_delim +-GPM_EXTRA_LIBS!$GPM_EXTRA_LIBS$ac_delim +-DOCBOOK2MAN!$DOCBOOK2MAN$ac_delim +-HAVE_DOCBOOK2MAN_TRUE!$HAVE_DOCBOOK2MAN_TRUE$ac_delim +-HAVE_DOCBOOK2MAN_FALSE!$HAVE_DOCBOOK2MAN_FALSE$ac_delim +-LIBOBJS!$LIBOBJS$ac_delim +-LTLIBOBJS!$LTLIBOBJS$ac_delim ++_ACAWK + _ACEOF +- +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 34; then +- break +- elif $ac_last_try; then +- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then ++ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" ++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; }; } +- else +- ac_delim="$ac_delim!$ac_delim _$ac_delim!! " +- fi +-done +- +-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +-if test -n "$ac_eof"; then +- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` +- ac_eof=`expr $ac_eof + 1` +-fi +- +-cat >>$CONFIG_STATUS <<_ACEOF +-cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof +-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end +-_ACEOF +-sed ' +-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +-s/^/s,@/; s/!/@,|#_!!_#|/ +-:n +-t n +-s/'"$ac_delim"'$/,g/; t +-s/$/\\/; p +-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +-' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +-:end +-s/|#_!!_#|//g +-CEOF$ac_eof + _ACEOF + +- + # VPATH may cause trouble with some makes, so we remove $(srcdir), + # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and + # trailing colons and then remove the whole line if VPATH becomes empty +@@ -26955,19 +27126,133 @@ + }' + fi + +-cat >>$CONFIG_STATUS <<\_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + fi # test -n "$CONFIG_FILES" + ++# Set up the scripts for CONFIG_HEADERS section. ++# No need to generate them if there are no CONFIG_HEADERS. ++# This happens for instance with `./config.status Makefile'. ++if test -n "$CONFIG_HEADERS"; then ++cat >"$tmp/defines.awk" <<\_ACAWK || ++BEGIN { ++_ACEOF ++ ++# Transform confdefs.h into an awk script `defines.awk', embedded as ++# here-document in config.status, that substitutes the proper values into ++# config.h.in to produce config.h. ++ ++# Create a delimiter string that does not exist in confdefs.h, to ease ++# handling of long lines. ++ac_delim='%!_!# ' ++for ac_last_try in false false :; do ++ ac_t=`sed -n "/$ac_delim/p" confdefs.h` ++ 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; }; } ++ else ++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " ++ fi ++done ++ ++# For the awk script, D is an array of macro values keyed by name, ++# likewise P contains macro parameters if any. Preserve backslash ++# newline sequences. ++ ++ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* ++sed -n ' ++s/.\{148\}/&'"$ac_delim"'/g ++t rset ++:rset ++s/^[ ]*#[ ]*define[ ][ ]*/ / ++t def ++d ++:def ++s/\\$// ++t bsnl ++s/["\\]/\\&/g ++s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ ++D["\1"]=" \3"/p ++s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p ++d ++:bsnl ++s/["\\]/\\&/g ++s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ ++D["\1"]=" \3\\\\\\n"\\/p ++t cont ++s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p ++t cont ++d ++:cont ++n ++s/.\{148\}/&'"$ac_delim"'/g ++t clear ++:clear ++s/\\$// ++t bsnlc ++s/["\\]/\\&/g; s/^/"/; s/$/"/p ++d ++:bsnlc ++s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p ++b cont ++' >$CONFIG_STATUS || ac_write_fail=1 ++ ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ for (key in D) D_is_set[key] = 1 ++ FS = "" ++} ++/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { ++ line = \$ 0 ++ split(line, arg, " ") ++ if (arg[1] == "#") { ++ defundef = arg[2] ++ mac1 = arg[3] ++ } else { ++ defundef = substr(arg[1], 2) ++ mac1 = arg[2] ++ } ++ split(mac1, mac2, "(") #) ++ macro = mac2[1] ++ prefix = substr(line, 1, index(line, defundef) - 1) ++ if (D_is_set[macro]) { ++ # Preserve the white space surrounding the "#". ++ print prefix "define", macro P[macro] D[macro] ++ next ++ } else { ++ # Replace #undef with comments. This is necessary, for example, ++ # in the case of _POSIX_SOURCE, which is predefined and required ++ # on some systems where configure will not decide to define it. ++ if (defundef == "undef") { ++ print "/*", prefix defundef, macro, "*/" ++ next ++ } ++ } ++} ++{ print } ++_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; }; } ++fi # test -n "$CONFIG_HEADERS" ++ + +-for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS ++eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" ++shift ++for ac_tag + do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; +- :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 +-echo "$as_me: error: Invalid tag $ac_tag." >&2;} ++ :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; }; };; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; +@@ -26996,26 +27281,38 @@ + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || +- { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +-echo "$as_me: error: cannot find input file: $ac_f" >&2;} ++ { { $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; }; };; + esac +- ac_file_inputs="$ac_file_inputs $ac_f" ++ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac ++ ac_file_inputs="$ac_file_inputs '$ac_f'" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ +- configure_input="Generated from "`IFS=: +- echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." ++ configure_input='Generated from '` ++ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' ++ `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" +- { echo "$as_me:$LINENO: creating $ac_file" >&5 +-echo "$as_me: creating $ac_file" >&6;} ++ { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 ++$as_echo "$as_me: creating $ac_file" >&6;} + fi ++ # Neutralize special characters interpreted by sed in replacement strings. ++ case $configure_input in #( ++ *\&* | *\|* | *\\* ) ++ ac_sed_conf_input=`$as_echo "$configure_input" | ++ sed 's/[\\\\&|]/\\\\&/g'`;; #( ++ *) ac_sed_conf_input=$configure_input;; ++ esac + + case $ac_tag in +- *:-:* | *:-) cat >"$tmp/stdin";; ++ *:-:* | *:-) 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; }; } ;; + esac + ;; + esac +@@ -27025,7 +27322,7 @@ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +-echo X"$ac_file" | ++$as_echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -27051,7 +27348,7 @@ + as_dirs= + while :; do + case $as_dir in #( +- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( ++ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" +@@ -27060,7 +27357,7 @@ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +-echo X"$as_dir" | ++$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -27081,17 +27378,17 @@ + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +-echo "$as_me: error: cannot create directory $as_dir" >&2;} ++ } || 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; }; }; } + ac_builddir=. + + case "$ac_dir" in + .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) +- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` ++ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. +- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` ++ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; +@@ -27136,12 +27433,13 @@ + esac + _ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + # 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= + +-case `sed -n '/datarootdir/ { ++ac_sed_dataroot=' ++/datarootdir/ { + p + q + } +@@ -27150,13 +27448,14 @@ + /@infodir@/p + /@localedir@/p + /@mandir@/p +-' $ac_file_inputs` in ++' ++case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in + *datarootdir*) ac_datarootdir_seen=yes;; + *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) +- { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} ++ { $as_echo "$as_me:$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 ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g +@@ -27170,15 +27469,16 @@ + # Neutralize VPATH when `$srcdir' = `.'. + # Shell code in configure.ac might set extrasub. + # FIXME: do we really want to maintain this feature? +-cat >>$CONFIG_STATUS <<_ACEOF +- sed "$ac_vpsub ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ac_sed_extra="$ac_vpsub + $extrasub + _ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + :t + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b +-s&@configure_input@&$configure_input&;t t ++s|@configure_input@|$ac_sed_conf_input|;t t + s&@top_builddir@&$ac_top_builddir_sub&;t t ++s&@top_build_prefix@&$ac_top_build_prefix&;t t + s&@srcdir@&$ac_srcdir&;t t + s&@abs_srcdir@&$ac_abs_srcdir&;t t + s&@top_srcdir@&$ac_top_srcdir&;t t +@@ -27189,121 +27489,60 @@ + s&@INSTALL@&$ac_INSTALL&;t t + s&@MKDIR_P@&$ac_MKDIR_P&;t t + $ac_datarootdir_hack +-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out ++" ++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; }; } + + 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"; } && +- { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' + which seems to be undefined. Please make sure it is defined." >&5 +-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++$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;} + + rm -f "$tmp/stdin" + case $ac_file in +- -) cat "$tmp/out"; rm -f "$tmp/out";; +- *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; +- esac ++ -) 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; }; } + ;; + :H) + # + # CONFIG_HEADER + # +-_ACEOF +- +-# Transform confdefs.h into a sed script `conftest.defines', that +-# substitutes the proper values into config.h.in to produce config.h. +-rm -f conftest.defines conftest.tail +-# First, append a space to every undef/define line, to ease matching. +-echo 's/$/ /' >conftest.defines +-# Then, protect against being on the right side of a sed subst, or in +-# an unquoted here document, in config.status. If some macros were +-# called several times there might be several #defines for the same +-# symbol, which is useless. But do not sort them, since the last +-# AC_DEFINE must be honored. +-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where +-# NAME is the cpp macro being defined, VALUE is the value it is being given. +-# PARAMS is the parameter list in the macro definition--in most cases, it's +-# just an empty string. +-ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' +-ac_dB='\\)[ (].*,\\1define\\2' +-ac_dC=' ' +-ac_dD=' ,' +- +-uniq confdefs.h | +- sed -n ' +- t rset +- :rset +- s/^[ ]*#[ ]*define[ ][ ]*// +- t ok +- d +- :ok +- s/[\\&,]/\\&/g +- s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p +- s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p +- ' >>conftest.defines +- +-# Remove the space that was appended to ease matching. +-# Then replace #undef with comments. This is necessary, for +-# example, in the case of _POSIX_SOURCE, which is predefined and required +-# on some systems where configure will not decide to define it. +-# (The regexp can be short, since the line contains either #define or #undef.) +-echo 's/ $// +-s,^[ #]*u.*,/* & */,' >>conftest.defines +- +-# Break up conftest.defines: +-ac_max_sed_lines=50 +- +-# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" +-# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" +-# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" +-# et cetera. +-ac_in='$ac_file_inputs' +-ac_out='"$tmp/out1"' +-ac_nxt='"$tmp/out2"' +- +-while : +-do +- # Write a here document: +- cat >>$CONFIG_STATUS <<_ACEOF +- # First, check the format of the line: +- cat >"\$tmp/defines.sed" <<\\CEOF +-/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def +-/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def +-b +-:def +-_ACEOF +- sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS +- echo 'CEOF +- sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS +- ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in +- sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail +- grep . conftest.tail >/dev/null || break +- rm -f conftest.defines +- mv conftest.tail conftest.defines +-done +-rm -f conftest.defines conftest.tail +- +-echo "ac_result=$ac_in" >>$CONFIG_STATUS +-cat >>$CONFIG_STATUS <<\_ACEOF + if test x"$ac_file" != x-; then +- echo "/* $configure_input */" >"$tmp/config.h" +- cat "$ac_result" >>"$tmp/config.h" +- if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then +- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 +-echo "$as_me: $ac_file is unchanged" >&6;} ++ { ++ $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; }; } ++ 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: $ac_file is unchanged" >&6;} + else +- rm -f $ac_file +- mv "$tmp/config.h" $ac_file ++ 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; }; } + fi + else +- echo "/* $configure_input */" +- cat "$ac_result" ++ $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; }; } + fi +- rm -f "$tmp/out12" +-# Compute $ac_file's index in $config_headers. +-_am_arg=$ac_file ++# Compute "$ac_file"'s index in $config_headers. ++_am_arg="$ac_file" + _am_stamp_count=1 + for _am_header in $config_headers :; do + case $_am_header in +@@ -27318,7 +27557,7 @@ + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +-echo X"$_am_arg" | ++$as_echo X"$_am_arg" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -27338,8 +27577,8 @@ + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; + +- :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 +-echo "$as_me: executing $ac_file commands" >&6;} ++ :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 ++$as_echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac + +@@ -27361,7 +27600,7 @@ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| . 2>/dev/null || +-echo X"$mf" | ++$as_echo X"$mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -27405,7 +27644,7 @@ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| . 2>/dev/null || +-echo X"$file" | ++$as_echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -27431,7 +27670,7 @@ + as_dirs= + while :; do + case $as_dir in #( +- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( ++ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" +@@ -27440,7 +27679,7 @@ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +-echo X"$as_dir" | ++$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -27461,8 +27700,8 @@ + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +-echo "$as_me: error: cannot create directory $as_dir" >&2;} ++ } || 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; }; }; } + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" +@@ -27499,8 +27738,8 @@ + "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES" + + if test ! -f "po/Makefile"; then +- { { echo "$as_me:$LINENO: error: po/Makefile is not ready." >&5 +-echo "$as_me: error: po/Makefile is not ready." >&2;} ++ { { $as_echo "$as_me:$LINENO: error: po/Makefile is not ready." >&5 ++$as_echo "$as_me: error: po/Makefile is not ready." >&2;} + { (exit 1); exit 1; }; } + fi + mv "po/Makefile" "po/Makefile.tmp" +@@ -27522,6 +27761,11 @@ + 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; }; } ++ + + # configure is writing to config.log, and then calls config.status. + # config.status does its own redirection, appending to config.log. +@@ -27543,6 +27787,10 @@ + # would make configure fail if this is the last instruction. + $ac_cs_success || { (exit 1); exit 1; } + 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: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} ++fi + + + echo " +--- gnome-power-manager-2.24.0old/src/gpm-prefs-core.c 2008-09-04 12:05:15.000000000 +0200 ++++ gnome-power-manager-2.24.0/src/gpm-prefs-core.c 2008-10-02 14:56:41.000000000 +0200 +@@ -45,9 +45,7 @@ + #include "gpm-screensaver.h" + #include "gpm-prefs-server.h" + +-#ifdef HAVE_GCONF_DEFAULTS +-#include +-#endif ++ + + static void gpm_prefs_class_init (GpmPrefsClass *klass); + static void gpm_prefs_init (GpmPrefs *prefs); +@@ -69,9 +67,7 @@ + gboolean can_hibernate; + GpmConf *conf; + GpmScreensaver *screensaver; +-#ifdef HAVE_GCONF_DEFAULTS +- PolKitGnomeAction *default_action; +-#endif ++ + }; + + enum { +@@ -965,95 +961,7 @@ + } + } + +-#ifdef HAVE_GCONF_DEFAULTS +-/** +- * pk_prefs_set_defaults_cb: +- **/ +-static void +-pk_prefs_set_defaults_cb (PolKitGnomeAction *default_action, GpmPrefs *prefs) +-{ +- DBusGProxy *proxy; +- DBusGConnection *connection; +- GError *error; +- gchar *keys[5] = { +- "/apps/gnome-power-manager/actions", +- "/apps/gnome-power-manager/ui", +- "/apps/gnome-power-manager/buttons", +- "/apps/gnome-power-manager/backlight", +- "/apps/gnome-power-manager/timeout" +- }; +- +- error = NULL; +- connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error); +- if (error != NULL) { +- g_warning ("failed to get system bus connection: %s", error->message); +- g_error_free (error); +- return; +- } +- +- proxy = dbus_g_proxy_new_for_name (connection, +- "org.gnome.GConf.Defaults", +- "/", +- "org.gnome.GConf.Defaults"); +- if (proxy == NULL) { +- g_warning ("Cannot connect to defaults mechanism"); +- return; +- } + +- GConfClient *client; +- client = gconf_client_get_default (); +- gconf_client_suggest_sync (client, NULL); +- g_object_unref (client); +- dbus_g_proxy_call (proxy, "SetSystem", &error, +- G_TYPE_STRV, keys, +- G_TYPE_STRV, NULL, +- G_TYPE_INVALID, G_TYPE_INVALID); +- +- g_object_unref (proxy); +-} +- +-/** +- * gpk_prefs_create_custom_widget: +- **/ +-static GtkWidget * +-gpk_prefs_create_custom_widget (GladeXML *xml, gchar *func_name, gchar *name, +- gchar *string1, gchar *string2, +- gint int1, gint int2, gpointer user_data) +-{ +- GpmPrefs *prefs = GPM_PREFS (user_data); +- if (strcmp (name, "button_default") == 0) { +- return polkit_gnome_action_create_button (prefs->priv->default_action); +- } +- egg_warning ("name unknown=%s", name); +- return NULL; +-} +- +-/** +- * gpk_prefs_setup_policykit: +- * +- * We have to do this before the glade stuff if done as the custom handler needs the actions setup +- **/ +-static void +-gpk_prefs_setup_policykit (GpmPrefs *prefs) +-{ +- PolKitAction *pk_action; +- +- g_return_if_fail (GPM_IS_PREFS (prefs)); +- +- /* set default */ +- pk_action = polkit_action_new (); +- polkit_action_set_action_id (pk_action, "org.freedesktop.packagekit.set-defaults"); +- prefs->priv->default_action = polkit_gnome_action_new_default ("set-defaults", pk_action, +- _("Make Default"), NULL); +- g_object_set (prefs->priv->default_action, +- "no-icon-name", GTK_STOCK_FLOPPY, +- "auth-icon-name", GTK_STOCK_FLOPPY, +- "yes-icon-name", GTK_STOCK_FLOPPY, +- "self-blocked-icon-name", GTK_STOCK_FLOPPY, +- NULL); +- polkit_action_unref (pk_action); +-} +-#endif + + /** + * gpm_prefs_init: +@@ -1088,13 +996,7 @@ + prefs->priv->can_hibernate = gpm_dbus_method_bool ("CanHibernate"); + egg_debug ("caps=%i", caps); + +-#ifdef HAVE_GCONF_DEFAULTS +- /* use custom widgets */ +- glade_set_custom_handler (gpk_prefs_create_custom_widget, prefs); +- +- /* we have to do this before we connect up the glade file */ +- gpk_prefs_setup_policykit (prefs); +-#endif ++ + + prefs->priv->glade_xml = glade_xml_new (GPM_DATA "/gpm-prefs.glade", NULL, NULL); + if (prefs->priv->glade_xml == NULL) { +@@ -1120,10 +1022,7 @@ + g_signal_connect (widget, "clicked", + G_CALLBACK (gpm_prefs_help_cb), prefs); + +-#ifdef HAVE_GCONF_DEFAULTS +- g_signal_connect (prefs->priv->default_action, "activate", +- G_CALLBACK (pk_prefs_set_defaults_cb), prefs); +-#endif ++ + + prefs_setup_ac (prefs); + prefs_setup_battery (prefs); diff --git a/source/gnome/gnome-power-manager/FrugalBuild b/source/gnome/gnome-power-manager/FrugalBuild index 1d012ac..d9f750a 100644 --- a/source/gnome/gnome-power-manager/FrugalBuild +++ b/source/gnome/gnome-power-manager/FrugalBuild @@ -3,12 +3,12 @@ # Former Maintainer: AlexExtreme pkgname=gnome-power-manager -pkgver=2.22.1 +pkgver=2.24.0 pkgrel=1 pkgdesc="GNOME Power Management tool" url="http://www.gnome.org/" -depends=('libnotify>=0.4.4' 'hal>=0.5.8.1' 'dbus-glib>=0.71' 'xextproto' 'libgnomeui>=2.22.0' 'libgnome>=2.22.0' \ - 'libglade' 'libwnck>=2.22.0' 'gnome-panel>=2.22.0' 'gnome-keyring>=2.22.0' 'gstreamer') +depends=('libnotify>=0.4.4' 'hal>=0.5.8.1' 'dbus-glib>=0.71' 'xextproto' 'libgnomeui>=2.24.0' 'libgnome>=2.24.0' \ + 'libglade' 'libwnck>=2.24.0' 'gnome-panel>=2.24.0' 'gnome-keyring>=2.24.0' 'gstreamer') makedepends=('intltool' 'gnome-doc-utils') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') @@ -17,10 +17,11 @@ _F_gnome_scrollkeeper=y _F_gnome_desktop=y _F_gnome_iconcache=y Finclude gnome gnome-scriptlet -source=(${source[@]} $pkgname-2.15.90-disable_hibernate.patch strip_help_creation.patch) +source=(${source[@]} $pkgname-2.15.90-disable_hibernate.patch Fix_disablepam.diff DisableHelp.diff) Fconfopts="$Fconfopts --enable-dpms-ext --enable-libnotify --enable-applets --enable-keyring" -sha1sums=('bba77f4403643f10a26d7abf5a4681cd50ff08d4' \ - '30667680a326889bf25d754945140d4faa6710d2' \ - '5248b2534d6451bad0923726a71136792c5db717') +sha1sums=('07f761097389bab5801bf84910f1bd2fe05fd050' \ + '68c14c8193ddd0f1e817c3d89596c8d415d2d382' \ + 'cef6a51758948f6039c096d9ce59eb3478215d90' \ + '593f233326489bc76b721bcadd117695f040505f') # optimization OK diff --git a/source/gnome/gnome-power-manager/gnome-power-manager-2.15.90-disable_hibernate.patch b/source/gnome/gnome-power-manager/gnome-power-manager-2.15.90-disable_hibernate.patch index fe758db..57266f8 100644 --- a/source/gnome/gnome-power-manager/gnome-power-manager-2.15.90-disable_hibernate.patch +++ b/source/gnome/gnome-power-manager/gnome-power-manager-2.15.90-disable_hibernate.patch @@ -1,8 +1,7 @@ -diff -urN gnome-power-manager-2.15.90.orig/data/gnome-power-manager.schemas.in gnome-power-manager-2.15.90/data/gnome-power-manager.schemas.in ---- gnome-power-manager-2.15.90.orig/data/gnome-power-manager.schemas.in 2006-07-08 10:25:14.000000000 +0100 -+++ gnome-power-manager-2.15.90/data/gnome-power-manager.schemas.in 2006-07-28 11:05:36.000000000 +0100 -@@ -185,7 +185,7 @@ - /apps/gnome-power-manager/can_hibernate +--- gnome-power-manager-2.24.0old/data/gnome-power-manager.schemas.in 2008-09-04 12:05:18.000000000 +0200 ++++ gnome-power-manager-2.24.0/data/gnome-power-manager.schemas.in 2008-10-02 15:05:09.000000000 +0200 +@@ -411,7 +411,7 @@ + /apps/gnome-power-manager/general/can_hibernate gnome-power-manager bool - true From bouleetbil at frogdev.info Thu Oct 2 23:04:04 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Oct 2 23:04:05 2008 Subject: [Frugalware-git] bouleetbilgnome224: gnome-vfsmm-2.24.0-1-i686 Message-ID: <20081002210404.1B8901190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=c10efecc368a694430d4c8c4db4338d9dba774fc commit c10efecc368a694430d4c8c4db4338d9dba774fc Author: bouleetbil Date: Thu Oct 2 23:01:44 2008 +0200 gnome-vfsmm-2.24.0-1-i686 *version bump diff --git a/source/gnome-extra/gnome-vfsmm/FrugalBuild b/source/gnome-extra/gnome-vfsmm/FrugalBuild index 64ca644..2966b10 100644 --- a/source/gnome-extra/gnome-vfsmm/FrugalBuild +++ b/source/gnome-extra/gnome-vfsmm/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-vfsmm -pkgver=2.22.0 +pkgver=2.24.0 pkgrel=1 pkgdesc="A C++ wrapper for gnome-vfs." url="http://www.gnome.org/" -depends=('gnome-vfs>=2.20.0' 'glibmm>=2.16.0') +depends=('gnome-vfs>=2.24.0' 'glibmm>=2.16.0') makedepends=('doxygen') options=('scriptlet') groups=('gnome-extra') archs=('i686' 'x86_64') Finclude gnome -sha1sums=('cd739e1b2b68af080089b52bcfffd3e96b35d6e9') +sha1sums=('36ac608f26287b9146dcf5a250312471a759cefe') # optimization OK From bouleetbil at frogdev.info Thu Oct 2 23:26:31 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Oct 2 23:26:32 2008 Subject: [Frugalware-git] bouleetbilgnome224: gnome-screensaver-2.24.0-1-i686 Message-ID: <20081002212631.B68241190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=9ba5ad9f113775302d0e388fa7a555ecc70c3c5c commit 9ba5ad9f113775302d0e388fa7a555ecc70c3c5c Author: bouleetbil Date: Thu Oct 2 23:23:52 2008 +0200 gnome-screensaver-2.24.0-1-i686 *version bump diff --git a/source/gnome/gnome-screensaver/FrugalBuild b/source/gnome/gnome-screensaver/FrugalBuild index 6479558..951a3b3 100644 --- a/source/gnome/gnome-screensaver/FrugalBuild +++ b/source/gnome/gnome-screensaver/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-screensaver -pkgver=2.22.2 +pkgver=2.24.0 pkgrel=1 pkgdesc="GNOME screen saver and locker" url="http://live.gnome.org/GnomeScreensaver" -depends=('libgnomeui>=2.22.0' 'dbus-glib>=0.71' 'gnome-menus>=2.22.0' 'gdm>=2.20.5' 'libgnomekbd>=2.22.0' \ - 'libxscrnsaver' 'shadow' 'xscreensaver-data' 'libbonobo' 'gnome-vfs>=2.22.0') +depends=('libgnomeui>=2.24.0' 'dbus-glib>=0.71' 'gnome-menus>=2.24.0' 'gdm>=2.20.5' 'libgnomekbd>=2.24.0' \ + 'libxscrnsaver' 'shadow' 'xscreensaver-data' 'libbonobo' 'gnome-vfs>=2.24.0') makedepends=('intltool' 'scrnsaverproto') groups=('gnome' 'gnome-minimal') archs=('x86_64' 'i686' 'ppc') @@ -17,7 +17,7 @@ _F_gnome_desktop="y" _F_gnome_scrollkeeper="y" _F_gnome_mime="y" source=(${source[@]} http://frugalware.org/images/logo-new-big.png frugal-floaters.desktop $pkgname $pkgname-2.17.7-frugal-screensaver.patch) -sha1sums=('473b00fc6306742ada4e89520c991c31d1f79984' \ +sha1sums=('ed7871c8a004801717e6a7897b07b80386256ce8' \ '52ad3cef2d4d0b51eb9565316a9f4c688657dc54' \ 'a4913a96ccfd029620da03fbfbcaab8b6d42330c' \ '833bd26acc4bbf6486c696f9f700b449e1a91990' \ From vmiklos at frugalware.org Fri Oct 3 00:19:12 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 3 00:19:14 2008 Subject: [Frugalware-git] frugalware-current: mediawiki-1.13.1-1-i686 Message-ID: <20081002221912.ABDB81190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c49f5efaff9cebadf02fec0a9446650467bda6b0 commit c49f5efaff9cebadf02fec0a9446650467bda6b0 Author: Miklos Vajna Date: Fri Oct 3 00:18:57 2008 +0200 mediawiki-1.13.1-1-i686 - version bump - closes #3382 diff --git a/source/network-extra/mediawiki/FrugalBuild b/source/network-extra/mediawiki/FrugalBuild index 229f07b..e1c96bc 100644 --- a/source/network-extra/mediawiki/FrugalBuild +++ b/source/network-extra/mediawiki/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=mediawiki -pkgver=1.12.0 +pkgver=1.13.1 pkgrel=1 pkgdesc="The collaborative editing software that runs Wikipedia" _F_sourceforge_dirname="wikipedia" @@ -12,7 +12,7 @@ rodepends=('webappconfig' 'apache' 'php>=5.1' 'mysql>=4.0') groups=('network-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/wiki/Download |grep tar.gz |sed -ne 's/.*i-\(.*\).t.*/\1/;1 p'" -source=(http://download.wikimedia.org/mediawiki/1.12/mediawiki-$pkgver.tar.gz \ +source=(http://download.wikimedia.org/mediawiki/1.13/mediawiki-$pkgver.tar.gz \ README.Frugalware mediawikisetup) options=('stick') @@ -25,6 +25,6 @@ build() Fexe /usr/bin/mediawikisetup } # php code, no need of optimalization -sha1sums=('48bf1877f60c317cbe93c072187dfe9c1aa3b857' \ +sha1sums=('41ef2be8939aa27778d93923ba7005165b15876a' \ '2c70930c46b8a5d87e830f64dc2761c5506ce967' \ 'b9810ea6531b4f61e41778b76f7601f2c4f9b0e2') From vmiklos at frugalware.org Fri Oct 3 02:38:27 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 3 02:38:30 2008 Subject: [Frugalware-git] pacman-tools: mkiso: remove debug line Message-ID: <20081003003827.6DB991190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=b33d7f07760d129daabf3b942552f50223773e22 commit b33d7f07760d129daabf3b942552f50223773e22 Author: Miklos Vajna Date: Fri Oct 3 02:37:58 2008 +0200 mkiso: remove debug line diff --git a/mkiso/mkiso.c b/mkiso/mkiso.c index 0fbf650..0480948 100644 --- a/mkiso/mkiso.c +++ b/mkiso/mkiso.c @@ -360,7 +360,6 @@ int mkiso(volume_t *volume, int countonly, int stable, int dryrun) "-graft-points " "-path-list %s", fname, flist); - printf("debug, cmdline: %s\n", cmdline); } ptr = g_strdup_printf("%s.lst", fname); if((fp=fopen(ptr, "w"))==NULL) From boobaa at frugalware.org Fri Oct 3 12:16:43 2008 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Oct 3 12:16:45 2008 Subject: [Frugalware-git] frugalware-current: drupal-commentrss-5.x_2.0-1-i686 Message-ID: <20081003101643.04EAA1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=587945e8289694a35c0920184194456d44caa2cd commit 587945e8289694a35c0920184194456d44caa2cd Author: CSÉCSY László Date: Fri Oct 3 12:16:19 2008 +0200 drupal-commentrss-5.x_2.0-1-i686 version bump diff --git a/source/network-extra/drupal-commentrss/FrugalBuild b/source/network-extra/drupal-commentrss/FrugalBuild index ac7d5bb..8d4c300 100644 --- a/source/network-extra/drupal-commentrss/FrugalBuild +++ b/source/network-extra/drupal-commentrss/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: CSÉCSY László _F_drupal_module=commentrss -pkgver=5.x_1.2 +pkgver=5.x_2.0 pkgrel=1 pkgdesc="Provides RSS feeds for comments in Drupal" Finclude drupal -sha1sums=('4e0fcc1b2b3d13731003bbb0ffe9730bee4f356d') +sha1sums=('cde29042b69d1221d364c2f5456347db4d828d24') From vmiklos at frugalware.org Fri Oct 3 15:09:48 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 3 15:09:50 2008 Subject: [Frugalware-git] pacman-tools: dg send: support comas in --to as well Message-ID: <20081003130948.272D41190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=56c4648c197533f3799d256abf64765f24e0e9e9 commit 56c4648c197533f3799d256abf64765f24e0e9e9 Author: Miklos Vajna Date: Fri Oct 3 15:09:47 2008 +0200 dg send: support comas in --to as well diff --git a/darcs-git.py b/darcs-git.py index bec5aee..f68b1d3 100755 --- a/darcs-git.py +++ b/darcs-git.py @@ -750,11 +750,8 @@ Options: elif opt in ("-t", "--to"): options.to = '--to="%s"' % arg elif opt in ("-c", "--cc"): - for i in arg.split('>, '): - if i == arg.split('>, ')[-1]: - options.cc += ' --cc="%s"' % i - else: - options.cc += ' --cc="%s>"' % i + for i in arg.split(', '): + options.cc += ' --cc="%s"' % i optind += 1 if optind < len(argv): options.gitopts = " ".join(argv[optind:]) From vmiklos at frugalware.org Fri Oct 3 15:12:14 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 3 15:12:16 2008 Subject: [Frugalware-git] pacman-tools: dg send --to: typo Message-ID: <20081003131214.E59141190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=93738f37096eaca727273ee5cda359607fc48ba2 commit 93738f37096eaca727273ee5cda359607fc48ba2 Author: Miklos Vajna Date: Fri Oct 3 15:11:43 2008 +0200 dg send --to: typo diff --git a/darcs-git.py b/darcs-git.py index f68b1d3..b90d243 100755 --- a/darcs-git.py +++ b/darcs-git.py @@ -748,10 +748,11 @@ Options: elif opt in ("-h", "--help"): options.help = True elif opt in ("-t", "--to"): - options.to = '--to="%s"' % arg + for i in arg.split(', '): + options.to += ' --to="%s"' % i.replace('"', r'\"') elif opt in ("-c", "--cc"): for i in arg.split(', '): - options.cc += ' --cc="%s"' % i + options.cc += ' --cc="%s"' % i.replace('"', r'\"') optind += 1 if optind < len(argv): options.gitopts = " ".join(argv[optind:]) From vmiklos at frugalware.org Fri Oct 3 15:28:28 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 3 15:28:29 2008 Subject: [Frugalware-git] frugalware-current: gsoap-2.7.12-1-i686 Message-ID: <20081003132828.42C6B1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0beefed22212bbdb2c223f0347f8ee0bf5dea324 commit 0beefed22212bbdb2c223f0347f8ee0bf5dea324 Author: Miklos Vajna Date: Fri Oct 3 15:27:24 2008 +0200 gsoap-2.7.12-1-i686 - version bump diff --git a/source/devel-extra/gsoap/FrugalBuild b/source/devel-extra/gsoap/FrugalBuild index 396f20e..a2c373f 100644 --- a/source/devel-extra/gsoap/FrugalBuild +++ b/source/devel-extra/gsoap/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna pkgname=gsoap -pkgver=2.7.11 +pkgver=2.7.12 extrapkgver= pkgrel=1 pkgdesc="A cross-platform development environment for C and C++ SOAP/XML Web services." @@ -13,7 +13,7 @@ _F_sourceforge_dirname="gsoap2" Finclude sourceforge up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=52781|grep stable |sed 's/.*P \([^ ]*\) .*/\1/;s/$extrapkgver//;q'" source=(${source%gs*}/${pkgname}_$pkgver$extrapkgver.tar.gz) -sha1sums=('567ac95af621dc342304768f7d6da0674ae2ccc6') +sha1sums=('ea72438f751702d366fd066ce878c7f43874a07f') build() { From vmiklos at frugalware.org Fri Oct 3 15:48:45 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 3 15:48:46 2008 Subject: [Frugalware-git] frugalware-current: e2fsprogs-1.41.2-1-i686 Message-ID: <20081003134845.D44271190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=09b6a55bda666b670a01c23f02b0260fedc4b26a commit 09b6a55bda666b670a01c23f02b0260fedc4b26a Author: Miklos Vajna Date: Fri Oct 3 15:48:11 2008 +0200 e2fsprogs-1.41.2-1-i686 - version bump diff --git a/source/base/e2fsprogs/FrugalBuild b/source/base/e2fsprogs/FrugalBuild index cec6172..5d44da2 100644 --- a/source/base/e2fsprogs/FrugalBuild +++ b/source/base/e2fsprogs/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna pkgname=e2fsprogs -pkgver=1.41.1 +pkgver=1.41.2 pkgrel=1 pkgdesc="Utilities needed to create and maintain ext2 and ext3 filesystems" depends=('glibc>=2.8-3') @@ -13,7 +13,7 @@ _F_sourceforge_prefix="v" Finclude sourceforge url="http://e2fsprogs.sourceforge.net/" source=($source rc.fsck rc.random) -sha1sums=('f55b95df6956cd5a9f85f7deb90968d24d79a4ab' \ +sha1sums=('8334f9eaea5f0001e3241ea71ea094f2d87298a9' \ 'a4b2ac27c9e155b29a7dea6e7693f449e6ce6c9f' \ '7d5e3eecbea952aa1f72808fb810892d82a35461') From priyank at frugalware.org Fri Oct 3 15:58:50 2008 From: priyank at frugalware.org (Priyank) Date: Fri Oct 3 15:58:52 2008 Subject: [Frugalware-git] frugalware-current: perl-anyevent-4.3-1-i686 Message-ID: <20081003135850.CD3D31190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3970dfdce016a1897bddb738c1857e3a4642ca1a commit 3970dfdce016a1897bddb738c1857e3a4642ca1a Author: Priyank Date: Fri Oct 3 19:27:00 2008 +0530 perl-anyevent-4.3-1-i686 * Version bump diff --git a/source/devel-extra/perl-anyevent/FrugalBuild b/source/devel-extra/perl-anyevent/FrugalBuild index 7186f41..61074f5 100644 --- a/source/devel-extra/perl-anyevent/FrugalBuild +++ b/source/devel-extra/perl-anyevent/FrugalBuild @@ -4,10 +4,10 @@ _F_perl_name=AnyEvent _F_perl_author=M/ML/MLEHMANN -pkgver=4.233 +pkgver=4.3 pkgdesc="Perl framework for multiple event loops." depends=('perl-event>=1.10') Finclude perl archs=('i686' 'x86_64') -sha1sums=('fbcbaac6e7d3238a1591ca2085a4249d19f87d10') +sha1sums=('b722053f19acb5c0f41729d8e33f8a520ad0856c') From priyank at frugalware.org Fri Oct 3 16:06:13 2008 From: priyank at frugalware.org (Priyank) Date: Fri Oct 3 16:06:14 2008 Subject: [Frugalware-git] frugalware-current: wput-0.6.2-1-i686 Message-ID: <20081003140613.958B61190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0572337de7c8318ca75225b2e7657341cf6e07bd commit 0572337de7c8318ca75225b2e7657341cf6e07bd Author: Priyank Date: Fri Oct 3 19:34:25 2008 +0530 wput-0.6.2-1-i686 * Version bump diff --git a/source/network-extra/wput/FrugalBuild b/source/network-extra/wput/FrugalBuild index c3598a8..36095e3 100644 --- a/source/network-extra/wput/FrugalBuild +++ b/source/network-extra/wput/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=wput -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="A command line tool to upload files to FTP site, the opposite to wget" depends=('gnutls' 'glibc') @@ -11,7 +11,7 @@ archs=('i686' 'x86_64') _F_sourceforge_ext=.tgz Finclude sourceforge url="http://wput.sourceforge.net/" -sha1sums=('1c11d831b2403d838babe4416d4c7af434a7e300') +sha1sums=('c058f76395672d1fbbb839c958d6537e82fc88b7') build() { Fmkdir usr/{bin,share/man/man1} From bouleetbil at frogdev.info Fri Oct 3 17:46:39 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 3 17:46:42 2008 Subject: [Frugalware-git] bouleetbilgnome224: banshee-1.2.1-2-i686 Message-ID: <20081003154639.DB0BA1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=72e23359dfb15793bc7cb92f167490b38430279c commit 72e23359dfb15793bc7cb92f167490b38430279c Author: bouleetbil Date: Fri Oct 3 17:43:29 2008 +0200 banshee-1.2.1-2-i686 *rebuild with gnome-desktop-sharp>=2.24.0-1 diff --git a/source/gnome-extra/banshee/FrugalBuild b/source/gnome-extra/banshee/FrugalBuild index d320787..aaccaba 100644 --- a/source/gnome-extra/banshee/FrugalBuild +++ b/source/gnome-extra/banshee/FrugalBuild @@ -5,13 +5,14 @@ pkgname=banshee _F_archive_name=$pkgname-1 pkgver=1.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="Banshee is a Mono based media player for Gnome" url="http://banshee-project.org" depends=('gnome-sharp' 'ipod-sharp>=0.8.0' 'sqlite3' 'hal' 'libmusicbrainz' 'brasero' \ 'mono-zeroconf>=0.7.6' 'gst-plugins-base-cdparanoia' 'gst-plugins-base-gnomevfs' \ 'gst-plugins-good-gconf' 'gst-plugins-base-oil' 'podsleuth' 'boo' \ - 'karma-sharp>=0.1.0-4' 'libmtp' 'ndesk-dbus-glib' 'njb-sharp' 'taglib-sharp' 'mono-addins') + 'karma-sharp>=0.1.0-4' 'libmtp' 'ndesk-dbus-glib' 'njb-sharp' 'taglib-sharp' 'mono-addins' \ + 'gnome-desktop-sharp>=2.24.0-1') conflicts=('banshee-official-plugins') provides=('banshee-official-plugins') replaces=('banshee-official-plugins') From bouleetbil at frogdev.info Fri Oct 3 18:00:48 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 3 18:00:49 2008 Subject: [Frugalware-git] bouleetbilgnome224: f-spot-0.5.0.1-2-i686 Message-ID: <20081003160048.884FB1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=afad93a3ad2fe08fdc9a78e31107f522d8186a5f commit afad93a3ad2fe08fdc9a78e31107f522d8186a5f Author: bouleetbil Date: Fri Oct 3 17:57:51 2008 +0200 f-spot-0.5.0.1-2-i686 *rebuild with gnome-desktop-sharp>=2.24.0-1 diff --git a/source/gnome-extra/f-spot/FrugalBuild b/source/gnome-extra/f-spot/FrugalBuild index 76442f7..779e4a3 100644 --- a/source/gnome-extra/f-spot/FrugalBuild +++ b/source/gnome-extra/f-spot/FrugalBuild @@ -4,10 +4,10 @@ pkgname=f-spot pkgver=0.5.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="A personal photo management program for Gnome" url="http://www.gnome.org/projects/f-spot/" -depends=('gtk2-sharp' 'lcms' 'libexif' 'libgphoto2' 'libjpeg' 'sqlite3' 'ndesk-dbus' 'ndesk-dbus-glib' 'gnome-sharp>=2.16.0-3' 'gnome-desktop-sharp') +depends=('gtk2-sharp' 'lcms' 'libexif' 'libgphoto2' 'libjpeg' 'sqlite3' 'ndesk-dbus' 'ndesk-dbus-glib' 'gnome-sharp>=2.16.0-3' 'gnome-desktop-sharp>=2.24.0-1') makedepends=('gnome-screensaver' 'perl-xml-parser' 'gnome-doc-utils' 'intltool') groups=('gnome-extra') archs=('i686' 'x86_64') From bouleetbil at frogdev.info Fri Oct 3 18:10:15 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 3 18:10:19 2008 Subject: [Frugalware-git] bouleetbilgnome224: gnomeartng-0.6.0-2-i686 Message-ID: <20081003161015.E7D9F1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=5ac4c614be7582b8b1a4408a6effcccc561c0a67 commit 5ac4c614be7582b8b1a4408a6effcccc561c0a67 Author: bouleetbil Date: Fri Oct 3 18:07:49 2008 +0200 gnomeartng-0.6.0-2-i686 *rebuild with gnome-desktop-sharp>=2.24.0-1 diff --git a/source/gnome-extra/gnomeartng/FrugalBuild b/source/gnome-extra/gnomeartng/FrugalBuild index b9b0d44..d894973 100644 --- a/source/gnome-extra/gnomeartng/FrugalBuild +++ b/source/gnome-extra/gnomeartng/FrugalBuild @@ -3,9 +3,9 @@ pkgname=gnomeartng pkgver=0.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="Manage your Gnome Desktop from arts.gnome.org" -depends=('gnome-sharp') +depends=('gnome-sharp' 'gnome-desktop-sharp>=2.24.0-1') options=('scriptlet') Finclude berlios mono source=($source Fix_GDM.diff) From bouleetbil at frogdev.info Fri Oct 3 18:17:44 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 3 18:17:45 2008 Subject: [Frugalware-git] bouleetbilgnome224: gnome-do-0.5.0.1-2-i686 Message-ID: <20081003161744.99F8C1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=ecdf11bbb49dd7140c1b4d65a9f919a9344b313e commit ecdf11bbb49dd7140c1b4d65a9f919a9344b313e Author: bouleetbil Date: Fri Oct 3 18:15:19 2008 +0200 gnome-do-0.5.0.1-2-i686 *rebuild with gnome-desktop-sharp>=2.24.0-1 diff --git a/source/gnome-extra/gnome-do/FrugalBuild b/source/gnome-extra/gnome-do/FrugalBuild index de1972a..4195510 100644 --- a/source/gnome-extra/gnome-do/FrugalBuild +++ b/source/gnome-extra/gnome-do/FrugalBuild @@ -3,11 +3,11 @@ pkgname=gnome-do pkgver=0.5.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="A powerful, remote control for GNOME" depends=('gtk+2' 'glibc' 'freetype2' 'libxau' 'libxdmcp' 'libxdamage' \ 'libxext' 'libxml2' 'gnome-sharp' 'ndesk-dbus-glib' 'gnome-keyring-sharp' \ - 'gnome-desktop-sharp' 'mono-addins') + 'gnome-desktop-sharp>=2.24.0-1' 'mono-addins') makedepends=('perl-xml-parser' 'intltool') groups=('gnome-extra') options=('scriptlet') From bouleetbil at frogdev.info Fri Oct 3 18:34:13 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 3 18:34:15 2008 Subject: [Frugalware-git] bouleetbilgnome224: gnome-subtitles-0.8-2-i686 Message-ID: <20081003163413.E223A1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=e207f70b8761399459b0956d3752c456d4dcc218 commit e207f70b8761399459b0956d3752c456d4dcc218 Author: bouleetbil Date: Fri Oct 3 18:31:35 2008 +0200 gnome-subtitles-0.8-2-i686 *rebuild with gnome-desktop-sharp>=2.24.0-1 diff --git a/source/gnome-extra/gnome-subtitles/FrugalBuild b/source/gnome-extra/gnome-subtitles/FrugalBuild index 4c03666..4d230a8 100644 --- a/source/gnome-extra/gnome-subtitles/FrugalBuild +++ b/source/gnome-extra/gnome-subtitles/FrugalBuild @@ -3,11 +3,11 @@ pkgname=gnome-subtitles pkgver=0.8 -pkgrel=1 +pkgrel=2 pkgdesc="Video subtitling for the GNOME desktop" depends=('mono' 'gnome-sharp' 'gstreamer' 'gst-plugins-base' \ 'gst-plugins-base-ogg' 'gst-plugins-base-oil' 'gst-plugins-base-vorbis' \ - 'gtkspell' 'enchant' 'sublib') + 'gtkspell' 'enchant' 'sublib' 'gnome-desktop-sharp>=2.24.0-1') makedepends=('gnome-doc-utils' 'perl-xml-parser') groups=('gnome-extra') archs=('i686') @@ -19,6 +19,13 @@ sha1sums=('14fe9eabf4288fc23072988f4423b5f447642352') build() { Fmonoexport + #Fix launch with new gtk# + Fcd + Fsed "Gnome Subtitles" \ + "Gnome SubtitlesTrue" \ + src/Glade/MainWindow.glade + Fsed "window.Visible = true;" "" src/GnomeSubtitles/Core/GUI.cs + Fbuild Fbuild_gnome_scriptlet Fmonocleanup From bouleetbil at frogdev.info Fri Oct 3 18:48:06 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 3 18:48:09 2008 Subject: [Frugalware-git] bouleetbilgnome224: tomboy-0.12.0-2-i686 Message-ID: <20081003164806.DEF001190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=611c915224665cc163b90128f13746b5b17c2757 commit 611c915224665cc163b90128f13746b5b17c2757 Author: bouleetbil Date: Fri Oct 3 18:44:28 2008 +0200 tomboy-0.12.0-2-i686 *rebuild with gnome-desktop-sharp>=2.24.0-1 diff --git a/source/gnome-extra/tomboy/FrugalBuild b/source/gnome-extra/tomboy/FrugalBuild index b443d7d..77a1c0e 100644 --- a/source/gnome-extra/tomboy/FrugalBuild +++ b/source/gnome-extra/tomboy/FrugalBuild @@ -4,11 +4,11 @@ pkgname=tomboy pkgver=0.12.0 -pkgrel=1 +pkgrel=2 pkgdesc="A Wiki style desktop note-taking application" url="http://www.beatniksoftware.com/tomboy" depends=('gnome-sharp' 'gtkspell' 'gnome-panel>=2.20.0' 'galago-sharp' \ -'gmime>=2.2.10' 'ndesk-dbus' 'ndesk-dbus-glib') +'gmime>=2.2.10' 'ndesk-dbus' 'ndesk-dbus-glib' 'gnome-desktop-sharp>=2.24.0-1') makedepends=('intltool' 'gnome-doc-utils') groups=('gnome-extra') archs=('i686' 'x86_64') @@ -21,6 +21,10 @@ sha1sums=('48cda3ee4aaa108bccd12b141f41dd57fdaaef58') build() { Fmonoexport + #disable print preview "crash" + Fcd + Fsed "#include " "" Tomboy/Addins/PrintNotes/gedit-print.c + Fbuild_slice_scrollkeeper Fmake --disable-schemas-install --disable-scrollkeeper --enable-desktop-update=no --enable-dbus=yes Fmakeinstall GCONF_DISABLE_SCHEMA_INSTALL=1 From bouleetbil at frogdev.info Fri Oct 3 19:09:12 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 3 19:09:14 2008 Subject: [Frugalware-git] bouleetbilgnome224: monodevelop-1.0-8-i686 Message-ID: <20081003170912.C0DBC1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=f19434c006bef7909ad99efc56b0d9cceddcbea0 commit f19434c006bef7909ad99efc56b0d9cceddcbea0 Author: bouleetbil Date: Fri Oct 3 19:06:00 2008 +0200 monodevelop-1.0-8-i686 *rebuild with gnome-sharp>=2.24.0 diff --git a/source/gnome-extra/monodevelop/FrugalBuild b/source/gnome-extra/monodevelop/FrugalBuild index 9d5d8e1..25e4320 100644 --- a/source/gnome-extra/monodevelop/FrugalBuild +++ b/source/gnome-extra/monodevelop/FrugalBuild @@ -3,11 +3,11 @@ pkgname=monodevelop pkgver=1.0 -pkgrel=6 +pkgrel=8 pkgdesc="A project to port SharpDevelop to Gtk#" url="http://www.mono-project.com/" depends=('gecko-sharp' 'gtksourceview-sharp' 'shared-mime-info' \ - 'mono-tools>=1.2.6' 'firefox=3.0.2' 'gnome-sharp' 'mono>=1.2.6' \ + 'mono-tools>=1.2.6' 'firefox=3.0.3' 'gnome-sharp>=2.24.0' 'mono>=1.2.6' \ 'monodoc>=1.2.6' 'mono-addins') makedepends=('intltool' 'perl-xml-parser') groups=('gnome-extra') From bouleetbil at frogdev.info Fri Oct 3 22:13:16 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 3 22:13:17 2008 Subject: [Frugalware-git] bouleetbilgnome224: evolution-2.24.0-1-i686 Message-ID: <20081003201316.37D511190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=a37e065d9c105fdb0610b16653fa81a155d9aa29 commit a37e065d9c105fdb0610b16653fa81a155d9aa29 Author: bouleetbil Date: Fri Oct 3 22:00:49 2008 +0200 evolution-2.24.0-1-i686 *version bump diff --git a/source/gnome/evolution/FrugalBuild b/source/gnome/evolution/FrugalBuild index f5f8019..9bc2354 100644 --- a/source/gnome/evolution/FrugalBuild +++ b/source/gnome/evolution/FrugalBuild @@ -2,24 +2,26 @@ # Maintainer: Christian Hamar alias krix pkgname=evolution -pkgver=2.22.1.1 -pkgrel=5 +pkgver=2.24.0 +pkgrel=1 pkgdesc="Integrated mail, calendar and address book suite for GNOME" -depends=('gail>=1.20.1' 'gal>=2.5.3-3' 'evolution-data-server>=2.22.1.1' 'gtkhtml>=3.18.0' \ +depends=('gail>=1.20.1' 'gal>=2.5.3-3' 'evolution-data-server>=2.24.0' 'gtkhtml>=3.24.0' \ 'gnome-spell>=1.0.8' 'rarian' 'heimdal>=1.2.1' \ - 'evolution-data-server-ldap>=2.22.1.1' 'libbonobo>=2.22.0' 'nss>=3.12' 'nspr>=4.7.1' \ + 'evolution-data-server-ldap>=2.24.0' 'libbonobo>=2.24.0' 'nss>=3.12' 'nspr>=4.7.1' \ 'libnotify' 'gnome-pilot-conduits' 'db>=4.7.25') -makedepends=('intltool' 'gnome-doc-utils>=0.10.3' 'openldap' 'psmisc' 'gnome-common') +makedepends=('intltool' 'gnome-doc-utils>=0.14.0' 'openldap' 'psmisc' 'gnome-common') groups=('gnome') archs=('i686' 'x86_64' 'ppc') -_F_gnome_schemas=('/etc/gconf/schemas/apps_evolution_addressbook.schemas' - '/etc/gconf/schemas/apps-evolution-attachment-reder.schemas' - '/etc/gconf/schemas/apps_evolution_calendar.schemas' - '/etc/gconf/schemas/apps-evolution-mail-notification.schemas' - '/etc/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas' - '/etc/gconf/schemas/apps_evolution_shell.schemas' - '/etc/gconf/schemas/bogo-junk-plu.schemas' - '/etc/gconf/schemas/evolution-mail.schemas') +_F_gnome_schemas=('/etc/gconf/schemas/apps_evolution_addressbook.schemas' \ + '/etc/gconf/schemas/apps-evolution-attachment-reminder.schemas' \ + '/etc/gconf/schemas/apps_evolution_calendar.schemas' \ + '/etc/gconf/schemas/apps_evolution_email_custom_header.schemas' \ + '/etc/gconf/schemas/apps-evolution-mail-notification.schemas' \ + '/etc/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas' \ + '/etc/gconf/schemas/apps_evolution_shell.schemas' \ + '/etc/gconf/schemas/apps-evolution-template-placeholders.schemas' \ + '/etc/gconf/schemas/bogo-junk-plugin.schemas' \ + '/etc/gconf/schemas/evolution-mail.schemas') _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" @@ -70,6 +72,6 @@ build() { Fbuild_gnome_scriptlet } -sha1sums=('ea058e3b0885246bdf6628c47d807b49f14b4abd' \ +sha1sums=('fbfddbf242955f170a7597edf0ba1f36309f7092' \ '41988b2a14c10156b60a6000efc058c59248b5e2') # optimization OK From bouleetbil at frogdev.info Fri Oct 3 22:15:45 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 3 22:15:46 2008 Subject: [Frugalware-git] bouleetbilgnome224: fast-user-switch-applet-2.24.0-1-i686 Message-ID: <20081003201545.8194A1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=03dc044ff3fd47f182fa2295412d6882769e8f03 commit 03dc044ff3fd47f182fa2295412d6882769e8f03 Author: bouleetbil Date: Fri Oct 3 22:13:01 2008 +0200 fast-user-switch-applet-2.24.0-1-i686 *version bump *change m8r diff --git a/source/gnome/fast-user-switch-applet/FrugalBuild b/source/gnome/fast-user-switch-applet/FrugalBuild index 35503c0..251891a 100644 --- a/source/gnome/fast-user-switch-applet/FrugalBuild +++ b/source/gnome/fast-user-switch-applet/FrugalBuild @@ -1,19 +1,20 @@ # Compiling time: 1.99 SBU -# Maintainer: AlexExtreme +# Maintainer: bouleetbil +# Contributor: AlexExtreme pkgname=fast-user-switch-applet -pkgver=2.22.0 +pkgver=2.24.0 pkgrel=1 pkgdesc="Applet to allow you to switch between users without logging off" url="http://www.gnome.org" -depends=('gnome-panel>=2.22.0' 'gdm>=2.20.5' 'dbus-glib>=0.71-2') +depends=('gnome-panel>=2.24.0' 'gdm>=2.20.5' 'dbus-glib>=0.71-2') makedepends=('intltool' 'gnome-doc-utils') groups=('gnome') archs=('i686' 'x86_64') _F_gnome_schemas=('/etc/gconf/schemas/fast-user-switch-applet.schemas') _F_gnome_scrollkeeper="y" Finclude gnome gnome-scriptlet -sha1sums=('bc7e39edba559be5cb8e18b1aab7bf2554e55941') +sha1sums=('8f3c99fa18b8b0a666964174f832e961bb9b9520') build() { Fbuild_slice_scrollkeeper From bouleetbil at frogdev.info Fri Oct 3 22:28:00 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 3 22:28:01 2008 Subject: [Frugalware-git] bouleetbilgnome224: evolution-webcal-2.24.0-1-i686 Message-ID: <20081003202800.AC1231190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=408a39c3919e4de4f5d0954e701e2865167be80e commit 408a39c3919e4de4f5d0954e701e2865167be80e Author: bouleetbil Date: Fri Oct 3 22:25:35 2008 +0200 evolution-webcal-2.24.0-1-i686 *version bump *change m8r diff --git a/source/gnome-extra/evolution-webcal/FrugalBuild b/source/gnome-extra/evolution-webcal/FrugalBuild index a5813dd..59ad020 100644 --- a/source/gnome-extra/evolution-webcal/FrugalBuild +++ b/source/gnome-extra/evolution-webcal/FrugalBuild @@ -1,17 +1,19 @@ # Compiling time: 0.09 SBU -# Maintainer: AlexExtreme +# Maintainer: bouleetbil +# Contributor: AlexExtreme pkgname=evolution-webcal -pkgver=2.12.0 -pkgrel=2 +pkgver=2.24.0 +pkgrel=1 pkgdesc="Evolution web calendar" url="http://www.gnome.org/projects/evolution/" -depends=('evolution-data-server>=1.12.3' 'libsoup' 'libbonobo>=2.20.3') +depends=('evolution-data-server>=2.24.0' 'libsoup' 'libbonobo>=2.24.0-1') makedepends=('intltool') groups=('gnome-extra') archs=('i686' 'x86_64') _F_gnome_schemas=('/etc/gconf/schemas/evolution-webcal.schemas') Finclude gnome gnome-scriptlet options=('scriptlet' 'genscriptlet') -sha1sums=('8bdb0ea760e6e92aa19be99c33ed0aa3a2607c89') +sha1sums=('0cd859d2d008e5b3c6cc8e83bb1c21f23e90a312') + # optimization OK From bouleetbil at frogdev.info Fri Oct 3 22:43:58 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 3 22:43:59 2008 Subject: [Frugalware-git] bouleetbilgnome224: evolution-sharp-0.18.0-1-i686 Message-ID: <20081003204358.77D361190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=590e0d93ac2836fec829a7c87fed498dcfaa592a commit 590e0d93ac2836fec829a7c87fed498dcfaa592a Author: bouleetbil Date: Fri Oct 3 22:41:32 2008 +0200 evolution-sharp-0.18.0-1-i686 *version bump *change m8r diff --git a/source/gnome-extra/evolution-sharp/FrugalBuild b/source/gnome-extra/evolution-sharp/FrugalBuild index 104684d..86934e9 100644 --- a/source/gnome-extra/evolution-sharp/FrugalBuild +++ b/source/gnome-extra/evolution-sharp/FrugalBuild @@ -1,23 +1,19 @@ # Compiling Time: 0.24 SBU -# Maintainer: AlexExtreme +# Maintainer: bouleetbil +# Contributor: AlexExtreme pkgname=evolution-sharp -pkgver=0.17.3 +pkgver=0.18.0 pkgrel=1 pkgdesc="Mono bindings for evolution." url="http://www.gnome.org" -depends=('gtk2-sharp>=2.12.1' 'atk>=1.22.0' 'libsm' 'evolution>=2.22.1.1' 'gnome-sharp>=2.20.1') +depends=('gtk2-sharp>=2.12.4' 'atk>=1.22.0' 'libsm' 'evolution>=2.24.0' 'gnome-sharp>=2.24.0') makedepends=('pkgconfig') _F_gnome_devel="y" +_F_mono_aot=0 Finclude gnome mono groups=('gnome-extra') archs=('i686' 'x86_64') -sha1sums=('185aceaac89c154cacfdb5354ca0dd74432cf6f9') - -build() { - Fmonoexport - Fbuild - Fmonocleanup -} +sha1sums=('c07880cc5f57944956c753bc63fec5171b4ce815') # optimization OK From bouleetbil at frogdev.info Fri Oct 3 23:03:38 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 3 23:03:40 2008 Subject: [Frugalware-git] bouleetbilgnome224: evolution-exchange-2.24.0-1-i686 Message-ID: <20081003210338.AE03C1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=6c247247471ddbb69af9620875df4aa4e7d8686b commit 6c247247471ddbb69af9620875df4aa4e7d8686b Author: bouleetbil Date: Fri Oct 3 23:01:01 2008 +0200 evolution-exchange-2.24.0-1-i686 *version bump diff --git a/source/gnome/evolution-exchange/FrugalBuild b/source/gnome/evolution-exchange/FrugalBuild index c9b8e63..0eb23eb 100644 --- a/source/gnome/evolution-exchange/FrugalBuild +++ b/source/gnome/evolution-exchange/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Christian Hamar alias krix pkgname=evolution-exchange -pkgver=2.22.1.2 +pkgver=2.24.0 pkgrel=1 pkgdesc="Ximian Connector for Microsoft Exchange, which adds support for Microsoft Exchange 2000 and 2003 to Evolution." -depends=('gtkhtml>=3.18.0' 'evolution-data-server>=2.22.1.1' 'evolution>=2.22.1.1' 'libsoup>=2.4.0' \ - 'evolution-data-server-ldap>=2.22.1.1') +depends=('gtkhtml>=3.24.0' 'evolution-data-server>=2.24.0' 'evolution>=2.24.0' 'libsoup>=2.24.0' \ + 'evolution-data-server-ldap>=2.24.0') makedepends=('gtk-doc>=1.9' 'perl-xml-parser' 'openldap' 'intltool') groups=('gnome') archs=('i686' 'x86_64' 'ppc') @@ -14,5 +14,5 @@ Finclude gnome url="http://www.gnome.org/projects/evolution/" Fconfopts="$Fconfopts --enable-gtk-doc" -sha1sums=('f30b1a465872e8e39c26b70463d2601d6710743f') +sha1sums=('983b413e6fb24c8177db17bc36c93b715b7f2c2c') # optimization OK From bouleetbil at frogdev.info Fri Oct 3 23:42:37 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 3 23:42:39 2008 Subject: [Frugalware-git] bouleetbilgnome224: gdm-2.20.5-2-i686 Message-ID: <20081003214237.B27DB1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=9cc46d134b1d64e52c872a8ca43bfcde4c93655b commit 9cc46d134b1d64e52c872a8ca43bfcde4c93655b Author: bouleetbil Date: Fri Oct 3 23:39:30 2008 +0200 gdm-2.20.5-2-i686 *update theme diff --git a/source/gnome/gdm/FrugalBuild b/source/gnome/gdm/FrugalBuild index d7cd8ed..1b2a1de 100644 --- a/source/gnome/gdm/FrugalBuild +++ b/source/gnome/gdm/FrugalBuild @@ -3,11 +3,11 @@ pkgname=gdm pkgver=2.20.5 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME Display Manager" url="http://www.gnome.org/" backup=(etc/gdm/custom.conf) -depends=('zenity>=2.22.0' 'libgnomeui>=2.22.0' 'libxi' 'fontconfig' 'libxrandr>=1.2.2' 'librsvg>=2.20.0' \ +depends=('zenity>=2.24.0' 'libgnomeui>=2.24.0' 'libxi' 'fontconfig' 'libxrandr>=1.2.2' 'librsvg>=2.20.0' \ 'libxinerama' 'libxcursor' 'libxevie' 'xorg-server>=1.4.0.90-4') rodepends=('xsm' 'sessreg' 'gksu' 'xmessage') makedepends=('intltool' 'gnome-doc-utils') @@ -21,12 +21,12 @@ options=(${options[@]} 'force') source=(${source[@]} $pkgname-2.20.1-gdmconf.patch \ $pkgname-gksu_categories.patch \ fix_reboot_path.patch \ - http://ftp.frugalware.org/pub/other/artwork/gdm-theme/GDM-Frugalware-0.7.tar.bz2) + http://ftp.frugalware.org/pub/other/artwork/gdm-theme/GDM-Frugalware-1.0.tar.bz2) sha1sums=('04d92b6b9a8c005b4a687d477b813bb4a357abd6' \ 'db576eb16baa10c95ce7143c5696594ee7b07744' \ '9665399f5ceaee25e5807f08c53456d5ac2a81fa' \ 'b602b6805d1d4787e4404827abf3d6f346843317' \ - 'b13852bf7ce59df5d02f27b3603e274fba3e074d') + 'b51f5b7654d9314367f27ed655b204d23c966f6d') build() { From priyank at frugalware.org Sat Oct 4 09:12:44 2008 From: priyank at frugalware.org (Priyank) Date: Sat Oct 4 09:12:47 2008 Subject: [Frugalware-git] xfce46: xfce4-dev-tools-4.5.90-1-i686 Message-ID: <20081004071244.ABD711190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=d33ee20a26e57fa423d3cdca67df293e324b8750 commit d33ee20a26e57fa423d3cdca67df293e324b8750 Author: Priyank Date: Sat Oct 4 12:41:12 2008 +0530 xfce4-dev-tools-4.5.90-1-i686 * Version bump (Xfce 4.6 alpha) diff --git a/source/xfce4/xfce4-dev-tools/FrugalBuild b/source/xfce4/xfce4-dev-tools/FrugalBuild index 761ba31..8b5dfbe 100644 --- a/source/xfce4/xfce4-dev-tools/FrugalBuild +++ b/source/xfce4/xfce4-dev-tools/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Priyank Gosalia pkgname=xfce4-dev-tools -pkgver=4.4.0.1 +pkgver=4.5.90 pkgrel=1 pkgdesc="Xfce4 developer tools." depends=('intltool') groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64') Finclude xfce4 -sha1sums=('4577d204087f7fe58228fc2f4140001d9b97b493') +sha1sums=('e7cdb4601f605f67305a289caa3562c8e8d2e9ad') # optimization OK From priyank at frugalware.org Sat Oct 4 11:00:37 2008 From: priyank at frugalware.org (Priyank) Date: Sat Oct 4 11:00:40 2008 Subject: [Frugalware-git] frugalware-current: bsddb3-4.7.3-1-i686 Message-ID: <20081004090037.3CF8C1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8d956d7ffbe2053918ce71c7bcd88504c1af4b32 commit 8d956d7ffbe2053918ce71c7bcd88504c1af4b32 Author: Priyank Date: Sat Oct 4 14:28:33 2008 +0530 bsddb3-4.7.3-1-i686 * Version bump diff --git a/source/devel-extra/bsddb3/FrugalBuild b/source/devel-extra/bsddb3/FrugalBuild index 1c14a9d..6694f13 100644 --- a/source/devel-extra/bsddb3/FrugalBuild +++ b/source/devel-extra/bsddb3/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: bouleetbil pkgname=bsddb3 -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Python bindings for BerkeleyDB" url="http://www.jcea.es/programacion/pybsddb.htm" @@ -14,6 +14,6 @@ archs=('i686' 'x86_64') urldownload="http://pypi.python.org/packages/source/${pkgname:0:1}/$pkgname" source=($urldownload/$pkgname-$pkgver.tar.gz) up2date="lynx -dump $urldownload | Flasttar" -sha1sums=('0bd5c9bb9a10b70e03498c303cac2c563daacdf5') +sha1sums=('6f7623c5e96fcbdf5e1b5e8a3611aaaa9e2b6ea6') # optimization OK From priyank at frugalware.org Sat Oct 4 11:05:20 2008 From: priyank at frugalware.org (Priyank) Date: Sat Oct 4 11:05:21 2008 Subject: [Frugalware-git] frugalware-current: pyyaml-3.06-1-i686 Message-ID: <20081004090520.10FA91190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=28e4e89f6bd19443e80cd0e3bc5a82bbf2431b15 commit 28e4e89f6bd19443e80cd0e3bc5a82bbf2431b15 Author: Priyank Date: Sat Oct 4 14:33:43 2008 +0530 pyyaml-3.06-1-i686 * Version bump diff --git a/source/devel-extra/pyyaml/FrugalBuild b/source/devel-extra/pyyaml/FrugalBuild index 4a85371..721b2b7 100644 --- a/source/devel-extra/pyyaml/FrugalBuild +++ b/source/devel-extra/pyyaml/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: free-zombie pkgname=pyyaml -pkgver=3.05 +pkgver=3.06 pkgrel=1 pkgdesc="a complete python YAML 1.1 parser" url="http://pyyaml.org/wiki/PyYAML" @@ -13,6 +13,6 @@ archs=('i686' 'x86_64') up2date="lynx -dump $url | grep -m1 'current stable' | sed 's/.*: \(.*\)./\1/'" source=(http://pyyaml.org/download/pyyaml/PyYAML-$pkgver.tar.gz) _F_cd_path="PyYAML-$pkgver" -sha1sums=('facf11bc9f6988b76538e46a7ce8a379a9296cb0') +sha1sums=('c31ee801ce220a9416ac822524e785b2a2b3038c') # optimization OK From priyank at frugalware.org Sat Oct 4 11:11:24 2008 From: priyank at frugalware.org (Priyank) Date: Sat Oct 4 11:11:25 2008 Subject: [Frugalware-git] frugalware-current: python-logilab-common-0.35.2-1-i686 Message-ID: <20081004091124.619141190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9dff011c95cb9075cd932dfebc93f60733208cc6 commit 9dff011c95cb9075cd932dfebc93f60733208cc6 Author: Priyank Date: Sat Oct 4 14:39:34 2008 +0530 python-logilab-common-0.35.2-1-i686 * Version bump diff --git a/source/devel-extra/python-logilab-common/FrugalBuild b/source/devel-extra/python-logilab-common/FrugalBuild index 83d0e4b..f29ffae 100644 --- a/source/devel-extra/python-logilab-common/FrugalBuild +++ b/source/devel-extra/python-logilab-common/FrugalBuild @@ -4,7 +4,7 @@ pkgname=python-logilab-common _F_archive_name=logilab-common -pkgver=0.35.1 +pkgver=0.35.2 pkgrel=1 pkgdesc="Providing low level functionalities needed for logilab python programs." url="http://www.logilab.org/projects/common/project_view" @@ -14,5 +14,5 @@ archs=('i686' 'x86_64') up2date="lynx -dump http://www.logilab.org/ftp/pub/common | Flasttar" source=(ftp://ftp.logilab.org/pub/common/logilab-common-$pkgver.tar.gz) _F_cd_path=logilab-common-$pkgver -sha1sums=('98c4aee73edeb8170894ff694304c13e839f378b') +sha1sums=('c25d2ef6bda0ced8450bb32dfa1d606b9d687bce') From voroskoi at frugalware.org Sat Oct 4 12:34:47 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sat Oct 4 12:34:49 2008 Subject: [Frugalware-git] frugalware-current: octave-control-1.0.7-1-i686 Message-ID: <20081004103447.73FC71190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4ea98807ea4fc2f127eedf0c4590e95b60f1f12a commit 4ea98807ea4fc2f127eedf0c4590e95b60f1f12a Author: voroskoi Date: Sat Oct 4 12:34:28 2008 +0200 octave-control-1.0.7-1-i686 version bump diff --git a/source/apps-extra/octave-control/FrugalBuild b/source/apps-extra/octave-control/FrugalBuild index 9b13d92..217b893 100644 --- a/source/apps-extra/octave-control/FrugalBuild +++ b/source/apps-extra/octave-control/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=octave-control -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=1 pkgdesc="Additional Octave Control tools." _F_sourceforge_dirname="octave" @@ -11,4 +11,4 @@ Finclude sourceforge octave depends=('octave>=3.0.0') groups=('apps-extra') archs=('i686' 'x86_64') -sha1sums=('88c829f6efcb00907ed23af93d00b00a4ac41d42') +sha1sums=('46afbcde048d75cbeb29b5adf469a54e33025dfc') From voroskoi at frugalware.org Sat Oct 4 12:39:52 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sat Oct 4 12:39:53 2008 Subject: [Frugalware-git] frugalware-current: octave-image-1.0.8-1-i686 Message-ID: <20081004103952.8A3741190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c369a04ef83ff971dde2c8e55106f260873bc36b commit c369a04ef83ff971dde2c8e55106f260873bc36b Author: voroskoi Date: Sat Oct 4 12:39:39 2008 +0200 octave-image-1.0.8-1-i686 version bump diff --git a/source/apps-extra/octave-image/FrugalBuild b/source/apps-extra/octave-image/FrugalBuild index cea2fae..1cd1242 100644 --- a/source/apps-extra/octave-image/FrugalBuild +++ b/source/apps-extra/octave-image/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=octave-image -pkgver=1.0.6 +pkgver=1.0.8 pkgrel=1 pkgdesc="The Octave-forge Image package provides functions for reading, writing, and processing images." _F_sourceforge_dirname="octave" @@ -12,4 +12,4 @@ depends=('octave>=3.0.0') rodepends=('imagemagick') groups=('apps-extra') archs=('i686' 'x86_64') -sha1sums=('ad687816449f4ad802812dbcd994068ada5790b5') +sha1sums=('e90c9435b4bffa787dc2bdba9177340ab5a9f987') From voroskoi at frugalware.org Sat Oct 4 12:43:27 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sat Oct 4 12:43:29 2008 Subject: [Frugalware-git] frugalware-current: octave-audio-1.1.2-1-i686 Message-ID: <20081004104327.EC33C1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ffe96846d4725f6c18c9dc26465a435997f61262 commit ffe96846d4725f6c18c9dc26465a435997f61262 Author: voroskoi Date: Sat Oct 4 12:43:15 2008 +0200 octave-audio-1.1.2-1-i686 version bump diff --git a/source/apps-extra/octave-audio/FrugalBuild b/source/apps-extra/octave-audio/FrugalBuild index f38c09f..4dd0941 100644 --- a/source/apps-extra/octave-audio/FrugalBuild +++ b/source/apps-extra/octave-audio/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=octave-audio -pkgver=1.1.1 +pkgver=1.1.2 pkgrel=1 pkgdesc="Audio recording, processing and playing tools for octave." _F_sourceforge_dirname="octave" @@ -11,6 +11,6 @@ Finclude sourceforge octave depends=('octave>=3.0.0') groups=('apps-extra') archs=('i686' 'x86_64') -sha1sums=('77b09e207f9095eab899be737799f557669b1011') +sha1sums=('751a88ec0f0ecf7586f9b52679ec390e2eeed57e') # optimization OK From voroskoi at frugalware.org Sat Oct 4 12:48:50 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sat Oct 4 12:48:51 2008 Subject: [Frugalware-git] frugalware-current: octave-gsl-1.0.7-1-i686 Message-ID: <20081004104850.36EAD1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6c7f1b6d7692f8506cf43bfd156bd1fc8db9bf1d commit 6c7f1b6d7692f8506cf43bfd156bd1fc8db9bf1d Author: voroskoi Date: Sat Oct 4 12:48:37 2008 +0200 octave-gsl-1.0.7-1-i686 version bump diff --git a/source/apps-extra/octave-gsl/FrugalBuild b/source/apps-extra/octave-gsl/FrugalBuild index df931e4..3476986 100644 --- a/source/apps-extra/octave-gsl/FrugalBuild +++ b/source/apps-extra/octave-gsl/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=octave-gsl -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=1 pkgdesc="Octave bindings to the GNU Scientific Library." _F_sourceforge_dirname="octave" @@ -11,6 +11,6 @@ Finclude sourceforge octave depends=('octave>=3.0.0' 'gsl') groups=('apps-extra') archs=('i686' 'x86_64') -sha1sums=('1831091d50501e1ae531d64431fa60343ad01300') +sha1sums=('8aed795a7b921328e4ff60abdea303e742034c97') # optimization OK From voroskoi at frugalware.org Sat Oct 4 12:52:53 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sat Oct 4 12:52:54 2008 Subject: [Frugalware-git] frugalware-current: octave-ident-1.0.6-1-i686 Message-ID: <20081004105253.285741190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=820355dfcd9e952cc7a04b9c2debc12ef8393d97 commit 820355dfcd9e952cc7a04b9c2debc12ef8393d97 Author: voroskoi Date: Sat Oct 4 12:52:37 2008 +0200 octave-ident-1.0.6-1-i686 version bump diff --git a/source/apps-extra/octave-ident/FrugalBuild b/source/apps-extra/octave-ident/FrugalBuild index ae80f25..480f083 100644 --- a/source/apps-extra/octave-ident/FrugalBuild +++ b/source/apps-extra/octave-ident/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=octave-ident -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 pkgdesc="Addition System Indentification Control functions." _F_sourceforge_dirname="octave" @@ -11,4 +11,4 @@ Finclude sourceforge octave depends=('octave>=3.0.0') groups=('apps-extra') archs=('i686' 'x86_64') -sha1sums=('fed4faf8d9dfe1fcf9a6ce6b88e1b44f4a7adea9') +sha1sums=('268b7db33f3af7dc7213021dc5233dd596f0ff5b') From voroskoi at frugalware.org Sat Oct 4 12:59:03 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sat Oct 4 12:59:05 2008 Subject: [Frugalware-git] frugalware-current: octave-communications-1.0.8-1-i686 Message-ID: <20081004105903.BE9B61190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=da44b70da21844f963bc3d1849c619688ee39c84 commit da44b70da21844f963bc3d1849c619688ee39c84 Author: voroskoi Date: Sat Oct 4 12:58:48 2008 +0200 octave-communications-1.0.8-1-i686 version bump diff --git a/source/apps-extra/octave-communications/FrugalBuild b/source/apps-extra/octave-communications/FrugalBuild index d19d968..c0c4c12 100644 --- a/source/apps-extra/octave-communications/FrugalBuild +++ b/source/apps-extra/octave-communications/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=octave-communications -pkgver=1.0.6 +pkgver=1.0.8 pkgrel=1 pkgdesc="Digital Communications, Error Correcting Codes (Channel Code), Source Code functions, Modulation and Galois Fields" _F_sourceforge_dirname="octave" @@ -12,6 +12,6 @@ up2date="lynx -dump http://octave.sourceforge.net/comm/index.html |grep Version depends=('octave>=3.0.0') groups=('apps-extra') archs=('i686' 'x86_64') -sha1sums=('48a87125cbcdd55a273f381bba86e343927a8d8a') +sha1sums=('5e90d458475cee6bae346e4d84166b9466998338') # optimization OK From voroskoi at frugalware.org Sat Oct 4 13:02:10 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sat Oct 4 13:02:11 2008 Subject: [Frugalware-git] frugalware-current: octave-info-theory-0.1.6-1-i686 Message-ID: <20081004110210.6D6071190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=90b1618eaac281423e3c4ed12f4e69d7775782e1 commit 90b1618eaac281423e3c4ed12f4e69d7775782e1 Author: voroskoi Date: Sat Oct 4 13:01:47 2008 +0200 octave-info-theory-0.1.6-1-i686 version bump diff --git a/source/apps-extra/octave-info-theory/FrugalBuild b/source/apps-extra/octave-info-theory/FrugalBuild index a3b888b..b83b9c8 100644 --- a/source/apps-extra/octave-info-theory/FrugalBuild +++ b/source/apps-extra/octave-info-theory/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=octave-info-theory -pkgver=0.1.5 +pkgver=0.1.6 pkgrel=1 pkgdesc="Functions and routines for basic Information Theory definitions, and source coding." _F_sourceforge_dirname="octave" @@ -11,4 +11,4 @@ Finclude sourceforge octave depends=('octave>=3.0.0') groups=('apps-extra') archs=('i686' 'x86_64') -sha1sums=('9be41a929f10115b200f3ee3296230b8af480c52') +sha1sums=('f73465d3ff263f94a146afe80df1bc4e60a36063') From voroskoi at frugalware.org Sat Oct 4 13:05:54 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sat Oct 4 13:05:55 2008 Subject: [Frugalware-git] frugalware-current: octave-econometrics-1.0.7-1-i686 Message-ID: <20081004110554.DDDF71190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d94e6e2df5fadae4236517742ef989500bee7c44 commit d94e6e2df5fadae4236517742ef989500bee7c44 Author: voroskoi Date: Sat Oct 4 13:05:17 2008 +0200 octave-econometrics-1.0.7-1-i686 version bump diff --git a/source/apps-extra/octave-econometrics/FrugalBuild b/source/apps-extra/octave-econometrics/FrugalBuild index 038a933..96b9b79 100644 --- a/source/apps-extra/octave-econometrics/FrugalBuild +++ b/source/apps-extra/octave-econometrics/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=octave-econometrics -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=1 pkgdesc="Econometrics functions including MLE and GMM based techniques for octave." _F_sourceforge_dirname="octave" @@ -11,4 +11,4 @@ Finclude sourceforge octave depends=('octave>=3.0.0') groups=('apps-extra') archs=('i686' 'x86_64') -sha1sums=('ad7acca93a9ac0c3b7d25ec38f358c99cfd713ff') +sha1sums=('9b057c00770e2449af98f271a8c1c3462722b614') From voroskoi at frugalware.org Sat Oct 4 13:20:52 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sat Oct 4 13:20:53 2008 Subject: [Frugalware-git] frugalware-current: octave-fixed-0.7.8-1-i686 Message-ID: <20081004112052.1EFA51190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d5dcd132efaceee32fe5d6d9c865b085eb019595 commit d5dcd132efaceee32fe5d6d9c865b085eb019595 Author: voroskoi Date: Sat Oct 4 13:20:39 2008 +0200 octave-fixed-0.7.8-1-i686 version bump diff --git a/source/apps-extra/octave-fixed/FrugalBuild b/source/apps-extra/octave-fixed/FrugalBuild index 9f1719e..80d6004 100644 --- a/source/apps-extra/octave-fixed/FrugalBuild +++ b/source/apps-extra/octave-fixed/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=octave-fixed -pkgver=0.7.6 +pkgver=0.7.8 pkgrel=1 pkgdesc="Fixed point real and complex matrix toolbox for octave." _F_sourceforge_dirname="octave" @@ -11,6 +11,6 @@ Finclude sourceforge octave depends=('octave>=3.0.0') groups=('apps-extra') archs=('i686' 'x86_64') -sha1sums=('3ec4d51f9f0ed3c908b9022e3695ce6125f6eea8') +sha1sums=('3f4be8bfb940162fc3ffc31a8676213dea3d333e') # optimization OK From voroskoi at frugalware.org Sat Oct 4 13:24:01 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sat Oct 4 13:24:02 2008 Subject: [Frugalware-git] frugalware-current: octave-ga-0.9.4-1-i686 Message-ID: <20081004112401.4843A1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5211a096aa466a8174c3a491a89af522c09d8199 commit 5211a096aa466a8174c3a491a89af522c09d8199 Author: voroskoi Date: Sat Oct 4 13:23:47 2008 +0200 octave-ga-0.9.4-1-i686 version bump diff --git a/source/apps-extra/octave-ga/FrugalBuild b/source/apps-extra/octave-ga/FrugalBuild index ff4e93f..e238b43 100644 --- a/source/apps-extra/octave-ga/FrugalBuild +++ b/source/apps-extra/octave-ga/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=octave-ga -pkgver=0.1.1 +pkgver=0.9.4 pkgrel=1 pkgdesc="Genetic optimization code." _F_sourceforge_dirname="octave" @@ -11,4 +11,4 @@ Finclude sourceforge octave depends=('octave>=3.0.0') groups=('apps-extra') archs=('i686' 'x86_64') -sha1sums=('aa6869c144612914ac547f8e5fc2f84d4e8ade4a') +sha1sums=('08844eaca6f5da55171362997c225633c540f249') From voroskoi at frugalware.org Sat Oct 4 13:27:14 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sat Oct 4 13:27:15 2008 Subject: [Frugalware-git] frugalware-current: octave-general-1.0.7-1-i686 Message-ID: <20081004112714.2A5C81190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d1a6953a3851ed14875fef120407dd96f9b7557b commit d1a6953a3851ed14875fef120407dd96f9b7557b Author: voroskoi Date: Sat Oct 4 13:26:39 2008 +0200 octave-general-1.0.7-1-i686 version bump diff --git a/source/apps-extra/octave-general/FrugalBuild b/source/apps-extra/octave-general/FrugalBuild index f533816..19d7b31 100644 --- a/source/apps-extra/octave-general/FrugalBuild +++ b/source/apps-extra/octave-general/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=octave-general -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=1 pkgdesc="General tools for octave." _F_sourceforge_dirname="octave" @@ -11,4 +11,4 @@ Finclude sourceforge octave depends=('octave>=3.0.0') groups=('apps-extra') archs=('i686' 'x86_64') -sha1sums=('57b36d09bba2a3aafd29d6e1127b98f002ee9f59') +sha1sums=('5efd43bca7ce8c5c6afb1ebf29f74df076813c55') From voroskoi at frugalware.org Sat Oct 4 13:29:28 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sat Oct 4 13:29:31 2008 Subject: [Frugalware-git] frugalware-current: octave-combinatorics-1.0.7-1-i686 Message-ID: <20081004112928.C86941190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fc908bd0034b4045da0112933b685be331a66d46 commit fc908bd0034b4045da0112933b685be331a66d46 Author: voroskoi Date: Sat Oct 4 13:29:16 2008 +0200 octave-combinatorics-1.0.7-1-i686 version bump diff --git a/source/apps-extra/octave-combinatorics/FrugalBuild b/source/apps-extra/octave-combinatorics/FrugalBuild index 54abdb7..e93c136 100644 --- a/source/apps-extra/octave-combinatorics/FrugalBuild +++ b/source/apps-extra/octave-combinatorics/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=octave-combinatorics -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=1 pkgdesc="Combinatorics functions, incuding partitioning for octave." _F_sourceforge_dirname="octave" @@ -11,4 +11,4 @@ Finclude sourceforge octave depends=('octave>=3.0.0') groups=('apps-extra') archs=('i686' 'x86_64') -sha1sums=('c2a1ced20fabc83e654016d089d600ad884cdb44') +sha1sums=('e8f48209c617fdbe8657b1453e91327506d3bb6e') From voroskoi at frugalware.org Sat Oct 4 13:36:49 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sat Oct 4 13:36:49 2008 Subject: [Frugalware-git] frugalware-current: octave-database-1.0-2-i686 Message-ID: <20081004113649.0E0FF1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7b374343800e1d51be20d8bb0bf13fe2cd7d3cba commit 7b374343800e1d51be20d8bb0bf13fe2cd7d3cba Author: voroskoi Date: Sat Oct 4 13:36:38 2008 +0200 octave-database-1.0-2-i686 fixed up2date diff --git a/source/apps-extra/octave-database/FrugalBuild b/source/apps-extra/octave-database/FrugalBuild index 01c1892..a50b19f 100644 --- a/source/apps-extra/octave-database/FrugalBuild +++ b/source/apps-extra/octave-database/FrugalBuild @@ -8,7 +8,6 @@ pkgdesc="These are bindings that allow SQL queries and other database operations _F_sourceforge_dirname="octave" _F_sourceforge_name="database" Finclude sourceforge octave -up2date="lynx -dump http://octave.sourceforge.net/database/index.html |grep Version |sed 's/^.*\([0-9].[0-9]\)/\1/'" makedepends=('mysql') depends=('octave>=3.0.0' 'sqlite3' 'libmysqlclient') groups=('apps-extra') From voroskoi at frugalware.org Sat Oct 4 13:41:10 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sat Oct 4 13:41:11 2008 Subject: [Frugalware-git] frugalware-current: cracklib-2.8.13-1-i686 Message-ID: <20081004114110.6E3151190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=76d8496b7ab0ac2e15add9128b8923e8d7102313 commit 76d8496b7ab0ac2e15add9128b8923e8d7102313 Author: voroskoi Date: Sat Oct 4 13:40:37 2008 +0200 cracklib-2.8.13-1-i686 version bump diff --git a/source/lib-extra/cracklib/FrugalBuild b/source/lib-extra/cracklib/FrugalBuild index 1f7d71d..2aeaeb4 100644 --- a/source/lib-extra/cracklib/FrugalBuild +++ b/source/lib-extra/cracklib/FrugalBuild @@ -2,18 +2,18 @@ # Maintainer: voroskoi pkgname=cracklib -pkgver=2.8.12 +pkgver=2.8.13 pkgrel=1 pkgdesc="Next generation version of libCrack password checking library." depends=('glibc') groups=('lib-extra') archs=('i686' 'x86_64') Finclude sourceforge +sha1sums=('e107d0a14c09aea9c63c18840db8b94b972b5315') build() { Fbuild --with-default-dict='$(libdir)/cracklib_dict' Ffilerel dicts/cracklib-small /usr/share/dict/cracklib-small } -sha1sums=('0a77b21366cfbad675e6e44642026c89b87f41ce') # optimization OK From voroskoi at frugalware.org Sat Oct 4 13:53:51 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sat Oct 4 13:53:54 2008 Subject: [Frugalware-git] frugalware-current: jbigkit-2.0-1-i686 Message-ID: <20081004115351.C50771190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b26fea8342c567582f7cab57bbc80a3793822f14 commit b26fea8342c567582f7cab57bbc80a3793822f14 Author: voroskoi Date: Sat Oct 4 13:53:24 2008 +0200 jbigkit-2.0-1-i686 version bump diff --git a/source/lib-extra/jbigkit/FrugalBuild b/source/lib-extra/jbigkit/FrugalBuild index 0aa466b..267181b 100644 --- a/source/lib-extra/jbigkit/FrugalBuild +++ b/source/lib-extra/jbigkit/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=jbigkit -pkgver=1.6 +pkgver=2.0 pkgrel=1 url="http://www.cl.cam.ac.uk/~mgk25/jbigkit/" pkgdesc="JBIG-KIT implements a highly effective data compression algorithm for bi-level high-resolution images such as fax pages or scanned documents." @@ -12,7 +12,7 @@ archs=('i686' 'x86_64') _F_archive_nosort=1 up2date="lynx -dump http://www.cl.cam.ac.uk/~mgk25/download/ |Flasttar" source=(http://www.cl.cam.ac.uk/~mgk25/download/${pkgname}-${pkgver}.tar.gz) -sha1sums=('f401df793d91a1cc123bbf1387d39d4f0e73b272') +sha1sums=('cfb7d3121f02a74bfb229217858a0d149b6589ef') _F_cd_path=${pkgname} build() { From voroskoi at frugalware.org Sat Oct 4 14:19:23 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sat Oct 4 14:19:25 2008 Subject: [Frugalware-git] frugalware-current: samba-3.0.32-1-i686 Message-ID: <20081004121923.7DBB11190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c2bc5b5d8609a8b5827675c53f6f606e514eb45d commit c2bc5b5d8609a8b5827675c53f6f606e514eb45d Author: voroskoi Date: Sat Oct 4 14:18:57 2008 +0200 samba-3.0.32-1-i686 version bump diff --git a/source/network/samba/FrugalBuild b/source/network/samba/FrugalBuild index 75cb31b..aeafa83 100644 --- a/source/network/samba/FrugalBuild +++ b/source/network/samba/FrugalBuild @@ -3,9 +3,9 @@ # Contributor: VMiklos pkgname=samba -pkgver=3.0.31 +pkgver=3.0.32 pkgextraver= -pkgrel=2 +pkgrel=1 pkgdesc="SMB file and print server." url="http://www.samba.org" backup=(etc/logrotate.d/samba) @@ -87,7 +87,7 @@ build() Fsplit samba-swat usr/sbin/swat Fsplit samba-swat usr/share/swat } -sha1sums=('0f13fcf69072b40340c00e9bcf4af13670efffd3' \ +sha1sums=('bcbcff2c00a7cec07886de184d8761fd8b424810' \ '13fd371189bfe637f3f13c62d44d9e761268119e' \ '0e407642fe6aa0c032df38aac3815eb08f07e35b' \ '879259c707325706dac3f04d83bc80feb1dd18fe') From voroskoi at frugalware.org Sat Oct 4 14:24:36 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sat Oct 4 14:24:38 2008 Subject: [Frugalware-git] frugalware-current: samba-3.0.32-1-i686 Message-ID: <20081004122436.EFB441190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=33260f3258592f628c35979bc8b9bd90822a67a2 commit 33260f3258592f628c35979bc8b9bd90822a67a2 Author: voroskoi Date: Sat Oct 4 14:23:55 2008 +0200 samba-3.0.32-1-i686 fixed up2date diff --git a/source/network/samba/FrugalBuild b/source/network/samba/FrugalBuild index aeafa83..788dda8 100644 --- a/source/network/samba/FrugalBuild +++ b/source/network/samba/FrugalBuild @@ -14,7 +14,7 @@ makedepends=('openldap') rodepends=("samba-client=$pkgver") groups=('network') archs=('i686' 'x86_64' 'ppc') -up2date="lynx -dump http://ftp.samba.org/samba/ftp|grep tar.gz$|sed 's/.*-\(.*\)\.t.*/\1/;s/$pkgextraver//;q'" +up2date="lynx -dump http://samba.org/samba/ftp/stable/ |Flasttar" source=(http://ftp.samba.org/samba/ftp/stable/$pkgname-$pkgver$pkgextraver.tar.gz samba.logrotate rc.samba Fix_Headers226.diff) subpkgs=('libsmbclient' 'samba-client' 'samba-swat') From voroskoi at frugalware.org Sat Oct 4 14:43:07 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sat Oct 4 14:43:08 2008 Subject: [Frugalware-git] frugalware-current: gkrellm-2.3.2-1-i686 Message-ID: <20081004124307.ACD5D1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=42ea829d98cfac5eaa874e74300844e78bff51c3 commit 42ea829d98cfac5eaa874e74300844e78bff51c3 Author: voroskoi Date: Sat Oct 4 14:42:32 2008 +0200 gkrellm-2.3.2-1-i686 version bump diff --git a/source/xapps/gkrellm/FrugalBuild b/source/xapps/gkrellm/FrugalBuild index c9862b6..61f3c36 100644 --- a/source/xapps/gkrellm/FrugalBuild +++ b/source/xapps/gkrellm/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=gkrellm -pkgver=2.3.1 +pkgver=2.3.2 pkgrel=1 pkgdesc="GKrellM is a single process stack of system monitors" url="http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html" @@ -12,7 +12,7 @@ groups=('xapps') archs=('i686' 'x86_64') up2date="lynx -dump 'http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html'|grep .tar.bz2$|sed -n 's/.*lm-\(.*\).t.*/\1/;1 p'" source=(http://members.dslextreme.com/users/billw/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('f5e8206aeee93f5b3a6afff9cc55c58e9d511f56') +sha1sums=('fe94996c4fe084c28bf7a7fbc3f8d4fd64724ac0') build() { From priyank at frugalware.org Sat Oct 4 15:25:37 2008 From: priyank at frugalware.org (Priyank) Date: Sat Oct 4 15:25:39 2008 Subject: [Frugalware-git] frugalware-current: sakura-2.3.0-1-i686 Message-ID: <20081004132537.E11C71190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=45286185c317efe406b05e2d432288d17d081c0d commit 45286185c317efe406b05e2d432288d17d081c0d Author: Priyank Date: Sat Oct 4 18:52:17 2008 +0530 sakura-2.3.0-1-i686 * Version bump diff --git a/source/xapps-extra/sakura/FrugalBuild b/source/xapps-extra/sakura/FrugalBuild index cdcea1f..cedd83f 100644 --- a/source/xapps-extra/sakura/FrugalBuild +++ b/source/xapps-extra/sakura/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=sakura -pkgver=2.2.1 +pkgver=2.3.0 pkgrel=1 pkgdesc="Sakura is a terminal emulator based on GTK and VTE." url="http://pleyades.net/david/sakura.php" @@ -13,7 +13,7 @@ groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url | grep -m1 tar.bz2 | sed 's/.*-\(.*\).ta.*/\1/'" source=(http://pleyades.net/david/projects/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('083aef7fd80459fdc3a642cb2e6c87c6ea370afc') +sha1sums=('c3c6fcd30fe7f6100eea959efa76861ddc33b36f') build() { From voroskoi at frugalware.org Sat Oct 4 16:20:59 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sat Oct 4 16:21:02 2008 Subject: [Frugalware-git] frugalware-current: psi-0.12-1-i686 Message-ID: <20081004142059.F270A1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6951d7224c1f11b5a053b4006314e9c9d7adb67f commit 6951d7224c1f11b5a053b4006314e9c9d7adb67f Author: voroskoi Date: Sat Oct 4 16:20:35 2008 +0200 psi-0.12-1-i686 version bump diff --git a/source/xapps-extra/psi/FrugalBuild b/source/xapps-extra/psi/FrugalBuild index 1974a59..bfb4b44 100644 --- a/source/xapps-extra/psi/FrugalBuild +++ b/source/xapps-extra/psi/FrugalBuild @@ -3,8 +3,8 @@ # Maintainer: voroskoi pkgname=psi -pkgver=0.11 -pkgrel=3 +pkgver=0.12 +pkgrel=1 pkgdesc="Psi is a free instant messaging application designed for the Jabber IM network." # NOTE: please check depends again on future releases qt3support is almost there in the # porting time from qt3 to qt4 and once the GUI is fully ported the depends will @@ -18,7 +18,7 @@ _F_sourceforge_ext=".tar.bz2" Finclude sourceforge url="http://psi-im.org/" up2date="lynx -dump http://psi-im.org/download | Flasttar" -sha1sums=('834fac4b51d92e2502cb08d01d40f05ffcdce4a2') +sha1sums=('2927497a53d1eb00720718ec41cf61a911914922') options=('scriptlet') build() { From voroskoi at frugalware.org Sat Oct 4 16:41:53 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sat Oct 4 16:41:54 2008 Subject: [Frugalware-git] frugalware-current: xfe-1.19.2-1-i686 Message-ID: <20081004144153.330731190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=03e18baa0f329f6bafb4a59d28e437253c03841f commit 03e18baa0f329f6bafb4a59d28e437253c03841f Author: voroskoi Date: Sat Oct 4 16:41:30 2008 +0200 xfe-1.19.2-1-i686 - version bump diff --git a/source/xapps-extra/xfe/FrugalBuild b/source/xapps-extra/xfe/FrugalBuild index f28ca1d..4540cfd 100644 --- a/source/xapps-extra/xfe/FrugalBuild +++ b/source/xapps-extra/xfe/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=xfe -pkgver=1.04 +pkgver=1.19.2 pkgrel=1 pkgdesc="X File Explorer (Xfe) is an MS-Explorer like file manager for X." depends=('fox') @@ -10,7 +10,7 @@ groups=('xapps-extra') archs=('i686' 'x86_64') Finclude sourceforge url="http://roland65.free.fr/xfe/" -sha1sums=('0a81c0a98312f48ba7c1fd208edf53516e743511') +sha1sums=('34c0833769613efb15bdefcde18198952cd8dc99') build() { Fconf From voroskoi at frugalware.org Sat Oct 4 17:23:42 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sat Oct 4 17:23:44 2008 Subject: [Frugalware-git] frugalware-current: gaupol-0.13.1-1-i686 Message-ID: <20081004152342.DDB7D1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a1f93237dd72daa929234bbbd9ad3ea4f01ef097 commit a1f93237dd72daa929234bbbd9ad3ea4f01ef097 Author: voroskoi Date: Sat Oct 4 17:23:24 2008 +0200 gaupol-0.13.1-1-i686 version bump diff --git a/source/gnome-extra/gaupol/FrugalBuild b/source/gnome-extra/gaupol/FrugalBuild index 7536956..1ff41e8 100644 --- a/source/gnome-extra/gaupol/FrugalBuild +++ b/source/gnome-extra/gaupol/FrugalBuild @@ -2,18 +2,16 @@ # Maintainer: voroskoi pkgname=gaupol -pkgver=0.12.3 +pkgver=0.13.1 pkgrel=1 pkgdesc="Gaupol is a subtitle editor for text-based subtitles." url="http://home.gna.org/gaupol/" -depends=('pygtk>=2.10' 'pyenchant>=1.1.3') +depends=('pygtk>=2.12' 'pyenchant>=1.1.3') makedepends=('intltool') rodepends=('chardet') groups=('gnome-extra') archs=('i686' 'x86_64') license="GPLv3" up2date="lynx -dump $url/download.html |grep gaupol.*.tar |sed -ne 's/.*l-\(.*\).t.*/\1/;1 p'" -source=(http://download.gna.org/gaupol/0.12/$pkgname-$pkgver.tar.gz) -sha1sums=('6e9de7c5e02dd63601ef93fb2184d2cbf60061c3') - - +source=(http://download.gna.org/gaupol/0.13/$pkgname-$pkgver.tar.gz) +sha1sums=('77f5850fba9e3aeecbb3faa6e9d425b790088b43') From voroskoi at frugalware.org Sat Oct 4 18:09:22 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sat Oct 4 18:09:24 2008 Subject: [Frugalware-git] frugalware-current: nautilus-open-terminal-0.9-1-i686 Message-ID: <20081004160922.66D7C1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=71e9d701808f69eced4fbbd435b16a28f5ec469f commit 71e9d701808f69eced4fbbd435b16a28f5ec469f Author: voroskoi Date: Sat Oct 4 18:08:41 2008 +0200 nautilus-open-terminal-0.9-1-i686 removed, dead diff --git a/source/gnome/nautilus-open-terminal/FrugalBuild b/source/gnome/nautilus-open-terminal/FrugalBuild deleted file mode 100644 index e2bba67..0000000 --- a/source/gnome/nautilus-open-terminal/FrugalBuild +++ /dev/null @@ -1,15 +0,0 @@ -# Compiling time: 0.08 SBU -# Maintainer: voroskoi - -pkgname=nautilus-open-terminal -pkgver=0.9 -pkgrel=1 -pkgdesc="Nautilus open terminal feature with improvements." -url="http://manny.cluecoder.org/packages/nautilus-open-terminal/" -depends=('nautilus' 'perl-xml-parser') -groups=('gnome') -archs=('i686' 'x86_64' 'ppc') -Finclude gnome -sha1sums=('14ae57b4b17fd82c0bc00cf138cf4f387feaf10d') - -# optimization OK From voroskoi at frugalware.org Sat Oct 4 18:22:48 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sat Oct 4 18:22:48 2008 Subject: [Frugalware-git] frugalware-current: mediawiki-1.13.2-1-i686 Message-ID: <20081004162248.118751190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8fb3641ca1c66691e087f3d4aad843540aa93a31 commit 8fb3641ca1c66691e087f3d4aad843540aa93a31 Author: voroskoi Date: Sat Oct 4 18:22:32 2008 +0200 mediawiki-1.13.2-1-i686 version bump diff --git a/source/network-extra/mediawiki/FrugalBuild b/source/network-extra/mediawiki/FrugalBuild index e1c96bc..995bf7d 100644 --- a/source/network-extra/mediawiki/FrugalBuild +++ b/source/network-extra/mediawiki/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=mediawiki -pkgver=1.13.1 +pkgver=1.13.2 pkgrel=1 pkgdesc="The collaborative editing software that runs Wikipedia" _F_sourceforge_dirname="wikipedia" @@ -25,6 +25,6 @@ build() Fexe /usr/bin/mediawikisetup } # php code, no need of optimalization -sha1sums=('41ef2be8939aa27778d93923ba7005165b15876a' \ +sha1sums=('c6f6e404ee9152deeec63cdc3278a2a57d556efe' \ '2c70930c46b8a5d87e830f64dc2761c5506ce967' \ 'b9810ea6531b4f61e41778b76f7601f2c4f9b0e2') From devil505linux at gmail.com Sat Oct 4 18:28:58 2008 From: devil505linux at gmail.com (Devil505) Date: Sat Oct 4 18:29:00 2008 Subject: [Frugalware-git] frugalware-current: arora-0.4-1-i686 Message-ID: <20081004162858.5840C1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7f4c5c11ba95d228214f4a69b219d9c7058703a2 commit 7f4c5c11ba95d228214f4a69b219d9c7058703a2 Author: Devil505 Date: Sat Oct 4 18:28:07 2008 +0200 arora-0.4-1-i686 * re-added x86_64 to archs (gholafox, don't remove it next time please) diff --git a/source/xapps-extra/arora/FrugalBuild b/source/xapps-extra/arora/FrugalBuild index 8a8a136..093ba3c 100644 --- a/source/xapps-extra/arora/FrugalBuild +++ b/source/xapps-extra/arora/FrugalBuild @@ -11,7 +11,7 @@ source=($source prefix.diff) makedepends=('qt4-linguist') depends=('libqtwebkit') groups=('xapps-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('b3facd08256c4622fc08cafa0cb0202d9b468f18' \ '3b8db0e28bd4f65433559811226903bfc68bf32d') build() From voroskoi at frugalware.org Sat Oct 4 19:39:52 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sat Oct 4 19:39:54 2008 Subject: [Frugalware-git] frugalware-current: net-snmp-5.4.2-1-i686 Message-ID: <20081004173952.48BC81190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=53cde2ef19dbb3580a292ec2722428edbd513cdc commit 53cde2ef19dbb3580a292ec2722428edbd513cdc Author: voroskoi Date: Sat Oct 4 19:28:50 2008 +0200 net-snmp-5.4.2-1-i686 version bump CVE-2008-0960.patch and CVE-2008-2292.patch in upstream diff --git a/source/network-extra/net-snmp/CVE-2008-0960.patch b/source/network-extra/net-snmp/CVE-2008-0960.patch deleted file mode 100644 index a3534f5..0000000 --- a/source/network-extra/net-snmp/CVE-2008-0960.patch +++ /dev/null @@ -1,17 +0,0 @@ -CVE-2008-0960 net-snmp SNMPv3 authentication bypass (VU#877044) - -Source: upstream, https://sourceforge.net/tracker/index.php?func=detail&aid=1989089&group_id=12694&atid=456380 - -diff -up net-snmp-5.0.9/snmplib/scapi.c.orig net-snmp-5.0.9/snmplib/scapi.c ---- net-snmp-5.0.9/snmplib/scapi.c.orig 2008-06-04 10:19:26.000000000 +0200 -+++ net-snmp-5.0.9/snmplib/scapi.c 2008-06-04 10:20:45.000000000 +0200 -@@ -460,6 +460,9 @@ sc_check_keyed_hash(const oid * authtype - QUITFUN(SNMPERR_GENERR, sc_check_keyed_hash_quit); - } - -+ if (maclen != USM_MD5_AND_SHA_AUTH_LEN) { -+ QUITFUN(SNMPERR_GENERR, sc_check_keyed_hash_quit); -+ } - - /* - * Generate a full hash of the message, then compare diff --git a/source/network-extra/net-snmp/CVE-2008-2292.patch b/source/network-extra/net-snmp/CVE-2008-2292.patch deleted file mode 100644 index 2295f11..0000000 --- a/source/network-extra/net-snmp/CVE-2008-2292.patch +++ /dev/null @@ -1,101 +0,0 @@ ---- net-snmp/perl/SNMP/SNMP.xs 2007/12/20 16:26:01 16765 -+++ net-snmp/perl/SNMP/SNMP.xs 2007/12/22 19:22:44 16770 -@@ -470,14 +470,16 @@ - if (flag == USE_ENUMS) { - for(ep = tp->enums; ep; ep = ep->next) { - if (ep->value == *var->val.integer) { -- strcpy(buf, ep->label); -+ strncpy(buf, ep->label, buf_len); -+ buf[buf_len-1] = '\0'; - len = strlen(buf); - break; - } - } - } - if (!len) { -- sprintf(buf,"%ld", *var->val.integer); -+ snprintf(buf, buf_len, "%ld", *var->val.integer); -+ buf[buf_len-1] = '\0'; - len = strlen(buf); - } - break; -@@ -486,21 +488,25 @@ - case ASN_COUNTER: - case ASN_TIMETICKS: - case ASN_UINTEGER: -- sprintf(buf,"%lu", (unsigned long) *var->val.integer); -+ snprintf(buf, buf_len, "%lu", (unsigned long) *var->val.integer); -+ buf[buf_len-1] = '\0'; - len = strlen(buf); - break; - - case ASN_OCTET_STR: - case ASN_OPAQUE: -- memcpy(buf, (char*)var->val.string, var->val_len); - len = var->val_len; -+ if ( len > buf_len ) -+ len = buf_len; -+ memcpy(buf, (char*)var->val.string, len); - break; - - case ASN_IPADDRESS: -- ip = (u_char*)var->val.string; -- sprintf(buf, "%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]); -- len = strlen(buf); -- break; -+ ip = (u_char*)var->val.string; -+ snprintf(buf, buf_len, "%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]); -+ buf[buf_len-1] = '\0'; -+ len = strlen(buf); -+ break; - - case ASN_NULL: - break; -@@ -512,14 +518,14 @@ - break; - - case SNMP_ENDOFMIBVIEW: -- sprintf(buf,"%s", "ENDOFMIBVIEW"); -- break; -+ snprintf(buf, buf_len, "%s", "ENDOFMIBVIEW"); -+ break; - case SNMP_NOSUCHOBJECT: -- sprintf(buf,"%s", "NOSUCHOBJECT"); -- break; -+ snprintf(buf, buf_len, "%s", "NOSUCHOBJECT"); -+ break; - case SNMP_NOSUCHINSTANCE: -- sprintf(buf,"%s", "NOSUCHINSTANCE"); -- break; -+ snprintf(buf, buf_len, "%s", "NOSUCHINSTANCE"); -+ break; - - case ASN_COUNTER64: - #ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES -@@ -538,19 +544,19 @@ - #endif - - case ASN_BIT_STR: -- snprint_bitstring(buf, sizeof(buf), var, NULL, NULL, NULL); -+ snprint_bitstring(buf, buf_len, var, NULL, NULL, NULL); - len = strlen(buf); - break; - #ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES - case ASN_OPAQUE_FLOAT: -- if (var->val.floatVal) -- sprintf(buf,"%f", *var->val.floatVal); -- break; -+ if (var->val.floatVal) -+ snprintf(buf, buf_len, "%f", *var->val.floatVal); -+ break; - - case ASN_OPAQUE_DOUBLE: -- if (var->val.doubleVal) -- sprintf(buf,"%f", *var->val.doubleVal); -- break; -+ if (var->val.doubleVal) -+ snprintf(buf, buf_len, "%f", *var->val.doubleVal); -+ break; - #endif - - case ASN_NSAP: diff --git a/source/network-extra/net-snmp/FrugalBuild b/source/network-extra/net-snmp/FrugalBuild index 80f4730..5f269b9 100644 --- a/source/network-extra/net-snmp/FrugalBuild +++ b/source/network-extra/net-snmp/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=net-snmp -pkgver=5.4.1.2 +pkgver=5.4.2 pkgrel=1 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6" depends=('openssl' 'perl>=5.10.0') @@ -12,10 +12,8 @@ archs=('i686' 'x86_64') Finclude sourceforge url="http://www.net-snmp.org/" up2date="lynx -dump http://www.net-snmp.org/download.html |grep Supported -A 2 |sed -ne 's/.* \([0-9.]\+\) .*/\1/;$ p'" -source=(${source[@]} CVE-2008-2292.patch CVE-2008-0960.patch rc.snmpd) -sha1sums=('aebe7d881f26403abd6b9ef3e69565beb041138d' \ - '7f7f770fcebdeb8bb19515937895c9c545cc0609' \ - 'bfb79ccb4db8b524655a78739bbf0e5255c1f14a' \ +source=(${source[@]} rc.snmpd) +sha1sums=('5b69da7d60bbc1092b61992f2d9ccb1051377ec6' \ 'df7a817499d12c53e9d2809f68c24fea9d3307b0') build() { From voroskoi at frugalware.org Sat Oct 4 20:02:14 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sat Oct 4 20:02:15 2008 Subject: [Frugalware-git] frugalware-current: tor-0.2.0.31-1-i686 Message-ID: <20081004180214.122861190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=af5a28931d92111e57a1693cecf3a42e9c9c9051 commit af5a28931d92111e57a1693cecf3a42e9c9c9051 Author: voroskoi Date: Sat Oct 4 20:02:01 2008 +0200 tor-0.2.0.31-1-i686 version bump diff --git a/source/network-extra/tor/FrugalBuild b/source/network-extra/tor/FrugalBuild index 96ff7a2..8076a49 100644 --- a/source/network-extra/tor/FrugalBuild +++ b/source/network-extra/tor/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=tor -pkgver=0.2.0.30 +pkgver=0.2.0.31 pkgrel=1 pkgdesc="An anonymous Internet communication system" url="http://tor.eff.org" From bouleetbil at frogdev.info Sat Oct 4 23:05:20 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat Oct 4 23:05:22 2008 Subject: [Frugalware-git] bouleetbilgnome224: gdm-2.20.5-3-i686 Message-ID: <20081004210520.B9D071190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=edbbc0c3af3ede237ac1184d0c349237f6357260 commit edbbc0c3af3ede237ac1184d0c349237f6357260 Author: bouleetbil Date: Sat Oct 4 23:01:54 2008 +0200 gdm-2.20.5-3-i686 *use the old theme for now the new is broken diff --git a/source/gnome/gdm/FrugalBuild b/source/gnome/gdm/FrugalBuild index 1b2a1de..88913dd 100644 --- a/source/gnome/gdm/FrugalBuild +++ b/source/gnome/gdm/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gdm pkgver=2.20.5 -pkgrel=2 +pkgrel=3 pkgdesc="GNOME Display Manager" url="http://www.gnome.org/" backup=(etc/gdm/custom.conf) @@ -21,12 +21,12 @@ options=(${options[@]} 'force') source=(${source[@]} $pkgname-2.20.1-gdmconf.patch \ $pkgname-gksu_categories.patch \ fix_reboot_path.patch \ - http://ftp.frugalware.org/pub/other/artwork/gdm-theme/GDM-Frugalware-1.0.tar.bz2) + http://ftp.frugalware.org/pub/other/artwork/gdm-theme/GDM-Frugalware-0.7.tar.bz2) sha1sums=('04d92b6b9a8c005b4a687d477b813bb4a357abd6' \ 'db576eb16baa10c95ce7143c5696594ee7b07744' \ '9665399f5ceaee25e5807f08c53456d5ac2a81fa' \ 'b602b6805d1d4787e4404827abf3d6f346843317' \ - 'b51f5b7654d9314367f27ed655b204d23c966f6d') + 'b13852bf7ce59df5d02f27b3603e274fba3e074d') build() { From bouleetbil at frogdev.info Sat Oct 4 23:35:48 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat Oct 4 23:35:50 2008 Subject: [Frugalware-git] bouleetbilgnome224: seahorse-2.24.0-1-i686 Message-ID: <20081004213548.95F071190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=668291f345fa4b2c264517c1690cf08bf3f8b31a commit 668291f345fa4b2c264517c1690cf08bf3f8b31a Author: bouleetbil Date: Sat Oct 4 23:32:10 2008 +0200 seahorse-2.24.0-1-i686 *version bump *delete subpackage since this version they delete the applet diff --git a/source/gnome-extra/seahorse/FrugalBuild b/source/gnome-extra/seahorse/FrugalBuild index a24a75f..2e33fc9 100644 --- a/source/gnome-extra/seahorse/FrugalBuild +++ b/source/gnome-extra/seahorse/FrugalBuild @@ -2,74 +2,28 @@ # Maintainer: Priyank Gosalia pkgname=seahorse -pkgver=2.22.3 -pkgrel=2 +pkgver=2.24.0 +pkgrel=1 pkgdesc="A GNOME application for managing PGP keys." url="http://www.seahorse.sourceforge.net/" -depends=('gnutls=2.2.5-2' 'gtksourceview' 'gnupg' 'gpgme' 'libsoup' 'dbus' \ - 'dbus-glib' 'libsoup' 'libxml2' 'libnotify' 'libgnomeui>=2.22.1' \ - 'openssh' 'gconf>=2.22.0' 'avahi') -makedepends=('gettext' 'openldap' 'intltool' 'pkgconfig' 'gnome-doc-utils' \ - 'nautilus>=2.22.0' 'gedit>=2.20.0' 'gnome-applets>=2.22.0') +depends=('gnutls=2.4.2-1' 'gtksourceview' 'gnupg' 'gpgme' 'libsoup' 'dbus' \ + 'dbus-glib' 'libsoup' 'libxml2' 'libnotify' 'libgnomeui>=2.24.0' \ + 'openssh' 'gconf>=2.24.0' 'avahi') +makedepends=('gettext' 'openldap' 'intltool' 'pkgconfig' 'gnome-doc-utils') groups=('gnome-extra') archs=('i686' 'x86_64') -_F_gnome_schemas=('/etc/gconf/schemas/seahorse-gedit.schemas' - '/etc/gconf/schemas/seahorse.schemas') +_F_gnome_schemas=('/etc/gconf/schemas/seahorse.schemas') _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" _F_gnome_iconcache="y" _F_gnome_mime="y" Finclude gnome gnome-scriptlet -sha1sums=('11a5c4a641e3419e022f3c8e733b49a1139a52ed') -subpkgs=("$pkgname-gedit" "$pkgname-nautilus" "$pkgname-applet") -subdescs=('seahorse encryption plugin for gedit' \ - 'seahorse encryption extension for nautilus' \ - 'seahorse panel applet for GNOME') -subdepends=("$pkgname=$pkgver gedit>=2.20.0 gedit-python>=2.20.0" "$pkgname=$pkgver nautilus>=2.20.0" "$pkgname=$pkgver gnome-applets>=2.20.0") -subgroups=('gnome-extra' 'gnome-extra' 'gnome-extra') -subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64') - -build() -{ - unset MAKEFLAGS - Fsed 'chmod u+s $(bindir)' 'chmod u+s $(DESTDIR)$(bindir)' agent/Makefile.in - Fsed 'chmod u+s $(bindir)' 'chmod u+s $(DESTDIR)$(bindir)' agent/Makefile.am - Fpatchall - - Fconf --enable-ldap --enable-hkp --enable-gedit --enable-nautilus \ +sha1sums=('e6113d22cf63121bf4a2505ad7a1b755c21a280c') +unset MAKEFLAGS +Fconfopts="${Fconfopts[@]} -enable-ldap --enable-hkp \ --enable-agent --enable-libnotify --with-keyserver --enable-ssh \ --enable-nautilus --enable-dbus --enable-avahi --enable-sharing \ - --enable-gnome-keyring --disable-epiphany --enable-gedit \ - --disable-update-mime-database - - make || return 1 - Fmakeinstall GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$Fdestdir - Fbuild_gnome_scriptlet - - Fsplit $pkgname-gedit usr/lib/gedit-2/ - Fsplit $pkgname-nautilus usr/lib/nautilus/ - Fsplit $pkgname-applet usr/lib/seahorse/seahorse-applet - Fsplit $pkgname-applet usr/share/omf/seahorse-applet/ - Fsplit $pkgname-applet usr/share/gnome/help/seahorse-applet/ - Fsplit $pkgname-applet usr/share/pixmaps/seahorse-applet.svg - Fsplit $pkgname-applet usr/share/seahorse/glade/seahorse-applet-preferences.glade - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/22x22/seahorse-applet-encrypted.png - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/22x22/seahorse-applet-key.png - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/22x22/seahorse-applet-signed.png - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/22x22/seahorse-applet-text.png - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/22x22/seahorse-applet-unknown.png - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/48x48/seahorse-applet-encrypted.png - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/48x48/seahorse-applet-key.png - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/48x48/seahorse-applet-signed.png - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/48x48/seahorse-applet-text.png - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/48x48/seahorse-applet-unknown.png - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/48x48/seahorse-applet.png - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/scalable/seahorse-applet-encrypted.svg - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/scalable/seahorse-applet-key.svg - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/scalable/seahorse-applet-signed.svg - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/scalable/seahorse-applet-text.svg - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/scalable/seahorse-applet-unknown.svg - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/scalable/seahorse-applet.svg -} + --enable-gnome-keyring --disable-epiphany \ + --disable-update-mime-database" # optimization OK From bouleetbil at frogdev.info Sat Oct 4 23:42:29 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat Oct 4 23:42:29 2008 Subject: [Frugalware-git] bouleetbilgnome224: goobox-2.0.0-1-i686 Message-ID: <20081004214229.05D851190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=6f9d968423f6a6aa83ce522c380184b7e9a26d4f commit 6f9d968423f6a6aa83ce522c380184b7e9a26d4f Author: bouleetbil Date: Sat Oct 4 23:40:03 2008 +0200 goobox-2.0.0-1-i686 *new package diff --git a/source/gnome-extra/goobox/FrugalBuild b/source/gnome-extra/goobox/FrugalBuild new file mode 100644 index 0000000..691af13 --- /dev/null +++ b/source/gnome-extra/goobox/FrugalBuild @@ -0,0 +1,25 @@ +# Compiling Time: 0.18 SBU +# Maintainer: bouleetbil + +pkgname=goobox +pkgver=2.0.0 +pkgrel=1 +pkgdesc="Goobox is an CD player and ripper for the GNOME 2 environment" +options=('scriptlet') +depends=('libgnomeui' 'libsm' 'popt' 'esd' 'pango' 'gail' 'libart_lgpl' \ + 'gnome-vfs' 'libglade' 'gstreamer' 'libmusicbrainz' 'libnotify' \ + 'atk' 'freetype2' 'libxau' 'libxdmcp' 'libgcc' 'libjpeg' \ + 'openssl' 'libxdamage' 'libxinerama' 'libxi' 'libxrandr' \ + 'libxcursor' 'gst-plugins-base-gnomevfs' 'gst-plugins-good') +makedepends=('gnome-doc-utils' 'perl-xml-parser') +_F_gnome_devel="y" +_F_gnome_iconcache="y" +_F_gnome_desktop="y" +_F_gnome_schemas=('/etc/gconf/schemas/goobox.schemas') +Finclude gnome gnome-scriptlet +groups=('gnome-extra') +archs=('i686') +sha1sums=('560dcf04143ddac00f5bc63e710b5a07a1f64ec3') + +# optimization OK + From bouleetbil at frogdev.info Sun Oct 5 00:02:37 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Oct 5 00:02:39 2008 Subject: [Frugalware-git] bouleetbilgnome224: cheese-2.24.0-1-i686 Message-ID: <20081004220237.C04221190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=2b1e01bd52a84ba5e5152678d6212a7c46c72310 commit 2b1e01bd52a84ba5e5152678d6212a7c46c72310 Author: bouleetbil Date: Sat Oct 4 23:59:29 2008 +0200 cheese-2.24.0-1-i686 *version bump diff --git a/source/gnome-extra/cheese/FrugalBuild b/source/gnome-extra/cheese/FrugalBuild index b19303f..dc5365a 100644 --- a/source/gnome-extra/cheese/FrugalBuild +++ b/source/gnome-extra/cheese/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Christian Hamar alias krix pkgname=cheese -pkgver=2.22.2 -pkgrel=3 +pkgver=2.24.0 +pkgrel=1 pkgdesc="Cheese is a Photobooth-inspired GNOME application for taking pictures and videos from a webcam." url="http://www.gnome.org/projects/cheese" -depends=('librsvg>=2.22.0' 'gst-plugins-good' 'gst-plugins-base' 'gst-plugins-base-pango' \ - 'gnome-vfs' 'libgnomeui' 'xf86vidmodeproto' 'evolution-data-server>=2.22.0' 'dbus' 'hal' \ +depends=('librsvg>=2.22.2' 'gst-plugins-good' 'gst-plugins-base' 'gst-plugins-base-pango' \ + 'gnome-vfs' 'libgnomeui' 'xf86vidmodeproto' 'evolution-data-server>=2.24.0' 'dbus' 'hal' \ 'gst-plugins-good-video4linux2' 'heimdal>=1.2.1' 'db>=4.7.25' 'gst-plugins-bad-mpeg2enc') makedepends=('intltool' 'gnome-doc-utils' 'samba' 'fuse' 'libsoup' 'gconf') groups=('gnome-extra') @@ -16,6 +16,6 @@ _F_gnome_iconcache="y" _F_gnome_desktop="y" _F_gnome_schemas=('/etc/gconf/schemas/cheese.schemas') Finclude gnome gnome-scriptlet -sha1sums=('af430576d73ea70e2339ea8767409a5c922b8692') +sha1sums=('b48fff98e3f36602bf4b6a188509af46f2c4bf16') # optimization OK From ryuo at frugalware.org Sun Oct 5 09:08:55 2008 From: ryuo at frugalware.org (James Buren) Date: Sun Oct 5 09:08:56 2008 Subject: [Frugalware-git] frugalware-current: seamonkey-adblock_plus-0.7.5.5-1-i686 Message-ID: <20081005070855.AD9241190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=696438e5f62ac5ec8a0444fb1c5166e847a7418c commit 696438e5f62ac5ec8a0444fb1c5166e847a7418c Author: James Buren Date: Sun Oct 5 02:10:04 2008 -0500 seamonkey-adblock_plus-0.7.5.5-1-i686 * another attempt to fix? diff --git a/source/xapps-extra/seamonkey-adblock_plus/FrugalBuild b/source/xapps-extra/seamonkey-adblock_plus/FrugalBuild index 16f7a3c..366e710 100644 --- a/source/xapps-extra/seamonkey-adblock_plus/FrugalBuild +++ b/source/xapps-extra/seamonkey-adblock_plus/FrugalBuild @@ -7,6 +7,6 @@ pkgver=0.7.5.5 pkgrel=1 pkgdesc="Adblock plus makes ads a thing of the past. (seamonkey version)" url="https://addons.mozilla.org/en-US/seamonkey/addon/1865" -source=(https://addons.mozilla.org/en-US/seamonkey/downloads/file/30901/${_F_seamonkey_name}${Fpkgversep}${pkgver}${_F_seamonkey_ext}) +source=(https://addons.mozilla.org/en-US/seamonkey/downloads/file/30901/${_F_seamonkey_name}-${pkgver}${_F_seamonkey_ext}) sha1sums=('514f17e8ace564094954de8abb293843a47c637f') Finclude seamonkey-addon From voroskoi at frugalware.org Sun Oct 5 09:19:46 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 09:19:47 2008 Subject: [Frugalware-git] frugalware-current: mkvtoolnix-2.3.0-1-i686 Message-ID: <20081005071946.256FC1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ca98a9995722eab62aa610952893b793f8c936ea commit ca98a9995722eab62aa610952893b793f8c936ea Author: voroskoi Date: Sun Oct 5 09:19:05 2008 +0200 mkvtoolnix-2.3.0-1-i686 version bump diff --git a/source/multimedia-extra/mkvtoolnix/FrugalBuild b/source/multimedia-extra/mkvtoolnix/FrugalBuild index 5163262..b2e6683 100644 --- a/source/multimedia-extra/mkvtoolnix/FrugalBuild +++ b/source/multimedia-extra/mkvtoolnix/FrugalBuild @@ -2,16 +2,17 @@ # Maintainer: voroskoi pkgname=mkvtoolnix -pkgver=2.2.0 +pkgver=2.3.0 pkgrel=1 pkgdesc="MKVToolnix is a set of tools to create, alter and inspect Matroska files under Linux." url="http://www.bunkus.org/videotools/mkvtoolnix/" -depends=('libmatroska' 'lzo' 'flac>=1.1.3' 'file' 'pcre' 'libvorbis' 'expat' 'bzip2') +makedepends=('boost') +depends=('file' 'libvorbis' 'libmatroska' 'expat' 'lzo' 'flac>=1.1.3' 'libboost-mt') groups=('multimedia-extra') archs=('i686' 'x86_64') up2date="lynx -dump ${url}source.html |grep mkv.*.tar.bz2 |sed -e 's/.*x-\(.*\).t.*/\1/'" source=(http://www.bunkus.org/videotools/mkvtoolnix/sources/$pkgname-$pkgver.tar.bz2) Fconfopts="$Fconfopts --enable-lzo --enable-bz2 --disable-gui" -sha1sums=('4d0194bdddc24a5578edd1badefbb6b92cec12be') +sha1sums=('92002a03e6961d52b84493e51420d77d36475292') # optimization OK From priyank at frugalware.org Sun Oct 5 09:53:11 2008 From: priyank at frugalware.org (Priyank) Date: Sun Oct 5 09:53:13 2008 Subject: [Frugalware-git] xfce46: updated dlurl to version 4.5.90 Message-ID: <20081005075311.532E61190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=5bd199750579d4791029936bbb27aa67f56407e1 commit 5bd199750579d4791029936bbb27aa67f56407e1 Author: Priyank Date: Sun Oct 5 02:07:14 2008 +0530 updated dlurl to version 4.5.90 diff --git a/source/include/xfce4.sh b/source/include/xfce4.sh index 94ee136..08c4414 100644 --- a/source/include/xfce4.sh +++ b/source/include/xfce4.sh @@ -63,7 +63,7 @@ if echo ${groups[*]} | grep -q goodies ; then else url="http://www.xfce.org/" preup2date="lynx -dump http://www.xfce.org/archive/ | grep xfce- | tail -n1 | sed 's/.*-\(.*\)\/.*/\1/'" - dlurl="$url/archive/xfce-4.4.2/src" + dlurl="$url/archive/xfce-4.5.90/src" up2date="lynx -dump $url/archive/xfce-\$($preup2date)/src/ | Flasttar" source=($dlurl/$_F_xfce_name-$pkgver.tar.bz2) fi From bouleetbil at frogdev.info Sun Oct 5 09:53:26 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Oct 5 09:53:28 2008 Subject: [Frugalware-git] bouleetbilgnome224: gnome-user-docs-2.24.0-1-i686 Message-ID: <20081005075326.ED8571190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=f76d19093cef832c80406ec847d5b3c42a9db2cc commit f76d19093cef832c80406ec847d5b3c42a9db2cc Author: bouleetbil Date: Sun Oct 5 09:47:52 2008 +0200 gnome-user-docs-2.24.0-1-i686 *version bump diff --git a/source/gnome-extra/gnome-user-docs/FrugalBuild b/source/gnome-extra/gnome-user-docs/FrugalBuild index 74e5d30..0edaa37 100644 --- a/source/gnome-extra/gnome-user-docs/FrugalBuild +++ b/source/gnome-extra/gnome-user-docs/FrugalBuild @@ -3,16 +3,16 @@ # Contributor: AlexExtreme pkgname=gnome-user-docs -pkgver=2.22.0 +pkgver=2.24.0 pkgrel=1 pkgdesc="User documentation for GNOME" url="http://www.gnome.org/" depends=('rarian') -makedepends=('gnome-doc-utils>=0.12.0') +makedepends=('gnome-doc-utils>=0.14.0' 'docbook-xsl' 'docbook-xml') replaces=('gnome2-user-docs') groups=('gnome-extra') archs=('i686' 'x86_64') _F_gnome_scrollkeeper="y" Finclude gnome gnome-scriptlet unset MAKEFLAGS -sha1sums=('b6eef0b7dcf3e61743e438df8493e5c5511ea465') +sha1sums=('1db8a2eff00b96bd6ca0ca184a5aadbd1f4dfd1d') From bouleetbil at frogdev.info Sun Oct 5 09:58:06 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Oct 5 09:58:07 2008 Subject: [Frugalware-git] bouleetbilgnome224: mousetweaks-2.24.0-1-i686 Message-ID: <20081005075806.779AE1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=410e567f416e520476b8bf1e83531f9f21d96050 commit 410e567f416e520476b8bf1e83531f9f21d96050 Author: bouleetbil Date: Sun Oct 5 09:55:14 2008 +0200 mousetweaks-2.24.0-1-i686 *version bump diff --git a/source/gnome-extra/mousetweaks/FrugalBuild b/source/gnome-extra/mousetweaks/FrugalBuild index 6d64d99..57522c8 100644 --- a/source/gnome-extra/mousetweaks/FrugalBuild +++ b/source/gnome-extra/mousetweaks/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=mousetweaks -pkgver=2.22.2 +pkgver=2.24.0 pkgrel=1 pkgdesc="The Mousetweaks package provides mouse accessibility enhancements for the GNOME desktop." url="http://www.gnome.org/" @@ -13,6 +13,6 @@ archs=('i686' 'x86_64') _F_gnome_schemas=('/etc/gconf/schemas/mousetweaks.schemas' \ '/etc/gconf/schemas/pointer-capture-applet.schemas') Finclude gnome -sha1sums=('846c9ee24bdfe01282d214367b710da138a101cc') +sha1sums=('ffee63d8b833fdef87a440041689c2adb2a76564') # optimization OK From priyank at frugalware.org Sun Oct 5 10:00:57 2008 From: priyank at frugalware.org (Priyank) Date: Sun Oct 5 10:00:59 2008 Subject: [Frugalware-git] xfce46: libxfce4util-4.5.90-1-i686 Message-ID: <20081005080057.7C1541190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=890ad31a4db426f99954f0f3a78660609c43e0a2 commit 890ad31a4db426f99954f0f3a78660609c43e0a2 Author: Priyank Date: Sun Oct 5 13:29:07 2008 +0530 libxfce4util-4.5.90-1-i686 * Version bump diff --git a/source/xfce4/libxfce4util/FrugalBuild b/source/xfce4/libxfce4util/FrugalBuild index df2088e..33e3d2e 100644 --- a/source/xfce4/libxfce4util/FrugalBuild +++ b/source/xfce4/libxfce4util/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Priyank Gosalia pkgname=libxfce4util -pkgver=4.4.2 +pkgver=4.5.90 pkgrel=1 pkgdesc="Basic utility non-GUI functions for Xfce4." depends=('glib2') groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64') Finclude xfce4 -sha1sums=('b0399b476bd901a84424a2b77d4aa89d7fcfac7d') +sha1sums=('1b5fb26f24b8f665b1edebd554bdc52b81e6abfc') # optimization OK From priyank at frugalware.org Sun Oct 5 10:05:44 2008 From: priyank at frugalware.org (Priyank) Date: Sun Oct 5 10:05:45 2008 Subject: [Frugalware-git] xfce46: libxfce4mcs-4.4.2-1-i686 Message-ID: <20081005080544.435F31190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=698d1b6a7ffb31c261ed942f2e30170c35265148 commit 698d1b6a7ffb31c261ed942f2e30170c35265148 Author: Priyank Date: Sun Oct 5 13:34:25 2008 +0530 libxfce4mcs-4.4.2-1-i686 * Removed (deprecated and replaced by xfconf) diff --git a/source/xfce4/libxfce4mcs/FrugalBuild b/source/xfce4/libxfce4mcs/FrugalBuild deleted file mode 100644 index 053eba9..0000000 --- a/source/xfce4/libxfce4mcs/FrugalBuild +++ /dev/null @@ -1,14 +0,0 @@ -# Compiling Time: 0.08 SBU -# Maintainer: Priyank Gosalia - -pkgname=libxfce4mcs -pkgver=4.4.2 -pkgrel=1 -pkgdesc="Multi-channel settings management support for Xfce4." -depends=('libx11' 'libsm' 'libxt' 'startup-notification' 'libxfce4util>=4.4.1') -groups=('xfce4' 'xfce4-core') -archs=('i686' 'x86_64') -Finclude xfce4 - -# optimization OK -sha1sums=('f71c618070a57b1180a25dc008d83b623a862f42') From priyank at frugalware.org Sun Oct 5 10:26:03 2008 From: priyank at frugalware.org (Priyank) Date: Sun Oct 5 10:26:04 2008 Subject: [Frugalware-git] xfce46: libxfcegui4-4.5.90-1-i686 Message-ID: <20081005082603.68E421190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=3d991213183369fb0b042af4e12721b13ee6069c commit 3d991213183369fb0b042af4e12721b13ee6069c Author: Priyank Date: Sun Oct 5 13:54:16 2008 +0530 libxfcegui4-4.5.90-1-i686 * Version bump * Added libglade to depends diff --git a/source/xfce4/libxfcegui4/FrugalBuild b/source/xfce4/libxfcegui4/FrugalBuild index 57023f9..ad29946 100644 --- a/source/xfce4/libxfcegui4/FrugalBuild +++ b/source/xfce4/libxfcegui4/FrugalBuild @@ -1,17 +1,19 @@ -# Compiling Time: 0.33 SBU +# Compiling Time: 0.20 SBU # Maintainer: Priyank Gosalia pkgname=libxfcegui4 -pkgver=4.4.2 +pkgver=4.5.90 pkgrel=1 pkgdesc="Various gtk widgets for Xfce4." -depends=('gtk+2' 'libxfce4util>=4.4.1' 'hicolor-icon-theme' 'startup-notification' 'librsvg') -makedepends=('gtk-doc' 'xfce4-dev-tools>=4.4.0') +depends=('gtk+2' 'libxfce4util>=4.5.90' 'hicolor-icon-theme' \ + 'libglade' 'startup-notification' 'librsvg') +makedepends=('gtk-doc' 'xfce4-dev-tools>=4.4.5.90') groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64') -Finclude xfce4 -options=('scriptlet') +_F_gnome_iconcache=y +Finclude xfce4 gnome-scriptlet +options=('scriptlet' 'genscriptlet') Fconfopts="$Fconfopts --enable-xinerama --enable-gtk-doc" -sha1sums=('554a30c02c92b76c8caad444040e18d8ec1737bc') +sha1sums=('67b06321e6f368d9f9f69950f26a3938785b7b1e') # optimization OK From priyank at frugalware.org Sun Oct 5 10:29:37 2008 From: priyank at frugalware.org (Priyank) Date: Sun Oct 5 10:29:38 2008 Subject: [Frugalware-git] xfce46: xfce-mcs-manager-4.4.2-1-i686 Message-ID: <20081005082937.8E41D1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=d13f12a5ef4a2e377c4d3cafa9465ce69eb71474 commit d13f12a5ef4a2e377c4d3cafa9465ce69eb71474 Author: Priyank Date: Sun Oct 5 13:58:26 2008 +0530 xfce-mcs-manager-4.4.2-1-i686 * Removed (deprecated and replaced by xfce4-settings) diff --git a/source/xfce4/xfce-mcs-manager/FrugalBuild b/source/xfce4/xfce-mcs-manager/FrugalBuild deleted file mode 100644 index 0555c06..0000000 --- a/source/xfce4/xfce-mcs-manager/FrugalBuild +++ /dev/null @@ -1,16 +0,0 @@ -# Compiling Time: 0.08 SBU -# Maintainer: Priyank Gosalia - -pkgname=xfce-mcs-manager -pkgver=4.4.2 -pkgrel=1 -pkgdesc="A multi channel settings manager for Xfce4." -url="http://www.xfce.org/" -depends=('pango' 'atk' 'libxfcegui4>=4.4.2' 'libxfce4mcs>=4.4.2') -groups=('xfce4' 'xfce4-core') -archs=('i686' 'x86_64') -_F_gnome_iconcache=y -Finclude gnome-scriptlet xfce4 -sha1sums=('0fccebcd65bd547b29a2e497793d5d9055760ef1') - -# optimization OK From bouleetbil at frogdev.info Sun Oct 5 10:32:01 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Oct 5 10:32:03 2008 Subject: [Frugalware-git] bouleetbilgnome224: deskbar-applet-2.24.0-1-i686 Message-ID: <20081005083201.AE6571190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=240e3cfb9fdbf2c2fa750d43d1b2539d1bfa4b23 commit 240e3cfb9fdbf2c2fa750d43d1b2539d1bfa4b23 Author: bouleetbil Date: Sun Oct 5 10:29:28 2008 +0200 deskbar-applet-2.24.0-1-i686 *version bump diff --git a/source/gnome-extra/deskbar-applet/FrugalBuild b/source/gnome-extra/deskbar-applet/FrugalBuild index dbe899d..63a3ff9 100644 --- a/source/gnome-extra/deskbar-applet/FrugalBuild +++ b/source/gnome-extra/deskbar-applet/FrugalBuild @@ -3,12 +3,12 @@ # Contributor: AlexExtreme pkgname=deskbar-applet -pkgver=2.22.1 +pkgver=2.24.0 pkgrel=1 pkgdesc="The Deskbar applet for gnome" url="http://www.gnome.org/" -depends=('gnome-python-extras>=2.19.1' 'evolution-data-server>=2.22.0' \ - 'gnome-desktop>=2.22.0' 'gnome-python-desktop-applet>=2.22.0') +depends=('gnome-python-extras>=2.14.0' 'evolution-data-server>=2.24.0' \ + 'gnome-desktop>=2.24.0' 'gnome-python-desktop-applet>=2.24.0') makedepends=('intltool' 'perl-xml-parser' 'gnome-doc-utils') groups=('gnome-extra') archs=('i686' 'x86_64') @@ -16,7 +16,7 @@ _F_gnome_schemas=('/etc/gconf/schemas/deskbar-applet.schemas') _F_gnome_scrollkeeper="y" _F_gnome_iconcache="y" Finclude gnome gnome-scriptlet +sha1sums=('e5affc173b440959cd8edead0bbb8b36bdadd9b2') unset MAKEFLAGS -sha1sums=('e1f7784af5ac4493b3800424018b4a10eac69425') # optimization OK From priyank at frugalware.org Sun Oct 5 11:28:31 2008 From: priyank at frugalware.org (Priyank) Date: Sun Oct 5 11:28:32 2008 Subject: [Frugalware-git] xfce46: libxfce4menu-4.5.90-1-i686 Message-ID: <20081005092831.2EDB11190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=aa3c1bae6aff6e2f42167be3254b40132b3b2430 commit aa3c1bae6aff6e2f42167be3254b40132b3b2430 Author: Priyank Date: Sun Oct 5 14:57:01 2008 +0530 libxfce4menu-4.5.90-1-i686 * New package diff --git a/source/xfce4/libxfce4menu/FrugalBuild b/source/xfce4/libxfce4menu/FrugalBuild new file mode 100644 index 0000000..6505acc --- /dev/null +++ b/source/xfce4/libxfce4menu/FrugalBuild @@ -0,0 +1,14 @@ +# Compiling Time: 0.08 SBU +# Maintainer: Priyank Gosalia + +pkgname=libxfce4menu +pkgver=4.5.90 +pkgrel=1 +pkgdesc="Xfce4 menu library" +depends=('glib2' 'gtk+2>=2.12.11' 'libxfce4util>=$pkgver') +groups=('xfce4' 'xfce4-core') +archs=('i686' 'x86_64') +Finclude xfce4 +sha1sums=('ed101237d0388a426a373e580dda903778beaeca') + +# optimization OK From devil505linux at gmail.com Sun Oct 5 11:34:09 2008 From: devil505linux at gmail.com (Devil505) Date: Sun Oct 5 11:34:10 2008 Subject: [Frugalware-git] frugalware-current: smc-1.6-1-i686 Message-ID: <20081005093409.161771190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d036739daa5ea75ca7ef12334ffe055c8a448dbf commit d036739daa5ea75ca7ef12334ffe055c8a448dbf Author: Devil505 Date: Sun Oct 5 11:31:03 2008 +0200 smc-1.6-1-i686 * fix up2date * version bump diff --git a/source/games-extra/smc/FrugalBuild b/source/games-extra/smc/FrugalBuild index d0fb6e8..ea8f3f3 100644 --- a/source/games-extra/smc/FrugalBuild +++ b/source/games-extra/smc/FrugalBuild @@ -1,12 +1,13 @@ -# Compiling Time: 0.99 SBU +# Compiling Time: 0.77 SBU # Maintainer: Devil505 pkgname=smc -pkgver=1.5 +pkgver=1.6 pkgrel=1 pkgdesc="Secret Maryo Chronicles" _F_sourceforge_ext=".tar.bz2" _F_sourceforge_dirname="smclone" +_F_sourceforge_realname="Secret Maryo Chronicles" Finclude sourceforge url="http://www.secretmaryo.org/" depends=('sdlimage' 'sdl_ttf' 'sdl_gfx>=2.0.16' 'sdl_mixer' 'cegui>=0.5.0b-3' 'libboost-mt>=1.35.0' 'freeglut' 'sdl') @@ -14,7 +15,7 @@ rodepends=('smc-music') makedepends=('boost>=1.35.0') groups=('games-extra') archs=('i686' 'x86_64') -sha1sums=('ee2abe6ff07c479f38ed6953538a1de946762b94') +sha1sums=('463300d258c860e1cfaf1246c516a50ca25fbc4e') _F_desktop_name="Secret Maryo Chronicles" _F_desktop_icon="/usr/share/smc/icon/window_32.png" From priyank at frugalware.org Sun Oct 5 11:39:59 2008 From: priyank at frugalware.org (Priyank) Date: Sun Oct 5 11:40:00 2008 Subject: [Frugalware-git] xfce46: libexo-0.3.80-1-i686 Message-ID: <20081005093959.40BB91190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=c81cebeabbb1f9a736d47f2ce6a2ef18823b7539 commit c81cebeabbb1f9a736d47f2ce6a2ef18823b7539 Author: Priyank Date: Sun Oct 5 15:07:54 2008 +0530 libexo-0.3.80-1-i686 * Version bump * updated dependencies diff --git a/source/xfce4/libexo/FrugalBuild b/source/xfce4/libexo/FrugalBuild index f168f08..5c22b9a 100644 --- a/source/xfce4/libexo/FrugalBuild +++ b/source/xfce4/libexo/FrugalBuild @@ -1,19 +1,20 @@ -# Compiling Time: 0.34 SBU +# Compiling Time: 0.25 SBU # Maintainer: Priyank Gosalia pkgname=libexo _F_xfce_name=exo _F_archive_name=exo -pkgver=0.3.4 +pkgver=0.3.80 pkgrel=1 -pkgdesc="Extension library to Xfce." -depends=('libxfcegui4>=4.4.2' 'xfce-mcs-plugins>=4.4.2' 'libnotify' \ - 'hal>=0.5.9-2' 'startup-notification' 'perl-uri') +pkgdesc="Extension library to Xfce4." +depends=('libxfce4util>=$pkgver' 'perl-uri' 'libnotify' 'hal>=0.5.11') groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64') -Finclude xfce4 +_F_gnome_iconcache=y +Finclude xfce4 gnome-scriptlet +options=('genscriptlet') _F_cd_path="$_F_xfce_name-$pkgver" -Fconfopts="${Fconfopts[@]} --enable-mcs-plugin --enable-hal --enable-notifications" -sha1sums=('4f7a3f46592fd0311be1f011f17431f211cc1fcb') +Fconfopts="${Fconfopts[@]} --enable-hal --enable-notifications" +sha1sums=('f7108678a3e72592dac5d1cf946a8993a6aab1bb') # optimization OK From bouleetbil at frogdev.info Sun Oct 5 11:54:40 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Oct 5 11:54:41 2008 Subject: [Frugalware-git] bouleetbilgnome224: gvfs-1.0.1-2-i686 Message-ID: <20081005095440.8A4D31190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=abca1f0860f504a3e908a72e5f9ea228564b1556 commit abca1f0860f504a3e908a72e5f9ea228564b1556 Author: bouleetbil Date: Sun Oct 5 11:51:39 2008 +0200 gvfs-1.0.1-2-i686 *added new options diff --git a/source/gnome/gvfs/FrugalBuild b/source/gnome/gvfs/FrugalBuild index be5a7a9..a88680e 100644 --- a/source/gnome/gvfs/FrugalBuild +++ b/source/gnome/gvfs/FrugalBuild @@ -3,11 +3,13 @@ pkgname=gvfs pkgver=1.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="gvfs is a userspace virtual filesystem designed to work with the i/o abstractions of gio." url="http://www.gnome.org/" depends=('glib2>=2.16.5' 'dbus' 'avahi-glib' 'avahi' 'hal') -makedepends=('intltool' 'gnome-doc-utils' 'samba' 'fuse' 'libsoup' 'gconf') +makedepends=('intltool' 'gnome-doc-utils' 'samba' 'fuse' 'libsoup' 'gconf' \ + 'gnome-keyring' 'libcdio' 'gphoto2' \ + 'bluez-libs' 'expat' 'openssh') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') Finclude gnome From bouleetbil at frogdev.info Sun Oct 5 12:10:50 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Oct 5 12:10:52 2008 Subject: [Frugalware-git] bouleetbilgnome224: pessulus-2.24.0-1-i686 Message-ID: <20081005101050.391E81190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=ddad43395f240b7db24fba2a0b52837f06652ccc commit ddad43395f240b7db24fba2a0b52837f06652ccc Author: bouleetbil Date: Sun Oct 5 12:07:44 2008 +0200 pessulus-2.24.0-1-i686 *version bump diff --git a/source/gnome-extra/pessulus/FrugalBuild b/source/gnome-extra/pessulus/FrugalBuild index 7c00127..0464975 100644 --- a/source/gnome-extra/pessulus/FrugalBuild +++ b/source/gnome-extra/pessulus/FrugalBuild @@ -3,17 +3,18 @@ # Contributor: AlexExtreme pkgname=pessulus -pkgver=2.16.4 +pkgver=2.24.0 pkgrel=1 pkgdesc="Pessulus is a lockdown editor for Gnome" -url="http://live.gnome.org/Pessulus" groups=('gnome-extra') archs=('i686' 'x86_64') -depends=('gconf' 'gnome-python>=2.16.0') +depends=('gconf' 'gnome-python>=2.22.1' 'gnome-python-desktop') makedepends=('intltool' 'gnome-doc-utils') -Finclude gnome - -# On a version bump, rebuild sabayon and change it's pessulus URLs +_F_gnome_iconcache="y" +_F_gnome_desktop="y" +Finclude gnome gnome-scriptlet +url="http://live.gnome.org/Pessulus" +sha1sums=('598ef7ed3588fe08ad3d8b8148a6aa1b413a7bc0') +# On a version bump, rebuild sabayon # optimization OK -sha1sums=('f3dca72688c50039ce9b53256be7af929a79cb23') From bouleetbil at frogdev.info Sun Oct 5 12:24:05 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Oct 5 12:24:07 2008 Subject: [Frugalware-git] bouleetbilgnome224: sabayon-2.22.0-1-i686 Message-ID: <20081005102405.20C6A1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=59bf85aaa522fd95e7699441533e558ff1bb1e1a commit 59bf85aaa522fd95e7699441533e558ff1bb1e1a Author: bouleetbil Date: Sun Oct 5 12:21:31 2008 +0200 sabayon-2.22.0-1-i686 *rebuild with pessulus>=2.24.0 diff --git a/source/gnome-extra/sabayon/FrugalBuild b/source/gnome-extra/sabayon/FrugalBuild index 376c60d..2bafdca 100644 --- a/source/gnome-extra/sabayon/FrugalBuild +++ b/source/gnome-extra/sabayon/FrugalBuild @@ -9,7 +9,7 @@ pkgdesc="Sabayon is a user profile system for Gnome" url="http://www.gnome.org/projects/sabayon" groups=('gnome-extra') archs=('i686' 'x86_64') -depends=('gnome-desktop' 'xorg-server' 'gnome-python' 'python-ldap' 'pessulus>=2.16.2') +depends=('gnome-desktop' 'xorg-server' 'gnome-python' 'python-ldap' 'pessulus>=2.24.0') makedepends=('intltool' 'gnome-doc-utils') Finclude gnome python source=(${source[@]} $pkgname-2.17.90-use-gksu.patch pessulus_integration.patch) From voroskoi at frugalware.org Sun Oct 5 12:44:54 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:45:30 2008 Subject: [Frugalware-git] frugalware-current: curl-7.19.0-1-x86_64 Message-ID: <20081005104454.559DD11901A1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=15e3cec45b9e6c49e47b8c3db5c0482497ece81c commit 15e3cec45b9e6c49e47b8c3db5c0482497ece81c Author: voroskoi Date: Thu Oct 2 01:08:01 2008 +0200 curl-7.19.0-1-x86_64 version bump diff --git a/source/network/curl/FrugalBuild b/source/network/curl/FrugalBuild index b6e3df0..739b8ed 100644 --- a/source/network/curl/FrugalBuild +++ b/source/network/curl/FrugalBuild @@ -3,8 +3,8 @@ # Maintainer: voroskoi pkgname=curl -pkgver=7.18.0 -pkgrel=2 +pkgver=7.19.0 +pkgrel=1 pkgdesc="A command line tool for transferring data specified with URL syntax." url="http://curl.haxx.se" makedepends=('groff') From voroskoi at frugalware.org Sun Oct 5 12:44:54 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:45:32 2008 Subject: [Frugalware-git] frugalware-current: centericq-4.21.0-3-x86_64 Message-ID: <20081005104454.61A8F11901A5@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bf2a011a8a4599b45aa6b7d7bfd578afa858958e commit bf2a011a8a4599b45aa6b7d7bfd578afa858958e Author: voroskoi Date: Thu Oct 2 09:16:03 2008 +0200 centericq-4.21.0-3-x86_64 rebuilt with curl>=7.19 added gcc43_includes.diff diff --git a/source/network-extra/centericq/FrugalBuild b/source/network-extra/centericq/FrugalBuild index baecbe4..54f2938 100644 --- a/source/network-extra/centericq/FrugalBuild +++ b/source/network-extra/centericq/FrugalBuild @@ -4,20 +4,23 @@ pkgname=centericq pkgver=4.21.0 -pkgrel=2 +pkgrel=3 pkgdesc="A text mode menu- and window-driven IM interface." groups=('network-extra') archs=('i686' 'x86_64') url="http://konst.org.ua/centericq/" -depends=('libjpeg' 'ncurses' 'openssl' 'curl>=7.16.0' 'libstdc++') +depends=('libjpeg' 'ncurses' 'openssl' 'curl>=7.19.0' 'libstdc++') up2date="lynx -dump $url|grep Release|sed 's/.*e \(.*\) f.*/\1/'" -source=(http://konst.org.ua/download/$pkgname-$pkgver.tar.gz centericq-amd64-gcc4fix.patch) +source=(http://konst.org.ua/download/$pkgname-$pkgver.tar.gz \ + centericq-amd64-gcc4fix.patch gcc43_includes.diff) sha1sums=('8b5fbd8b945a5a6f0fd57e831ccfaef520a96315' \ - '6dc34394d2946b7d876d1d1e1efabb9708241153') + '6dc34394d2946b7d876d1d1e1efabb9708241153' \ + '412ab7b6e8840b9894c12fa4130cba21d3e20d03') build() { Fcd [ "$CARCH" == "x86_64" ] && Fpatch centericq-amd64-gcc4fix.patch + Fpatch gcc43_includes.diff # fixes "can only configure for one host and one target at a time" for i in connwrap-0.1 kkconsui-0.1 kkstrtext-0.1 kksystr-0.1 \ libicq2000-0.1 libjabber-0.1 libmsn-0.1 libyahoo2-0.1 @@ -28,5 +31,4 @@ build() { Fmakeinstall } - # optimization OK diff --git a/source/network-extra/centericq/gcc43_includes.diff b/source/network-extra/centericq/gcc43_includes.diff new file mode 100644 index 0000000..26db56c --- /dev/null +++ b/source/network-extra/centericq/gcc43_includes.diff @@ -0,0 +1,102 @@ +diff -aur centericq-4.21.0/libicq2000-0.1/libicq2000/ContactTree.h fw_centericq-4.21.0/libicq2000-0.1/libicq2000/ContactTree.h +--- centericq-4.21.0/libicq2000-0.1/libicq2000/ContactTree.h 2004-03-06 20:02:12.000000000 +0100 ++++ fw_centericq-4.21.0/libicq2000-0.1/libicq2000/ContactTree.h 2008-10-02 01:29:19.000000000 +0200 +@@ -23,6 +23,7 @@ + #ifndef CONTACTTREE_H + #define CONTACTTREE_H + ++#include + #include + #include + #include +diff -aur centericq-4.21.0/libicq2000-0.1/src/Capabilities.cpp fw_centericq-4.21.0/libicq2000-0.1/src/Capabilities.cpp +--- centericq-4.21.0/libicq2000-0.1/src/Capabilities.cpp 2004-06-28 10:46:14.000000000 +0200 ++++ fw_centericq-4.21.0/libicq2000-0.1/src/Capabilities.cpp 2008-10-02 01:57:13.000000000 +0200 +@@ -21,6 +21,8 @@ + + #include "Capabilities.h" + ++#include ++ + using std::set; + + namespace ICQ2000 { +diff -aur centericq-4.21.0/libicq2000-0.1/src/ICQ.cpp fw_centericq-4.21.0/libicq2000-0.1/src/ICQ.cpp +--- centericq-4.21.0/libicq2000-0.1/src/ICQ.cpp 2004-02-11 00:51:11.000000000 +0100 ++++ fw_centericq-4.21.0/libicq2000-0.1/src/ICQ.cpp 2008-10-02 01:51:44.000000000 +0200 +@@ -23,6 +23,7 @@ + + #include "sstream_fix.h" + #include ++#include + + using std::string; + using std::list; +diff -aur centericq-4.21.0/libicq2000-0.1/src/socket.cpp fw_centericq-4.21.0/libicq2000-0.1/src/socket.cpp +--- centericq-4.21.0/libicq2000-0.1/src/socket.cpp 2005-01-07 22:28:28.000000000 +0100 ++++ fw_centericq-4.21.0/libicq2000-0.1/src/socket.cpp 2008-10-02 01:44:24.000000000 +0200 +@@ -21,6 +21,7 @@ + + #include "sstream_fix.h" + #include ++#include + + #include "socket.h" + +diff -aur centericq-4.21.0/libmsn-0.1/msn/connection.cpp fw_centericq-4.21.0/libmsn-0.1/msn/connection.cpp +--- centericq-4.21.0/libmsn-0.1/msn/connection.cpp 2004-06-29 01:17:07.000000000 +0200 ++++ fw_centericq-4.21.0/libmsn-0.1/msn/connection.cpp 2008-10-02 02:07:58.000000000 +0200 +@@ -38,6 +38,7 @@ + #include + #include + #include ++#include + + namespace MSN + { +diff -aur centericq-4.21.0/libmsn-0.1/msn/filetransfer.cpp fw_centericq-4.21.0/libmsn-0.1/msn/filetransfer.cpp +--- centericq-4.21.0/libmsn-0.1/msn/filetransfer.cpp 2004-06-29 12:59:04.000000000 +0200 ++++ fw_centericq-4.21.0/libmsn-0.1/msn/filetransfer.cpp 2008-10-02 02:06:58.000000000 +0200 +@@ -35,6 +35,8 @@ + + #include + #include ++#include ++#include + + namespace MSN + { +diff -aur centericq-4.21.0/libmsn-0.1/msn/message.cpp fw_centericq-4.21.0/libmsn-0.1/msn/message.cpp +--- centericq-4.21.0/libmsn-0.1/msn/message.cpp 2004-06-21 23:57:38.000000000 +0200 ++++ fw_centericq-4.21.0/libmsn-0.1/msn/message.cpp 2008-10-02 01:29:19.000000000 +0200 +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + namespace MSN + { +diff -aur centericq-4.21.0/libmsn-0.1/msn/notificationserver.cpp fw_centericq-4.21.0/libmsn-0.1/msn/notificationserver.cpp +--- centericq-4.21.0/libmsn-0.1/msn/notificationserver.cpp 2004-12-19 03:50:29.000000000 +0100 ++++ fw_centericq-4.21.0/libmsn-0.1/msn/notificationserver.cpp 2008-10-02 02:20:35.000000000 +0200 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + #ifndef WIN32 + #include +diff -aur centericq-4.21.0/libmsn-0.1/msn/util.cpp fw_centericq-4.21.0/libmsn-0.1/msn/util.cpp +--- centericq-4.21.0/libmsn-0.1/msn/util.cpp 2004-06-29 01:17:07.000000000 +0200 ++++ fw_centericq-4.21.0/libmsn-0.1/msn/util.cpp 2008-10-02 08:57:52.000000000 +0200 +@@ -23,6 +23,8 @@ + #include + #include + #include ++#include ++#include + + namespace MSN + { From voroskoi at frugalware.org Sun Oct 5 12:44:54 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:45:34 2008 Subject: [Frugalware-git] frugalware-current: darcs-2.0.2-2-x86_64 Message-ID: <20081005104454.6E9D511901AB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f16f6da8b0e9f991b54cd7d99d92670c0feb45ba commit f16f6da8b0e9f991b54cd7d99d92670c0feb45ba Author: voroskoi Date: Thu Oct 2 09:34:29 2008 +0200 darcs-2.0.2-2-x86_64 rebuilt with curl>=7.19 diff --git a/source/devel-extra/darcs/FrugalBuild b/source/devel-extra/darcs/FrugalBuild index 5465503..379441c 100644 --- a/source/devel-extra/darcs/FrugalBuild +++ b/source/devel-extra/darcs/FrugalBuild @@ -3,10 +3,10 @@ pkgname=darcs pkgver=2.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="David's Advanced Revision Control System" url="http://darcs.net" -depends=('gmp' 'curl>=7.16.0' 'readline') +depends=('gmp' 'curl>=7.19.0' 'readline') groups=('devel-extra') archs=('i686' 'x86_64') makedepends=('ghc>=6.6.1-2' 'latex2html' 'git') @@ -29,4 +29,3 @@ build() Fmakeinstall Fmv /usr/share/doc/$pkgname /usr/share/doc/$pkgname-$pkgver } - From voroskoi at frugalware.org Sun Oct 5 12:44:54 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:45:36 2008 Subject: [Frugalware-git] frugalware-current: libofa-0.9.3-4-x86_64 Message-ID: <20081005104454.831A811901AE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=53b31ab79a1b185565f6890727468b51164e86af commit 53b31ab79a1b185565f6890727468b51164e86af Author: voroskoi Date: Thu Oct 2 09:54:38 2008 +0200 libofa-0.9.3-4-x86_64 rebuilt with curl>=7.19 diff --git a/source/lib/libofa/FrugalBuild b/source/lib/libofa/FrugalBuild index f3b4f05..7b05c7c 100644 --- a/source/lib/libofa/FrugalBuild +++ b/source/lib/libofa/FrugalBuild @@ -4,10 +4,10 @@ pkgname=libofa pkgver=0.9.3 -pkgrel=3 +pkgrel=4 pkgdesc="Open Fingerprint Architecture Library." url="http://www.musicip.com/dns/" -depends=('libstdc++' 'fftw>=3.1.2-2' 'curl>=7.16.0' 'expat') +depends=('libstdc++' 'fftw>=3.1.2-2' 'curl>=7.19.0' 'expat') groups=('lib') archs=('i686' 'x86_64') up2date="lynx -dump http://code.google.com/p/musicip-libofa/|grep -om1 'libofa-\(.*\).tar.gz'|Flasttar" From voroskoi at frugalware.org Sun Oct 5 12:44:54 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:45:38 2008 Subject: [Frugalware-git] frugalware-current: liblrdf-0.4.0-4-x86_64 Message-ID: <20081005104454.8DB0D11901AF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=93f634eb4c5f0602ea64701d3dcd8c90f83c695e commit 93f634eb4c5f0602ea64701d3dcd8c90f83c695e Author: voroskoi Date: Thu Oct 2 09:58:43 2008 +0200 liblrdf-0.4.0-4-x86_64 rebuilt with curl>=7.19 diff --git a/source/lib-extra/liblrdf/FrugalBuild b/source/lib-extra/liblrdf/FrugalBuild index 0bd59a0..6a5c3e6 100644 --- a/source/lib-extra/liblrdf/FrugalBuild +++ b/source/lib-extra/liblrdf/FrugalBuild @@ -4,12 +4,12 @@ pkgname=liblrdf pkgver=0.4.0 -pkgrel=3 +pkgrel=4 pkgdesc="A lightweight RDF library with special support for LADSPA plugins." _F_sourceforge_dirname="lrdf" Finclude sourceforge url="http://sourceforge.net/projects/lrdf" -depends=('raptor' 'curl>=7.16.0') +depends=('raptor' 'curl>=7.19.0') groups=('lib-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=118210 | grep -m 1 'liblrdf' | sed 's/.*rdf \[//;s/ .*$//;s/^...//'" From voroskoi at frugalware.org Sun Oct 5 12:44:54 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:45:42 2008 Subject: [Frugalware-git] frugalware-current: urlgfe-1.0.2-2-x86_64 Message-ID: <20081005104454.7A09B11901AD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=97376dfc4025f6689255649b3f065ac585e2f5a0 commit 97376dfc4025f6689255649b3f065ac585e2f5a0 Author: voroskoi Date: Thu Oct 2 09:45:01 2008 +0200 urlgfe-1.0.2-2-x86_64 rebuilt with curl>=7.19 diff --git a/source/xapps-extra/urlgfe/FrugalBuild b/source/xapps-extra/urlgfe/FrugalBuild index f12bbed..263dd77 100644 --- a/source/xapps-extra/urlgfe/FrugalBuild +++ b/source/xapps-extra/urlgfe/FrugalBuild @@ -3,13 +3,13 @@ pkgname=urlgfe pkgver=1.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="urlgfe is a GTK2 based download manager." _F_sourceforge_dirname="urlget" _F_sourceforge_brokenup2date=1 Finclude sourceforge url="http://urlget.sourceforge.net/" -depends=('gtk+2' 'curl>=7.16.0') +depends=('gtk+2' 'curl>=7.19.0') options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') From voroskoi at frugalware.org Sun Oct 5 12:44:54 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:45:44 2008 Subject: [Frugalware-git] frugalware-current: libnxml-0.18.3-2-x86_64 Message-ID: <20081005104454.979DE11901B1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=345ac7c28b60d36c2e8675f10bfc5dfe36393613 commit 345ac7c28b60d36c2e8675f10bfc5dfe36393613 Author: voroskoi Date: Thu Oct 2 10:02:38 2008 +0200 libnxml-0.18.3-2-x86_64 rebuilt with curl>=7.19 diff --git a/source/lib/libnxml/FrugalBuild b/source/lib/libnxml/FrugalBuild index b41f5ca..77e309b 100644 --- a/source/lib/libnxml/FrugalBuild +++ b/source/lib/libnxml/FrugalBuild @@ -3,10 +3,10 @@ pkgname=libnxml pkgver=0.18.3 -pkgrel=1 +pkgrel=2 pkgdesc="nXML is a C library for parsing, writing and creating XML 1.0 and 1.1 files or streams." url="http://www2.autistici.org/bakunin/libnxml" -depends=('openssl' 'curl>=7.16.0') +depends=('openssl' 'curl>=7.19.0') groups=('lib') archs=('i686' 'x86_64') up2date="lynx -dump $url |Flasttar" From voroskoi at frugalware.org Sun Oct 5 12:44:54 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:45:45 2008 Subject: [Frugalware-git] frugalware-current: libofx-0.9.0-2-x86_64 Message-ID: <20081005104454.A2D9911901B9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3557de14d5b56c08cad7e48e61bb351b97be9f66 commit 3557de14d5b56c08cad7e48e61bb351b97be9f66 Author: voroskoi Date: Thu Oct 2 10:11:00 2008 +0200 libofx-0.9.0-2-x86_64 rebuilt with curl>=7.19 added libofx-0.9.0-gcc43.patch diff --git a/source/lib-extra/libofx/FrugalBuild b/source/lib-extra/libofx/FrugalBuild index f69a266..23dacf7 100644 --- a/source/lib-extra/libofx/FrugalBuild +++ b/source/lib-extra/libofx/FrugalBuild @@ -3,16 +3,17 @@ pkgname=libofx pkgver=0.9.0 -pkgrel=1 +pkgrel=2 pkgdesc="libofx API for the OFX banking standard." Finclude sourceforge url="http://libofx.sourceforge.net" -depends=('curl>=7.16.0' 'opensp' 'libxml++' 'glib2') +depends=('curl>=7.19.0' 'opensp' 'libxml++' 'glib2') groups=('lib-extra') archs=('i686' 'x86_64') options=('scriptlet') -source=(${source[@]} libxml-plus-plus.patch) +source=(${source[@]} libxml-plus-plus.patch libofx-0.9.0-gcc43.patch) sha1sums=('12e6f07d43240b090f0a39e7b118cbf64d57c90b' \ - '29fa6d94fac45ffbe7916ea5e3d3fee396cafb95') + '29fa6d94fac45ffbe7916ea5e3d3fee396cafb95' \ + '571bd81cc304c6e56abc39928f95621275a177c8') # optimization OK diff --git a/source/lib-extra/libofx/libofx-0.9.0-gcc43.patch b/source/lib-extra/libofx/libofx-0.9.0-gcc43.patch new file mode 100644 index 0000000..c4964a4 --- /dev/null +++ b/source/lib-extra/libofx/libofx-0.9.0-gcc43.patch @@ -0,0 +1,374 @@ +diff -NrU5 libofx-0.9.0.orig/lib/ofx_container_transaction.cpp libofx-0.9.0/lib/ofx_container_transaction.cpp +--- libofx-0.9.0.orig/lib/ofx_container_transaction.cpp 2007-11-10 00:10:49.000000000 +0100 ++++ libofx-0.9.0/lib/ofx_container_transaction.cpp 2008-04-21 22:26:24.000000000 +0200 +@@ -19,10 +19,11 @@ + + #ifdef HAVE_CONFIG_H + #include + #endif + ++#include + #include + #include "messages.hh" + #include "libofx.h" + #include "ofx_containers.hh" + #include "ofx_utilities.hh" +diff -NrU5 libofx-0.9.0.orig/lib/ofx_request_accountinfo.cpp libofx-0.9.0/lib/ofx_request_accountinfo.cpp +--- libofx-0.9.0.orig/lib/ofx_request_accountinfo.cpp 2007-10-28 03:33:43.000000000 +0100 ++++ libofx-0.9.0/lib/ofx_request_accountinfo.cpp 2008-04-21 22:26:24.000000000 +0200 +@@ -19,10 +19,11 @@ + + #ifdef HAVE_CONFIG_H + #include + #endif + ++#include + #include + #include "libofx.h" + #include "ofx_request_accountinfo.hh" + + using namespace std; +diff -NrU5 libofx-0.9.0.orig/lib/ofx_request.cpp libofx-0.9.0/lib/ofx_request.cpp +--- libofx-0.9.0.orig/lib/ofx_request.cpp 2007-10-28 03:37:52.000000000 +0100 ++++ libofx-0.9.0/lib/ofx_request.cpp 2008-04-21 22:26:24.000000000 +0200 +@@ -19,10 +19,11 @@ + + #ifdef HAVE_CONFIG_H + #include + #endif + ++#include + #include + #include "messages.hh" + #include "libofx.h" + #include "ofx_request.hh" + +diff -NrU5 libofx-0.9.0.orig/lib/ofx_request_statement.cpp libofx-0.9.0/lib/ofx_request_statement.cpp +--- libofx-0.9.0.orig/lib/ofx_request_statement.cpp 2007-10-28 13:57:18.000000000 +0100 ++++ libofx-0.9.0/lib/ofx_request_statement.cpp 2008-04-21 22:26:24.000000000 +0200 +@@ -19,10 +19,11 @@ + + #ifdef HAVE_CONFIG_H + #include + #endif + ++#include + #include + #include "libofx.h" + #include "ofx_utilities.hh" + #include "ofx_request_statement.hh" + +diff -NrU5 libofx-0.9.0.orig/lib/ofx_utilities.cpp libofx-0.9.0/lib/ofx_utilities.cpp +--- libofx-0.9.0.orig/lib/ofx_utilities.cpp 2007-10-27 14:12:49.000000000 +0200 ++++ libofx-0.9.0/lib/ofx_utilities.cpp 2008-04-21 22:26:24.000000000 +0200 +@@ -19,11 +19,12 @@ + #include + #include + + #include "ParserEventGeneratorKit.h" + #include "SGMLApplication.h" +-#include ++#include ++#include + #include + #include + #include "messages.hh" + #include "ofx_utilities.hh" + +diff -NrU5 libofx-0.9.0.orig/lib/ofx_utilities.cpp.orig libofx-0.9.0/lib/ofx_utilities.cpp.orig +--- libofx-0.9.0.orig/lib/ofx_utilities.cpp.orig 1970-01-01 01:00:00.000000000 +0100 ++++ libofx-0.9.0/lib/ofx_utilities.cpp.orig 2007-10-27 14:12:49.000000000 +0200 +@@ -0,0 +1,245 @@ ++/*************************************************************************** ++ ofx_util.cpp ++ ------------------- ++ copyright : (C) 2002 by Benoit Grégoire ++ email : bock@step.polymtl.ca ++ ***************************************************************************/ ++/**@file ++ * \brief Various simple functions for type conversion & al ++ */ ++/*************************************************************************** ++ * * ++ * 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. * ++ * * ++ ***************************************************************************/ ++#include ++#include ++#include ++ ++#include "ParserEventGeneratorKit.h" ++#include "SGMLApplication.h" ++#include ++#include ++#include ++#include "messages.hh" ++#include "ofx_utilities.hh" ++ ++#ifdef OS_WIN32 ++# define DIRSEP "\\" ++#else ++# define DIRSEP "/" ++#endif ++ ++ ++using namespace std; ++/** ++ Convert an OpenSP CharString directly to a C++ stream, to enable the use of cout directly for debugging. ++*/ ++/*ostream &operator<<(ostream &os, SGMLApplication::CharString s) ++ { ++ for (size_t i = 0; i < s.len; i++) ++ { ++ os << ((char *)(s.ptr))[i*sizeof(SGMLApplication::Char)]; ++ } ++ return os; ++ }*/ ++ ++/*wostream &operator<<(wostream &os, SGMLApplication::CharString s) ++ { ++ for (size_t i = 0; i < s.len; i++) ++ {//cout<
++ * To solve this problem (since usually a time error is relatively unimportant, but date error is), and to avoid problems in Australia caused by the behaviour in libofx up to 0.6.4, it was decided starting with 0.6.5 to use the following behavior:

++ * -No specific time is given in the file (date only): Considering that most banks seem to be sending dates in this format represented as local time (not compliant with the specs), the transaction is assumed to have occurred 11h59 (just before noon) LOCAL TIME. This way, we should never change the date, since you'd have to travel in a timezone at least 11 hours backwards or 13 hours forward from your own to introduce mistakes. However, if you are in timezone +13 or +14, and your bank meant the data to be interpreted by the spec, you will get the wrong date. We hope that banks in those timezone will either represent in local time like most, or specify the timezone properly.

++ * -No timezone is specified, but exact time is, the same behavior is mostly used, as many banks just append zeros instead of using the short notation. However, the time specified is used, even if 0 (midnight).

++ * -When a timezone is specified, it is always used to properly convert in local time, following the spec. ++ * ++ */ ++time_t ofxdate_to_time_t(const string ofxdate) ++{ ++ struct tm time; ++ double local_offset; /* in seconds */ ++ float ofx_gmt_offset; /* in fractionnal hours */ ++ char timezone[4]; /* Original timezone: the library does not expose this value*/ ++ char exact_time_specified = false; ++ char time_zone_specified = false; ++ ++ time_t temptime; ++ std::time(&temptime); ++ local_offset = difftime(mktime(localtime(&temptime)), mktime(gmtime(&temptime))); ++ ++ if(ofxdate.size()!=0){ ++ time.tm_year=atoi(ofxdate.substr(0,4).c_str())-1900; ++ time.tm_mon=atoi(ofxdate.substr(4,2).c_str())-1; ++ time.tm_mday=atoi(ofxdate.substr(6,2).c_str()); ++ if(ofxdate.size()>8) { ++ /* if exact time is specified */ ++exact_time_specified = true; ++ time.tm_hour=atoi(ofxdate.substr(8,2).c_str()); ++ time.tm_min=atoi(ofxdate.substr(10,2).c_str()); ++ time.tm_sec=atoi(ofxdate.substr(12,2).c_str()); ++ } ++ ++ /* Check if the timezone has been specified */ ++ string::size_type startidx = ofxdate.find("["); ++ string::size_type endidx; ++ if(startidx!=string::npos){ ++ /* Time zone was specified */ ++ time_zone_specified = true; ++ startidx++; ++ endidx = ofxdate.find(":", startidx)-1; ++ ofx_gmt_offset=atof(ofxdate.substr(startidx,(endidx-startidx)+1).c_str()); ++ startidx = endidx+2; ++ strncpy(timezone,ofxdate.substr(startidx,3).c_str(),4); ++ } ++ else{ ++ /* Time zone was not specified, assume GMT (provisionnaly) in case exact time is specified */ ++ ofx_gmt_offset=0; ++ strcpy(timezone, "GMT"); ++ } ++ ++ if(time_zone_specified == true) ++ { ++ /* If the timezone is specified always correct the timezone */ ++ /* If the timezone is not specified, but the exact time is, correct the timezone, assuming GMT following the spec */ ++ /* Correct the time for the timezone */ ++ time.tm_sec = time.tm_sec + (int)(local_offset - (ofx_gmt_offset*60*60));//Convert from fractionnal hours to seconds ++ } ++ else if (exact_time_specified == false) ++ { ++ /*Time zone data missing and exact time not specified, diverge from the OFX spec ans assume 11h59 local time */ ++ time.tm_hour=11; ++ time.tm_min=59; ++ time.tm_sec=0; ++ } ++ } ++ else{ ++ message_out(ERROR, "ofxdate_to_time_t(): Unable to convert time, string is 0 length!"); ++ } ++ return mktime(&time); ++} ++ ++/** ++ * Convert a C++ string containing an amount of money as specified by the OFX standard and convert it to a double float. ++ *\note The ofx number format is the following: "." or "," as decimal separator, NO thousands separator. ++ */ ++double ofxamount_to_double(const string ofxamount) ++{ ++ //Replace commas and decimal points for atof() ++ string::size_type idx; ++ string tmp = ofxamount; ++ ++ idx = tmp.find(','); ++ if(idx==string::npos){ ++ idx = tmp.find('.'); ++ } ++ ++ if(idx!=string::npos){ ++ tmp.replace(idx,1,1,((localeconv())->decimal_point)[0]); ++ } ++ ++ return atof(tmp.c_str()); ++} ++ ++/** ++Many weird caracters can be present inside a SGML element, as a result on the transfer protocol, or for any reason. This function greatly enhances the reliability of the library by zapping those gremlins (backspace,formfeed,newline,carriage return, horizontal and vertical tabs) as well as removing whitespace at the begining and end of the string. Otherwise, many problems will occur during stringmatching. ++*/ ++string strip_whitespace(const string para_string) ++{ ++ size_t index; ++ size_t i; ++ string temp_string = para_string; ++ const char *whitespace = " \b\f\n\r\t\v"; ++ const char *abnormal_whitespace = "\b\f\n\r\t\v";//backspace,formfeed,newline,cariage return, horizontal and vertical tabs ++ message_out(DEBUG4,"strip_whitespace() Before: |"+temp_string+"|"); ++ for(i=0;i<=temp_string.size()&&temp_string.find_first_of(whitespace, i)==i&&temp_string.find_first_of(whitespace, i)!=string::npos;i++); ++ temp_string.erase(0,i);//Strip leading whitespace ++ for(i=temp_string.size()-1;(i>=0)&&(temp_string.find_last_of(whitespace, i)==i)&&(temp_string.find_last_of(whitespace, i)!=string::npos);i--); ++ temp_string.erase(i+1,temp_string.size()-(i+1));//Strip trailing whitespace ++ ++while ((index = temp_string.find_first_of(abnormal_whitespace))!=string::npos) ++ { ++ temp_string.erase(index,1);//Strip leading whitespace ++ }; ++ ++ message_out(DEBUG4,"strip_whitespace() After: |"+temp_string+"|"); ++ ++ return temp_string; ++} ++ ++ ++int mkTempFileName(const char *tmpl, char *buffer, unsigned int size) { ++ const char *tmp_dir; ++ ++ tmp_dir = getenv ("TMPDIR"); ++ if (!tmp_dir) ++ tmp_dir = getenv ("TMP"); ++ if (!tmp_dir) ++ tmp_dir = getenv ("TEMP"); ++ ++ if (!tmp_dir) ++ { ++#ifdef OS_WIN32 ++ tmp_dir = "C:\\"; ++#else ++ tmp_dir = "/tmp"; ++#endif /* !OS_WIN32 */ ++ } ++ ++ strncpy(buffer, tmp_dir, size); ++ assert((strlen(buffer)+strlen(tmpl)+2) /* Include config constants, e.g., VERSION TF */ + #include + #include + #include ++#include + + #ifdef HAVE_LIBCURL + #include + #endif + +diff -NrU5 libofx-0.9.0.orig/ofxconnect/ofxpartner.cpp libofx-0.9.0/ofxconnect/ofxpartner.cpp +--- libofx-0.9.0.orig/ofxconnect/ofxpartner.cpp 2006-03-26 06:49:54.000000000 +0200 ++++ libofx-0.9.0/ofxconnect/ofxpartner.cpp 2008-04-21 22:28:26.000000000 +0200 +@@ -33,10 +33,13 @@ + #include + + #include + #include + #include ++#include ++#include ++ + + using std::string; + using std::vector; + using std::cout; + using std::endl; +diff -NrU5 libofx-0.9.0.orig/ofxdump/ofxdump.cpp libofx-0.9.0/ofxdump/ofxdump.cpp +--- libofx-0.9.0.orig/ofxdump/ofxdump.cpp 2006-08-02 06:19:22.000000000 +0200 ++++ libofx-0.9.0/ofxdump/ofxdump.cpp 2008-04-21 22:26:24.000000000 +0200 +@@ -27,10 +27,12 @@ + * (at your option) any later version. * + * * + ***************************************************************************/ + #include + #include ++#include ++#include + #include + #include "libofx.h" + #include /* for printf() */ + #include /* Include config constants, e.g., VERSION TF */ + #include From voroskoi at frugalware.org Sun Oct 5 12:44:54 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:45:45 2008 Subject: [Frugalware-git] frugalware-current: amarok-1.4.10-2-x86_64 Message-ID: <20081005104454.AE57611901BD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0d16bf324ab986aff6a6578f7e76c3b55853f7d8 commit 0d16bf324ab986aff6a6578f7e76c3b55853f7d8 Author: voroskoi Date: Fri Oct 3 00:48:55 2008 +0200 amarok-1.4.10-2-x86_64 rebuilt with curl>=7.19 diff --git a/source/kde-extra/amarok/FrugalBuild b/source/kde-extra/amarok/FrugalBuild index 520d4c9..0990f51 100644 --- a/source/kde-extra/amarok/FrugalBuild +++ b/source/kde-extra/amarok/FrugalBuild @@ -4,11 +4,11 @@ pkgname=amarok pkgver=1.4.10 -pkgrel=1 +pkgrel=2 pkgdesc="amaroK is a music player for Linux and Unix with an intuitive interface" depends=('libtunepimp>=0.5.2-3' 'xine-lib' 'libifp' 'kdebase>=3.5.8' 'taglib' 'libnjb' \ 'libgpod>=0.6.0' 'ruby' 'python>=2.5' 'libvisual-plugins' 'libmtp>=0.2.5' 'libkarma' \ - 'curl>=7.16.1' 'libmysqlclient') + 'curl>=7.19.0' 'libmysqlclient') makedepends=('mysql') rodepends=('unzip') groups=('kde-extra') From voroskoi at frugalware.org Sun Oct 5 12:44:54 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:45:46 2008 Subject: [Frugalware-git] frugalware-current: icecast-2.3.2-1-x86_64 Message-ID: <20081005104454.B98BC1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b02e5538e823328bc8829781ca34932d2cae1814 commit b02e5538e823328bc8829781ca34932d2cae1814 Author: voroskoi Date: Fri Oct 3 00:54:38 2008 +0200 icecast-2.3.2-1-x86_64 version bump rebuilt with curl>=7.19 removed curl-7.16.0.patch diff --git a/source/network-extra/icecast/FrugalBuild b/source/network-extra/icecast/FrugalBuild index f4d0bdc..74ca772 100644 --- a/source/network-extra/icecast/FrugalBuild +++ b/source/network-extra/icecast/FrugalBuild @@ -3,19 +3,18 @@ # Contributor: Tuxbubling pkgname=icecast -pkgver=2.3.1 -pkgrel=2 +pkgver=2.3.2 +pkgrel=1 pkgdesc="Icecast is a streaming media server." url="http://www.icecast.org/" groups=('network-extra') archs=('i686' 'x86_64') -depends=('libxslt' 'libvorbis' 'curl>=7.16.0' 'libxml2') +depends=('libxslt' 'libvorbis' 'curl>=7.19.0' 'libxml2') up2date="lynx -dump http://www.icecast.org/download.php | grep icecast-[0-9\.]*tar.gz | sed -ne 's/.*-//;s/.tar.gz//;1 p'" -source=(http://downloads.us.xiph.org/releases/icecast/$pkgname-$pkgver.tar.gz icecast rc.icecast curl-7.16.0.patch) -sha1sums=('e874ffc7dbed82a15889186a1cd3b7b7de3aba5d' \ +source=(http://downloads.us.xiph.org/releases/icecast/$pkgname-$pkgver.tar.gz icecast rc.icecast) +sha1sums=('a52b13505548c2eff2c64aab95a42dcafda11227' \ '98ce0b4d3f2234944de42e90434b7deb3068c478' \ - 'e3c53bb8d458c14a6d0bf5fae931ed6b45591f7f' \ - 'ecaef4d1f10ff0315620a95778061a0a881f74dd') + 'e3c53bb8d458c14a6d0bf5fae931ed6b45591f7f') build() { Fmkdir /var/log/icecast @@ -34,5 +33,4 @@ build() { sed -i "`expr $line2` d" $Fdestdir/etc/icecast/icecast.xml } - # optimization OK diff --git a/source/network-extra/icecast/curl-7.16.0.patch b/source/network-extra/icecast/curl-7.16.0.patch deleted file mode 100644 index e52d452..0000000 --- a/source/network-extra/icecast/curl-7.16.0.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naurp icecast-2.3.1/src/auth_url.c icecast-2.3.1-curl/src/auth_url.c ---- icecast-2.3.1/src/auth_url.c 2005-11-30 19:16:17.000000000 +0100 -+++ icecast-2.3.1-curl/src/auth_url.c 2006-11-12 01:11:51.000000000 +0100 -@@ -518,7 +518,6 @@ int auth_get_url_auth (auth_t *authentic - curl_easy_setopt (url_info->handle, CURLOPT_WRITEDATA, url_info->handle); - curl_easy_setopt (url_info->handle, CURLOPT_NOSIGNAL, 1L); - curl_easy_setopt (url_info->handle, CURLOPT_TIMEOUT, 15L); -- curl_easy_setopt (url_info->handle, CURLOPT_PASSWDFUNCTION, my_getpass); - curl_easy_setopt (url_info->handle, CURLOPT_ERRORBUFFER, &url_info->errormsg[0]); - - if (url_info->username && url_info->password) From voroskoi at frugalware.org Sun Oct 5 12:44:54 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:45:47 2008 Subject: [Frugalware-git] frugalware-current: grip-3.2.0-6-x86_64 Message-ID: <20081005104454.CE4B711901D1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=555a5dd525bee663acf15e2542d8b851e1a05981 commit 555a5dd525bee663acf15e2542d8b851e1a05981 Author: voroskoi Date: Fri Oct 3 01:22:06 2008 +0200 grip-3.2.0-6-x86_64 rebuilt with curl>=7.19 diff --git a/source/gnome-extra/grip/FrugalBuild b/source/gnome-extra/grip/FrugalBuild index 8a19598..6825218 100644 --- a/source/gnome-extra/grip/FrugalBuild +++ b/source/gnome-extra/grip/FrugalBuild @@ -4,9 +4,9 @@ pkgname=grip pkgver=3.2.0 -pkgrel=5 +pkgrel=6 pkgdesc="Grip is a cd-player and cd-ripper for the Gnome desktop." -depends=('curl>=7.16.0' 'libgnomeui' 'vte' 'dbus-glib>=0.71') +depends=('curl>=7.19.0' 'libgnomeui' 'vte' 'dbus-glib>=0.71') archs=('i686' 'x86_64') groups=('gnome-extra') license="GPL2" From voroskoi at frugalware.org Sun Oct 5 12:44:54 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:45:48 2008 Subject: [Frugalware-git] frugalware-current: streamtuner-0.99.99-4-x86_64 Message-ID: <20081005104454.C3EBE11901C5@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=31bce1f1de396af578215f2093084ad6e94f8471 commit 31bce1f1de396af578215f2093084ad6e94f8471 Author: voroskoi Date: Fri Oct 3 01:04:00 2008 +0200 streamtuner-0.99.99-4-x86_64 rebuilt with curl>=7.19 diff --git a/source/xapps-extra/streamtuner/FrugalBuild b/source/xapps-extra/streamtuner/FrugalBuild index f0fb648..c7d1e3d 100644 --- a/source/xapps-extra/streamtuner/FrugalBuild +++ b/source/xapps-extra/streamtuner/FrugalBuild @@ -3,10 +3,10 @@ pkgname=streamtuner pkgver=0.99.99 -pkgrel=3 +pkgrel=4 pkgdesc="Streamtuner is a stream directory browser." url="http://www.nongnu.org/streamtuner/" -depends=('taglib' 'gtk+2' 'libxml2' 'curl>=7.16.0' 'pygtk') +depends=('taglib' 'gtk+2' 'libxml2' 'curl>=7.19.0' 'pygtk') groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url|grep 'streamtuner version'|sed 's/.*n \(.*\), r.*/\1/'" @@ -18,5 +18,4 @@ sha1sums=('d912dbe1741ba9d14342ab6d9d818f06e97f6b59' \ 'ac67e9d041bf129c1bcbd5f3b4a6a3c12b596ea2' \ '2a40abcf4552497a4823bf8dabfffba5257cec6d') - # optimization OK From voroskoi at frugalware.org Sun Oct 5 12:44:54 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:45:49 2008 Subject: [Frugalware-git] frugalware-current: sword-1.5.11-2-x86_64 Message-ID: <20081005104454.E4C9311901A1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=681029cf8edda532c468944120454392dae850d4 commit 681029cf8edda532c468944120454392dae850d4 Author: voroskoi Date: Sat Oct 4 12:02:42 2008 +0200 sword-1.5.11-2-x86_64 rebuilt with curl>=7.19 diff --git a/source/apps-extra/sword/FrugalBuild b/source/apps-extra/sword/FrugalBuild index a50d585..d03165e 100644 --- a/source/apps-extra/sword/FrugalBuild +++ b/source/apps-extra/sword/FrugalBuild @@ -4,17 +4,17 @@ pkgname=sword pkgver=1.5.11 -pkgrel=1 +pkgrel=2 pkgdesc="CrossWire Bible Society's free Bible software project" url='http://www.crosswire.org/sword/' -depends=('openssl' 'curl>=7.16.0' 'libstdc++') +depends=('openssl' 'curl>=7.19.0' 'libstdc++') groups=('apps-extra') archs=('i686' 'x86_64') backup=(etc/sword.conf) up2date="lynx -dump http://www.crosswire.org/sword/software/swordapi.jsp | grep 'sword-.*.tar.gz' | sed 's/.*sword-\(.*\).tar.gz.*/\1/'" source=(http://www.crosswire.org/ftpmirror/pub/sword/source/v`echo $pkgver | sed 's/\(.*\)\..*/\1/'`/$pkgname-$pkgver.tar.gz sword.sh) sha1sums=('d0ff7f039e27c6be5727d548abee929f648ced79' \ - 'c552669a7498177d5f4523ad5c2f5bae63d2dd4d') + 'c552669a7498177d5f4523ad5c2f5bae63d2dd4d') build() { From voroskoi at frugalware.org Sun Oct 5 12:44:54 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:45:50 2008 Subject: [Frugalware-git] frugalware-current: qbittorrent-1.1.4-2-x86_64 Message-ID: <20081005104454.D969211901DA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1f583a00c5c2fcb9bbaca7c8b406c035995d0a4a commit 1f583a00c5c2fcb9bbaca7c8b406c035995d0a4a Author: voroskoi Date: Fri Oct 3 09:47:15 2008 +0200 qbittorrent-1.1.4-2-x86_64 rebuilt with curl>=7.19 diff --git a/source/xapps-extra/qbittorrent/FrugalBuild b/source/xapps-extra/qbittorrent/FrugalBuild index 1b91358..ffbe74d 100644 --- a/source/xapps-extra/qbittorrent/FrugalBuild +++ b/source/xapps-extra/qbittorrent/FrugalBuild @@ -3,9 +3,9 @@ pkgname=qbittorrent pkgver=1.1.4 -pkgrel=1 +pkgrel=2 pkgdesc="A Bittorrent client." -depends=('libtorrent-rasterbar>=0.13.1' 'curl>=7.16.1-2' 'python>=2.5' \ +depends=('libtorrent-rasterbar>=0.13.1' 'curl>=7.19.0' 'python>=2.5' \ 'libqtgui>=4.4.1' 'libqtnetwork>=4.4.1' 'libqtxml>=4.4.1' 'libboost-mt>=1.35.0' \ 'zziplib' 'imagemagick' 'libtool' 'qt4-qdbus>=4.4.1') makedepends=('boost>=1.35.0' 'asio>=1.2.0') From voroskoi at frugalware.org Sun Oct 5 12:44:55 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:45:51 2008 Subject: [Frugalware-git] frugalware-current: xmlrpc-c-1.11.00-2-x86_64 Message-ID: <20081005104455.11CB311901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=21f68ddb6178388f0476757dea9de35ef2221357 commit 21f68ddb6178388f0476757dea9de35ef2221357 Author: voroskoi Date: Sat Oct 4 12:55:17 2008 +0200 xmlrpc-c-1.11.00-2-x86_64 rebuilt with curl>=7.19 added gcc43 patch to get it compile diff --git a/source/network-extra/xmlrpc-c/FrugalBuild b/source/network-extra/xmlrpc-c/FrugalBuild index 750c78a..8fae0c0 100644 --- a/source/network-extra/xmlrpc-c/FrugalBuild +++ b/source/network-extra/xmlrpc-c/FrugalBuild @@ -3,9 +3,9 @@ pkgname=xmlrpc-c pkgver=1.11.00 -pkgrel=1 +pkgrel=2 pkgdesc="This library provides a modular implementation of XML-RPC for C and C++." -depends=('curl>=7.16.0' 'libstdc++' 'libxml2') +depends=('curl>=7.19.0' 'libstdc++' 'libxml2') groups=('network-extra') archs=('i686' 'x86_64') _F_sourceforge_ext=".tgz" @@ -14,11 +14,15 @@ url="http://xmlrpc-c.sourceforge.net/" source=($source \ no-O3s-thx.patch \ use-fPIC-x86_64.patch \ - gcc4.patch) + gcc4.patch \ + gcc43.diff \ + curl-7.19.diff) sha1sums=('b5392268c4b1603d305d01e552ce59b5786e1254' \ '74fa3a548767ed47010100a636b7159158dd5102' \ '6e0ddecbd3dd2e8d415a240ab0a9d00df59d22eb' \ - '0ab8746f8580626c3c87234d93564ff943b9a443') + '0ab8746f8580626c3c87234d93564ff943b9a443' \ + '1906b2c924f7cdd9a4c3830dbecba833d157ef85' \ + '984ab160569987be123b7acc5fa67004633304db') build() { diff --git a/source/network-extra/xmlrpc-c/curl-7.19.diff b/source/network-extra/xmlrpc-c/curl-7.19.diff new file mode 100644 index 0000000..4173e5c --- /dev/null +++ b/source/network-extra/xmlrpc-c/curl-7.19.diff @@ -0,0 +1,12 @@ +diff -aur xmlrpc-c-1.11.00/lib/curl_transport/xmlrpc_curl_transport.c fw_xmlrpc-c-1.11.00/lib/curl_transport/xmlrpc_curl_transport.c +--- xmlrpc-c-1.11.00/lib/curl_transport/xmlrpc_curl_transport.c 2007-05-14 08:26:23.000000000 +0200 ++++ fw_xmlrpc-c-1.11.00/lib/curl_transport/xmlrpc_curl_transport.c 2008-10-04 12:20:20.000000000 +0200 +@@ -557,7 +557,7 @@ + curl_easy_setopt(curlSessionP, CURLOPT_SSLENGINE, + curlSetupP->sslEngine); + if (curlSetupP->sslEngineDefault) +- curl_easy_setopt(curlSessionP, CURLOPT_SSLENGINE_DEFAULT); ++ curl_easy_setopt(curlSessionP, CURLOPT_SSLENGINE_DEFAULT, 1); + if (curlSetupP->sslVersion != XMLRPC_SSLVERSION_DEFAULT) + curl_easy_setopt(curlSessionP, CURLOPT_SSLVERSION, + curlSetupP->sslVersion); diff --git a/source/network-extra/xmlrpc-c/gcc43.diff b/source/network-extra/xmlrpc-c/gcc43.diff new file mode 100644 index 0000000..4976937 --- /dev/null +++ b/source/network-extra/xmlrpc-c/gcc43.diff @@ -0,0 +1,61 @@ +diff -aur xmlrpc-c-1.11.00/include/xmlrpc-c/oldcppwrapper.hpp fw_xmlrpc-c-1.11.00/include/xmlrpc-c/oldcppwrapper.hpp +--- xmlrpc-c-1.11.00/include/xmlrpc-c/oldcppwrapper.hpp 2005-06-10 23:48:43.000000000 +0200 ++++ fw_xmlrpc-c-1.11.00/include/xmlrpc-c/oldcppwrapper.hpp 2008-10-04 12:31:01.000000000 +0200 +@@ -25,6 +25,7 @@ + // -Bryan 2005.03.12. + + ++#include + #include + #include + #include +diff -aur xmlrpc-c-1.11.00/src/cpp/client_simple.cpp fw_xmlrpc-c-1.11.00/src/cpp/client_simple.cpp +--- xmlrpc-c-1.11.00/src/cpp/client_simple.cpp 2006-02-04 20:25:18.000000000 +0100 ++++ fw_xmlrpc-c-1.11.00/src/cpp/client_simple.cpp 2008-10-04 12:42:50.000000000 +0200 +@@ -1,3 +1,4 @@ ++#include + #include + + #include "xmlrpc-c/girerr.hpp" +diff -aur xmlrpc-c-1.11.00/src/cpp/packetsocket.cpp fw_xmlrpc-c-1.11.00/src/cpp/packetsocket.cpp +--- xmlrpc-c-1.11.00/src/cpp/packetsocket.cpp 2007-05-14 01:30:43.000000000 +0200 ++++ fw_xmlrpc-c-1.11.00/src/cpp/packetsocket.cpp 2008-10-04 12:40:53.000000000 +0200 +@@ -49,6 +49,7 @@ + #include + #include + #include ++#include + + #include "c_util.h" + #include "xmlrpc-c/string_int.h" +diff -aur xmlrpc-c-1.11.00/src/cpp/server_abyss.cpp fw_xmlrpc-c-1.11.00/src/cpp/server_abyss.cpp +--- xmlrpc-c-1.11.00/src/cpp/server_abyss.cpp 2007-05-14 08:28:50.000000000 +0200 ++++ fw_xmlrpc-c-1.11.00/src/cpp/server_abyss.cpp 2008-10-04 12:36:54.000000000 +0200 +@@ -1,4 +1,5 @@ + #include ++#include + #include + #include + #include +diff -aur xmlrpc-c-1.11.00/src/cpp/value.cpp fw_xmlrpc-c-1.11.00/src/cpp/value.cpp +--- xmlrpc-c-1.11.00/src/cpp/value.cpp 2007-06-05 05:49:49.000000000 +0200 ++++ fw_xmlrpc-c-1.11.00/src/cpp/value.cpp 2008-10-04 12:33:54.000000000 +0200 +@@ -28,6 +28,7 @@ + + *****************************************************************************/ + ++#include + #include + #include + #include +diff -aur xmlrpc-c-1.11.00/src/cpp/XmlRpcCpp.cpp fw_xmlrpc-c-1.11.00/src/cpp/XmlRpcCpp.cpp +--- xmlrpc-c-1.11.00/src/cpp/XmlRpcCpp.cpp 2005-11-24 04:13:13.000000000 +0100 ++++ fw_xmlrpc-c-1.11.00/src/cpp/XmlRpcCpp.cpp 2008-10-04 12:31:36.000000000 +0200 +@@ -24,6 +24,7 @@ + // SUCH DAMAGE. + + ++#include + #include + #include "xmlrpc-c/oldcppwrapper.hpp" + From voroskoi at frugalware.org Sun Oct 5 12:44:55 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:45:52 2008 Subject: [Frugalware-git] frugalware-current: raptor-1.4.18-2-x86_64 Message-ID: <20081005104455.2B94311901AB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2d17355c4949662ba91bbea2ba2678c63b6a9b63 commit 2d17355c4949662ba91bbea2ba2678c63b6a9b63 Author: voroskoi Date: Sat Oct 4 13:03:26 2008 +0200 raptor-1.4.18-2-x86_64 rebuilt with curl>=7.19 diff --git a/source/lib-extra/raptor/FrugalBuild b/source/lib-extra/raptor/FrugalBuild index ea78bd6..a7ec4fa 100644 --- a/source/lib-extra/raptor/FrugalBuild +++ b/source/lib-extra/raptor/FrugalBuild @@ -4,10 +4,10 @@ pkgname=raptor pkgver=1.4.18 -pkgrel=1 +pkgrel=2 pkgdesc="Library providing a set of parsers that generate Resource Description Framework (RDF)." url="http://librdf.org/raptor/" -depends=('curl>=7.16.0' 'libxslt' 'openssl' 'libxml2') +depends=('curl>=7.19.0' 'libxslt' 'openssl' 'libxml2') groups=('lib-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://librdf.org/raptor/ | grep 'Latest version' | sed 's/.*: \(.*\) .*/\1/'" From voroskoi at frugalware.org Sun Oct 5 12:44:55 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:45:53 2008 Subject: [Frugalware-git] frugalware-current: xmms-scrobbler-0.3.8.1-3-x86_64 Message-ID: <20081005104455.2000711901A5@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0997321276a3d1c418ddecf905ab117731a12a61 commit 0997321276a3d1c418ddecf905ab117731a12a61 Author: voroskoi Date: Sat Oct 4 13:00:23 2008 +0200 xmms-scrobbler-0.3.8.1-3-x86_64 rebuilt with curl>=7.19 diff --git a/source/xlib-extra/xmms-scrobbler/FrugalBuild b/source/xlib-extra/xmms-scrobbler/FrugalBuild index 5ccf5be..4a86810 100644 --- a/source/xlib-extra/xmms-scrobbler/FrugalBuild +++ b/source/xlib-extra/xmms-scrobbler/FrugalBuild @@ -3,16 +3,16 @@ pkgname=xmms-scrobbler pkgver=0.3.8.1 -pkgrel=2 +pkgrel=3 pkgdesc="XMMS plugin that sends your track information to audioscrobbler (LastFM)" url="http://www.audioscrobbler.com/" -depends=('xmms' 'curl>=7.16.0' 'libmusicbrainz') +depends=('xmms' 'curl>=7.19.0' 'libmusicbrainz') groups=('xlib-extra') archs=('i686' 'x86_64') up2date="Flasttar http://www.pipian.com/stuffforchat/" source=(http://www.pipian.com/stuffforchat/$pkgname-$pkgver.tar.bz2 \ xmms-scrobbler-0.3.8.1.id3v2.patch) sha1sums=('09a49e81201e39afaefbd6466f924102ffc2a013' \ - '6442b34bb44e398f6a94211ece28420f293feb64') + '6442b34bb44e398f6a94211ece28420f293feb64') # optimization OK From voroskoi at frugalware.org Sun Oct 5 12:44:55 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:45:54 2008 Subject: [Frugalware-git] frugalware-current: xine-ui-0.99.5-4-x86_64 Message-ID: <20081005104455.3FEDD11901F6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=81047e0f3a929556d515fb578a2aa2189a395198 commit 81047e0f3a929556d515fb578a2aa2189a395198 Author: voroskoi Date: Sat Oct 4 13:21:34 2008 +0200 xine-ui-0.99.5-4-x86_64 rebuilt with curl>=7.19 diff --git a/source/xapps/xine-ui/FrugalBuild b/source/xapps/xine-ui/FrugalBuild index 5e82183..b8c4366 100644 --- a/source/xapps/xine-ui/FrugalBuild +++ b/source/xapps/xine-ui/FrugalBuild @@ -4,12 +4,12 @@ pkgname=xine-ui pkgver=0.99.5 -pkgrel=3 +pkgrel=4 pkgdesc="Xine multimedia playback engine user interface" _F_sourceforge_dirname="xine" Finclude sourceforge url="http://www.xinehq.de/" -depends=('xine-lib>=1.1.9.1' 'curl>=7.16.0' 'c-ares>=1.5.1' 'libpng' \ +depends=('xine-lib>=1.1.9.1' 'curl>=7.19.0' 'c-ares>=1.5.1' 'libpng' \ 'libxinerama' 'libxft' 'libxrender' 'libxau' 'libxdmcp' 'libxcb' \ 'libxtst' 'libxml2') groups=('xapps') From voroskoi at frugalware.org Sun Oct 5 12:44:55 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:45:55 2008 Subject: [Frugalware-git] frugalware-current: oxine-0.6.6-3-x86_64 Message-ID: <20081005104455.365D911901F5@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6ba26cba64ef229c79db8024065cd1a8c33e8abd commit 6ba26cba64ef229c79db8024065cd1a8c33e8abd Author: voroskoi Date: Sat Oct 4 13:10:28 2008 +0200 oxine-0.6.6-3-x86_64 rebuilt with curl>=7.19 diff --git a/source/xapps-extra/oxine/FrugalBuild b/source/xapps-extra/oxine/FrugalBuild index 0f09121..98a0a39 100644 --- a/source/xapps-extra/oxine/FrugalBuild +++ b/source/xapps-extra/oxine/FrugalBuild @@ -3,9 +3,9 @@ pkgname=oxine pkgver=0.6.6 -pkgrel=2 +pkgrel=3 pkgdesc="oxine is a lightweight pure OSD GUI for the famous xine engine." -depends=('libxtst' 'libxinerama' 'fontconfig' 'openssl' 'curl>=7.16.1' 'xine-lib>=1.1.4' 'imagemagick' \ +depends=('libxtst' 'libxinerama' 'fontconfig' 'openssl' 'curl>=7.19.0' 'xine-lib>=1.1.4' 'imagemagick' \ 'eject' 'mjpegtools>=1.8.0-2' 'netpbm') makedepends=('inputproto' 'lirc') groups=('xapps-extra') @@ -19,7 +19,7 @@ _F_cd_path="$pkgname-0.6" Fconfopts="$Fconfopts --disable-joystick --enable-lirc --enable-vdr" -sha1sums=('f59572c9152d53c359f1ee9024496835b117770c'\ - 'b0a90345399a9f292ed0300b5cbcbec1ec173941'\ +sha1sums=('f59572c9152d53c359f1ee9024496835b117770c' \ + 'b0a90345399a9f292ed0300b5cbcbec1ec173941' \ '8baab02025c54ed28fc16cb443ea6fb4fca16db9') # optimization OK From voroskoi at frugalware.org Sun Oct 5 12:44:55 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:45:56 2008 Subject: [Frugalware-git] frugalware-current: asterisk-1.4.21.2-2-x86_64 Message-ID: <20081005104455.5798C11901F8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=80f94f7d0745405b0548e5f546a7ced3121dff7a commit 80f94f7d0745405b0548e5f546a7ced3121dff7a Author: voroskoi Date: Sat Oct 4 13:39:07 2008 +0200 asterisk-1.4.21.2-2-x86_64 rebuilt with curl>=7.19 diff --git a/source/apps-extra/asterisk/FrugalBuild b/source/apps-extra/asterisk/FrugalBuild index f7540ae..d4f3d01 100644 --- a/source/apps-extra/asterisk/FrugalBuild +++ b/source/apps-extra/asterisk/FrugalBuild @@ -4,12 +4,12 @@ pkgname=asterisk pkgver=1.4.21.2 -pkgrel=1 +pkgrel=2 pkgdesc="Open Source Private Branch Exchange (PBX)." url="http://asterisk.org/" backup=(etc/asterisk/*) makedepends=('bison' 'make') -depends=('asterisk-sounds' 'curl>=7.16.0' 'glibc' 'libidn' 'ncurses' 'newt' 'popt' \ +depends=('asterisk-sounds' 'curl>=7.19.0' 'glibc' 'libidn' 'ncurses' 'newt' 'popt' \ 'libpqxx' 'libpri>=1.4.5' 'speex' 'sqlite2' 'openssl' 'unixodbc' 'zlib' \ 'mpg321' 'sudo') groups=('apps-extra') From voroskoi at frugalware.org Sun Oct 5 12:44:55 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:45:57 2008 Subject: [Frugalware-git] frugalware-current: clamav-0.94-2-x86_64 Message-ID: <20081005104455.4B68211901F7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9ab7d7948f2404e623c5fb47769d06af0c633f0b commit 9ab7d7948f2404e623c5fb47769d06af0c633f0b Author: voroskoi Date: Sat Oct 4 13:27:09 2008 +0200 clamav-0.94-2-x86_64 rebuilt with curl>=7.19 diff --git a/source/apps-extra/clamav/FrugalBuild b/source/apps-extra/clamav/FrugalBuild index 6f10e1e..ada0a37 100644 --- a/source/apps-extra/clamav/FrugalBuild +++ b/source/apps-extra/clamav/FrugalBuild @@ -3,9 +3,9 @@ pkgname=clamav pkgver=0.94 -pkgrel=1 +pkgrel=2 pkgdesc="Clam AntiVirus is a GPL anti-virus toolkit for UNIX" -depends=('gmp' 'bzip2' 'curl>=7.16.0') +depends=('gmp' 'bzip2' 'curl>=7.19.0') rodepends=('shadow') backup=(etc/{freshclam,clamd}.conf) groups=('apps-extra') From voroskoi at frugalware.org Sun Oct 5 12:44:55 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:45:58 2008 Subject: [Frugalware-git] frugalware-current: wormux-0.8.1-2-x86_64 Message-ID: <20081005104455.6B0BE11901F9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=750bb7a0535479a463dcabe247ca3909ff7f812b commit 750bb7a0535479a463dcabe247ca3909ff7f812b Author: voroskoi Date: Sat Oct 4 13:53:35 2008 +0200 wormux-0.8.1-2-x86_64 rebuilt with curl>=7.19 diff --git a/source/games-extra/wormux/FrugalBuild b/source/games-extra/wormux/FrugalBuild index d617433..7861dc0 100644 --- a/source/games-extra/wormux/FrugalBuild +++ b/source/games-extra/wormux/FrugalBuild @@ -4,10 +4,10 @@ pkgname=wormux pkgver=0.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="Wormux is free software clone of the Worms(R) series of games, developed by Team17." url="http://www.wormux.org/" -depends=('sdl_net>=1.2.7' 'openssl' 'curl>=7.16.0' 'sdl_ttf>=2.0.9' 'sdl_gfx>=2.0.16' 'sdl_mixer>=1.2' 'sdlimage>=1.2' 'libxml++>=2.6') +depends=('sdl_net>=1.2.7' 'openssl' 'curl>=7.19.0' 'sdl_ttf>=2.0.9' 'sdl_gfx>=2.0.16' 'sdl_mixer>=1.2' 'sdlimage>=1.2' 'libxml++>=2.6') groups=('games-extra') archs=('i686' 'x86_64') up2date="Flasttar http://download.gna.org/$pkgname/" From voroskoi at frugalware.org Sun Oct 5 12:44:55 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:45:59 2008 Subject: [Frugalware-git] frugalware-current: git-1.6.0.2-2-x86_64 Message-ID: <20081005104455.AC87E1190211@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2e3f6447ca2d46f9deaaac36946078e6fb87df03 commit 2e3f6447ca2d46f9deaaac36946078e6fb87df03 Author: voroskoi Date: Sat Oct 4 14:25:15 2008 +0200 git-1.6.0.2-2-x86_64 rebuilt with curl>=7.19 diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild index 66f8fba..30e3512 100644 --- a/source/devel-extra/git/FrugalBuild +++ b/source/devel-extra/git/FrugalBuild @@ -10,11 +10,11 @@ USE_HTMLMAN=${USE_HTMLMAN:-"y"} pkgname=git pkgver=1.6.0.2 Fuse $USE_DEVEL && pkgver=1.6.0.rc3.17.gc14c8ce -pkgrel=1 +pkgrel=2 pkgdesc="A fast, scalable, distributed revision control system." url="http://git.or.cz/" pkgurl="http://www.eu.kernel.org/pub/software/scm/git/" -depends=('curl>=7.16.0' 'openssl' 'perl-error') +depends=('curl>=7.19.0' 'openssl' 'perl-error') backup=(etc/sysconfig/git) makedepends=('asciidoc' 'docbook-xsl>=1.73.0-2' 'docbook-xml' 'docbook2x' 'sgml-common' 'xmlto' 'cpio') groups=('devel-extra') From voroskoi at frugalware.org Sun Oct 5 12:44:55 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:00 2008 Subject: [Frugalware-git] frugalware-current: xmms2-20071115-5-x86_64 Message-ID: <20081005104455.7767D11901AE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=685146ec5cdac7ffbc7bb4cf4b25b90a25cbeff9 commit 685146ec5cdac7ffbc7bb4cf4b25b90a25cbeff9 Author: voroskoi Date: Sat Oct 4 14:08:53 2008 +0200 xmms2-20071115-5-x86_64 rebuilt with curl>=7.19 added gcc43.patch diff --git a/source/xmultimedia-extra/xmms2/FrugalBuild b/source/xmultimedia-extra/xmms2/FrugalBuild index 47946df..d6e38f5 100644 --- a/source/xmultimedia-extra/xmms2/FrugalBuild +++ b/source/xmultimedia-extra/xmms2/FrugalBuild @@ -4,12 +4,12 @@ pkgname=xmms2 pkgver=20071115 origname=0.4DrKosmos -pkgrel=4 +pkgrel=5 pkgdesc="A complete rewrite of the popular music player." _F_sourceforge_ext=".tar.bz2" Finclude sourceforge url="http://xmms2.xmms.org/" -depends=('gtk+2' 'alsa-lib' 'libmad' 'libvorbis' 'curl>=7.16.0' 'faad2' \ +depends=('gtk+2' 'alsa-lib' 'libmad' 'libvorbis' 'curl>=7.19.0' 'faad2' \ 'libmms' 'mac' 'gamin' 'flac>=1.1.3' 'libmpcdec' 'jack' \ 'libmodplug' 'libofa' 'libcdio' 'libshout' 'libsmbclient' \ 'libsamplerate' 'libsidplay2') @@ -17,7 +17,7 @@ makedepends=('glib2' 'sqlite3' 'libboost-mt>=1.35.0' 'boost>=1.35.0' 'perl' 'pyr groups=('xmultimedia-extra') archs=('i686' 'x86_64') up2date=$pkgver -source=(${source/$pkgver/$origname}) +source=(${source/$pkgver/$origname} gcc43.patch) options=('scriptlet') sha1sums=('ac009af5e2802135bbde82d6a59c67da750f580e') @@ -31,6 +31,7 @@ Finclude python build() { Fcd $pkgname-$origname + Fpatchall ./waf configure --prefix=/usr --nocache -p || Fdie ./waf build || Fdie ./waf install --destdir=$Fdestdir diff --git a/source/xmultimedia-extra/xmms2/gcc43.patch b/source/xmultimedia-extra/xmms2/gcc43.patch new file mode 100644 index 0000000..52d3dea --- /dev/null +++ b/source/xmultimedia-extra/xmms2/gcc43.patch @@ -0,0 +1,11 @@ +diff -Nur xmms2-0.4DrKosmos/src/include/xmmsclient/xmmsclient++/helpers.h xmms2-0.4DrKosmos.new/src/include/xmmsclient/xmmsclient++/helpers.h +--- xmms2-0.4DrKosmos/src/include/xmmsclient/xmmsclient++/helpers.h 2007-11-15 19:25:07.000000000 +0100 ++++ xmms2-0.4DrKosmos.new/src/include/xmmsclient/xmmsclient++/helpers.h 2008-06-05 00:32:11.000000000 +0200 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + namespace Xmms + { From voroskoi at frugalware.org Sun Oct 5 12:44:56 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:01 2008 Subject: [Frugalware-git] frugalware-current: cgit-0.7.2-2-x86_64 Message-ID: <20081005104456.26EDE1190213@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=651061a892f383839852a79cb55dadfd15cf27a8 commit 651061a892f383839852a79cb55dadfd15cf27a8 Author: voroskoi Date: Sat Oct 4 14:40:55 2008 +0200 cgit-0.7.2-2-x86_64 rebuilt with curl>=7.19 diff --git a/source/network-extra/cgit/FrugalBuild b/source/network-extra/cgit/FrugalBuild index 3537017..fad40c4 100644 --- a/source/network-extra/cgit/FrugalBuild +++ b/source/network-extra/cgit/FrugalBuild @@ -4,11 +4,11 @@ pkgname=cgit pkgver=0.7.2 gitver=1.5.3.8 -pkgrel=1 +pkgrel=2 pkgsha1="3b1846754cef4732e285b23bba94bd76c5af8606" pkgdesc="A fast webinterface for git." url="http://hjemli.net/git/cgit/" -depends=('curl>=7.16.0' 'openssl') +depends=('curl>=7.19.0' 'openssl') backup=(etc/{cgitrc,httpd/conf/modules.d/cgit.conf}) groups=('network-extra') archs=('i686' 'x86_64') From voroskoi at frugalware.org Sun Oct 5 12:44:56 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:02 2008 Subject: [Frugalware-git] frugalware-current: audacious-plugins-1.5.1-5-x86_64 Message-ID: <20081005104456.962EF1190214@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=812274e84277a6a9fcbae33151747ad357114714 commit 812274e84277a6a9fcbae33151747ad357114714 Author: voroskoi Date: Sat Oct 4 15:03:02 2008 +0200 audacious-plugins-1.5.1-5-x86_64 rebuilt with curl>=7.19 diff --git a/source/xmultimedia-extra/audacious-plugins/FrugalBuild b/source/xmultimedia-extra/audacious-plugins/FrugalBuild index 8831492..60c740d 100644 --- a/source/xmultimedia-extra/audacious-plugins/FrugalBuild +++ b/source/xmultimedia-extra/audacious-plugins/FrugalBuild @@ -3,10 +3,10 @@ pkgname=audacious-plugins pkgver=1.5.1 -pkgrel=4 +pkgrel=5 pkgdesc="Plugins for audacious." url="http://audacious-media-player.org/" -depends=('openssl' 'curl>=7.16.0' 'dbus-glib' 'sdl' 'audacious>=1.5.1-2' 'faad2' \ +depends=('openssl' 'curl>=7.19.0' 'dbus-glib' 'sdl' 'audacious>=1.5.1-2' 'faad2' \ 'flac>=1.1.4' 'libvorbis' 'adplug>=2.1' 'libmodplug' 'unzip' 'libnms' 'glib2>=2.14.2' \ 'lame' 'libmad' 'libsndfile' 'libxcomposite' 'imlib2' 'libcdio>=0.80-2') makedepends=('jack' 'arts' 'esd' 'libsamplerate' 'lirc' 'neon' 'wavpack>=4.40.0' \ From voroskoi at frugalware.org Sun Oct 5 12:44:56 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:04 2008 Subject: [Frugalware-git] frugalware-current: php-5.2.6-2-x86_64 Message-ID: <20081005104456.D04C111901AD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e0f3375586950abb85e0d11a031640df5ed343e1 commit e0f3375586950abb85e0d11a031640df5ed343e1 Author: voroskoi Date: Sat Oct 4 18:44:29 2008 +0200 php-5.2.6-2-x86_64 rebuilt with curl>=7.19 diff --git a/source/devel/php/FrugalBuild b/source/devel/php/FrugalBuild index fe46682..effe500 100644 --- a/source/devel/php/FrugalBuild +++ b/source/devel/php/FrugalBuild @@ -4,11 +4,11 @@ pkgname=php pkgver=5.2.6 -pkgrel=1 +pkgrel=2 pkgdesc="A widely-used general-purpose scripting language" url="http://www.php.net" backup=(etc/{php.ini,httpd/conf/modules.d/$pkgname.conf}) -depends=('openssl' 'libjpeg' 'freetype2>=2.3.1' 'libpng' 'gdbm' 'libxslt' 'curl>=7.16.1' 'libxml2' 'libmcrypt' \ +depends=('openssl' 'libjpeg' 'freetype2>=2.3.1' 'libpng' 'gdbm' 'libxslt' 'curl>=7.19.0' 'libxml2' 'libmcrypt' \ 'libidn' 'libmysqlclient' 'libpq>=8.2.3' 'sqlite3' 're2c') provides=('php-pear-archive_tar' 'php-pear-console_getopt' 'php-pear-pear') makedepends=('apache' 'imap>=2006e-2' 'bzip2' 'mta' 'tidy' 'freetds' 'mysql' \ @@ -17,7 +17,7 @@ groups=('devel') archs=('i686' 'x86_64') up2date="lynx -dump http://www.php.net/downloads.php |grep 'Complete Source Code' -3|sed -n 's/.*P \(.*\)/\1/;2 p'" source=(http://www.php.net/distributions/$pkgname-$pkgver.tar.gz \ - php.ini php.conf README.Frugalware) + php.ini php.conf README.Frugalware freetds-compat.patch) subpkgs=("$pkgname-cgi") suboptions=('nodocs') ## its depends on PHP and the same files are installed etc @@ -91,6 +91,11 @@ build() unset MAKEFLAGS Fcd Fpatchall + # these are for freetds-compat.patch + aclocal || Fdie + Fautoreconf + # see http://bugs.gentoo.org/show_bug.cgi?id=217392 + sed -re 's:(#ifdef HAVE_CONFIG_H.*):#define _GNU_SOURCE\n\1:' -i ext/posix/posix.c ## PHP-CGI first Fmessage "Building PHP-CGI.." sh buildconf --force || Fdie @@ -132,6 +137,7 @@ build() sha1sums=('54058c73eb5a314eb2b31925477f298d898b520a' \ '9ba6e9430bdba5f6ab2bad15e7cc354d0ea3fd58' \ '0850ef23512a02e8460dc36f08f453d148dcd9df' \ - '40ae88f0721e02a2c75de76be342c51c85bf734d') + '40ae88f0721e02a2c75de76be342c51c85bf734d' \ + '383fe3f8550d73f0cc0e386d41c90d5648240e91') # optimization OK From voroskoi at frugalware.org Sun Oct 5 12:44:56 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:05 2008 Subject: [Frugalware-git] frugalware-current: php-5.2.6-2-x86_64 Message-ID: <20081005104456.F31B4119021B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6857b8e94da656268cb8422ff26958ebebe45f41 commit 6857b8e94da656268cb8422ff26958ebebe45f41 Author: voroskoi Date: Sat Oct 4 19:00:13 2008 +0200 php-5.2.6-2-x86_64 forgot to add freetds-compat.patch diff --git a/source/devel/php/freetds-compat.patch b/source/devel/php/freetds-compat.patch new file mode 100644 index 0000000..3eb36cd --- /dev/null +++ b/source/devel/php/freetds-compat.patch @@ -0,0 +1,88 @@ +Allow ext/mssql and ext/pdo_dblib to build with >=freetds-0.82 +Original patch by jklowden at freetds dot org +ext/pdo_dblib patch by matthias at dsx ado at +Rediffed for Gentoo (wrong direction) +http://bugs.php.net/bug.php?id=44991 + +diff -r 57e37b68a255 -r f1222f67e562 ext/mssql/config.m4 +--- a/ext/mssql/config.m4 Tue Jul 01 19:37:24 2008 +0200 ++++ b/ext/mssql/config.m4 Thu Jul 17 11:35:57 2008 +0200 +@@ -10,11 +10,11 @@ + + if test "$PHP_MSSQL" = "yes"; then + for i in /usr/local /usr; do +- if test -f $i/include/tds.h; then ++ if test -f $i/include/sybdb.h; then + FREETDS_INSTALLATION_DIR=$i + FREETDS_INCLUDE_DIR=$i/include + break +- elif test -f $i/include/freetds/tds.h; then ++ elif test -f $i/include/freetds/sybdb.h; then + FREETDS_INSTALLATION_DIR=$i + FREETDS_INCLUDE_DIR=$i/include/freetds + break +@@ -27,10 +27,10 @@ + + elif test "$PHP_MSSQL" != "no"; then + +- if test -f $PHP_MSSQL/include/tds.h; then ++ if test -f $PHP_MSSQL/include/sybdb.h; then + FREETDS_INSTALLATION_DIR=$PHP_MSSQL + FREETDS_INCLUDE_DIR=$PHP_MSSQL/include +- elif test -f $PHP_MSSQL/include/freetds/tds.h; then ++ elif test -f $PHP_MSSQL/include/freetds/sybdb.h; then + FREETDS_INSTALLATION_DIR=$PHP_MSSQL + FREETDS_INCLUDE_DIR=$PHP_MSSQL/include/freetds + else +@@ -38,8 +38,8 @@ + fi + fi + +- if test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.a" && test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.so"; then +- AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.[a|so]) ++ if test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then ++ AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.[a|so]) + fi + + PHP_ADD_INCLUDE($FREETDS_INCLUDE_DIR) +diff -r 57e37b68a255 -r f1222f67e562 ext/pdo_dblib/config.m4 +--- a/ext/pdo_dblib/config.m4 Tue Jul 01 19:37:24 2008 +0200 ++++ b/ext/pdo_dblib/config.m4 Thu Jul 17 11:35:57 2008 +0200 +@@ -13,11 +13,11 @@ + if test "$PHP_PDO_DBLIB" = "yes"; then + + for i in /usr/local /usr; do +- if test -f $i/include/tds.h; then ++ if test -f $i/include/sybdb.h; then + PDO_FREETDS_INSTALLATION_DIR=$i + PDO_FREETDS_INCLUDE_DIR=$i/include + break +- elif test -f $i/include/freetds/tds.h; then ++ elif test -f $i/include/freetds/sybdb.h; then + PDO_FREETDS_INSTALLATION_DIR=$i + PDO_FREETDS_INCLUDE_DIR=$i/include/freetds + break; +@@ -30,10 +30,10 @@ + + elif test "$PHP_PDO_DBLIB" != "no"; then + +- if test -f $PHP_PDO_DBLIB/include/tds.h; then ++ if test -f $PHP_PDO_DBLIB/include/sybdb.h; then + PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB + PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include +- elif test -f $PHP_PDO_DBLIB/include/freetds/tds.h; then ++ elif test -f $PHP_PDO_DBLIB/include/freetds/sybdb.h; then + PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB + PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include/freetds + else +@@ -45,8 +45,8 @@ + PHP_LIBDIR=lib + fi + +- if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.a" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.so"; then +- AC_MSG_ERROR(Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.[a|so]) ++ if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then ++ AC_MSG_ERROR(Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.[a|so]) + fi + + PHP_ADD_INCLUDE($PDO_FREETDS_INCLUDE_DIR) From voroskoi at frugalware.org Sun Oct 5 12:44:54 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:06 2008 Subject: [Frugalware-git] frugalware-current: c-ares-1.5.3-1-x86_64 Message-ID: <20081005104454.465F31190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6cf27f4d38dc190ae3f3ec0422e07e0c97016258 commit 6cf27f4d38dc190ae3f3ec0422e07e0c97016258 Author: voroskoi Date: Thu Oct 2 00:54:16 2008 +0200 c-ares-1.5.3-1-x86_64 version bump diff --git a/source/lib/c-ares/FrugalBuild b/source/lib/c-ares/FrugalBuild index b12ff74..4778be0 100644 --- a/source/lib/c-ares/FrugalBuild +++ b/source/lib/c-ares/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=c-ares -pkgver=1.5.2 +pkgver=1.5.3 pkgrel=1 pkgdesc="C library that performs DNS requests and name resolves asynchronously." url="http://daniel.haxx.se/projects/c-ares/" From voroskoi at frugalware.org Sun Oct 5 12:44:57 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:08 2008 Subject: [Frugalware-git] frugalware-current: gnupg2-2.0.9-2-x86_64 Message-ID: <20081005104457.2D86F119021E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5a7ae3b2000a6355bdf971140a5aeb7da6354d6b commit 5a7ae3b2000a6355bdf971140a5aeb7da6354d6b Author: voroskoi Date: Sat Oct 4 19:24:57 2008 +0200 gnupg2-2.0.9-2-x86_64 rebuilt with curl>=7.19 added a patch to fix gcc4.3 compilation issues diff --git a/source/apps/gnupg2/FrugalBuild b/source/apps/gnupg2/FrugalBuild index b011238..621fde0 100644 --- a/source/apps/gnupg2/FrugalBuild +++ b/source/apps/gnupg2/FrugalBuild @@ -4,16 +4,16 @@ pkgname=gnupg2 origname=gnupg pkgver=2.0.9 -pkgrel=1 +pkgrel=2 pkgdesc="GnuPG2 is the new modularized version of GnuPG supporting OpenPGP and S/MIME" url="http://www.gnupg.org/" ## libldap -depends=('openssl>=0.9.8-10' 'bzip2' 'curl' 'pth' 'libksba>=1.0' 'libusb' 'readline' 'libgpg-error>=1.0' 'libgcrypt') +depends=('openssl>=0.9.8-10' 'bzip2' 'curl>=7.19.0' 'pth' 'libksba>=1.0' 'libusb' 'readline' 'libgpg-error>=1.0' 'libgcrypt') makedepends=('libassuan>=0.9.3') groups=('apps') archs=('i686' 'x86_64') up2date="lynx -dump http://www.gnupg.org/download/index.html |grep gnupg-2.0.*tar |sed -n -e 's/.*g-\(.*\)\.t.*/\1/;s/-/_/;1 p'" -source=(ftp://ftp.gnupg.org/gcrypt/$origname/$origname-$pkgver.tar.bz2) +source=(ftp://ftp.gnupg.org/gcrypt/$origname/$origname-$pkgver.tar.bz2 gnupg-2.0.9-curl.patch) subpkgs=('gpg-agent') subdescs=('gpg-agent is made for handling gpg-keys') diff --git a/source/apps/gnupg2/gnupg-2.0.9-curl.patch b/source/apps/gnupg2/gnupg-2.0.9-curl.patch new file mode 100644 index 0000000..0cad7bc --- /dev/null +++ b/source/apps/gnupg2/gnupg-2.0.9-curl.patch @@ -0,0 +1,11 @@ +--- keyserver/gpgkeys_curl.c 2007-07-04 15:26:13.000000000 +0200 ++++ keyserver/gpgkeys_curl.c.new 2008-04-16 22:14:52.000000000 +0200 +@@ -300,7 +300,7 @@ + curl_easy_setopt(curl,CURLOPT_VERBOSE,1); + } + +- curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,opt->flags.check_cert); ++ curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER, opt->flags.check_cert != 0); + curl_easy_setopt(curl,CURLOPT_CAINFO,opt->ca_cert_file); + + if(proxy) From voroskoi at frugalware.org Sun Oct 5 12:44:57 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:10 2008 Subject: [Frugalware-git] frugalware-current: yougrabber-0.29.4-2-x86_64 Message-ID: <20081005104457.6F6111190210@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=87e4bc9c44c935a76700c900492a8f525136ca0d commit 87e4bc9c44c935a76700c900492a8f525136ca0d Author: voroskoi Date: Sat Oct 4 19:36:35 2008 +0200 yougrabber-0.29.4-2-x86_64 rebuilt with curl>=7.19 diff --git a/source/apps-extra/yougrabber/FrugalBuild b/source/apps-extra/yougrabber/FrugalBuild index a9ebdc0..8ee290d 100644 --- a/source/apps-extra/yougrabber/FrugalBuild +++ b/source/apps-extra/yougrabber/FrugalBuild @@ -3,10 +3,9 @@ pkgname=yougrabber pkgver=0.29.4 -pkgrel=1 +pkgrel=2 pkgdesc="Command line YouTube.com video downloader with proxy (HTTP, SOCKS 4 and 5) support." -depends=('ncurses' 'glib2' 'curl' 'zlib') -_F_sourceforge_broken_up2date="1" +depends=('ncurses' 'glib2' 'curl>=7.19.0' 'zlib') Finclude sourceforge groups=('apps-extra') archs=('i686' 'x86_64') From voroskoi at frugalware.org Sun Oct 5 12:44:57 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:11 2008 Subject: [Frugalware-git] frugalware-current: evfs-20080419-2-x86_64 Message-ID: <20081005104457.AC7B11190219@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=37faec8c60834dbf1c6b2b67ff54f992eb65ad60 commit 37faec8c60834dbf1c6b2b67ff54f992eb65ad60 Author: voroskoi Date: Sat Oct 4 19:40:52 2008 +0200 evfs-20080419-2-x86_64 rebuilt with curl>=7.19 diff --git a/source/e17-extra/evfs/FrugalBuild b/source/e17-extra/evfs/FrugalBuild index a01763e..efefd37 100644 --- a/source/e17-extra/evfs/FrugalBuild +++ b/source/e17-extra/evfs/FrugalBuild @@ -3,10 +3,10 @@ pkgname=evfs pkgver=20080419 -pkgrel=1 +pkgrel=2 pkgdesc="EVFS for E17." makedepends=('samba') -depends=('sqlite3' 'efreet>=0.0.3.042' 'bzip2' 'curl' 'libsmbclient' 'taglib') +depends=('sqlite3' 'efreet>=0.0.3.042' 'bzip2' 'curl>=7.19.0' 'libsmbclient' 'taglib') groups=('e17-extra' 'e17-misc') archs=('i686' 'x86_64') Finclude e17-cvs From voroskoi at frugalware.org Sun Oct 5 12:44:58 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:11 2008 Subject: [Frugalware-git] frugalware-current: gimmage-0.2.3-2-x86_64 Message-ID: <20081005104458.05F1B11901B1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1595a232323750cad187897233a988307c307c21 commit 1595a232323750cad187897233a988307c307c21 Author: voroskoi Date: Sat Oct 4 19:49:41 2008 +0200 gimmage-0.2.3-2-x86_64 rebuilt with curl>=7.19 diff --git a/source/gnome-extra/gimmage/FrugalBuild b/source/gnome-extra/gimmage/FrugalBuild index b3aacf2..84f7709 100644 --- a/source/gnome-extra/gimmage/FrugalBuild +++ b/source/gnome-extra/gimmage/FrugalBuild @@ -4,14 +4,16 @@ pkgname=gimmage pkgver=0.2.3 -pkgrel=1 +pkgrel=2 pkgdesc="A gtkmm image viewer" Finclude berlios -depends=('gtkmm' 'curl') +depends=('gtkmm' 'curl>=7.19.0') groups=('gnome-extra') archs=('i686' 'x86_64') -sha1sums=('732dee063553b787b65a0a5bd3d207bdb5d01df1') _F_gnome_desktop=y Finclude gnome-scriptlet +source=(${source[@]} 'gcc43.diff') +sha1sums=('732dee063553b787b65a0a5bd3d207bdb5d01df1' \ + 'a335187bff256132c95bb45f886ef7711f1ecdb3') # optimization OK diff --git a/source/gnome-extra/gimmage/gcc43.diff b/source/gnome-extra/gimmage/gcc43.diff new file mode 100644 index 0000000..b776b52 --- /dev/null +++ b/source/gnome-extra/gimmage/gcc43.diff @@ -0,0 +1,12 @@ +diff -aur gimmage-0.2.3/src/FileManager.cpp fw_gimmage-0.2.3/src/FileManager.cpp +--- gimmage-0.2.3/src/FileManager.cpp 2007-06-26 15:51:15.000000000 +0200 ++++ fw_gimmage-0.2.3/src/FileManager.cpp 2008-10-04 19:44:32.000000000 +0200 +@@ -21,6 +21,8 @@ + + // we make extensive use of get_current_dir_name() from Glib + ++#include ++ + #include "FileManager.h" + #include "defines.h" + From voroskoi at frugalware.org Sun Oct 5 12:44:58 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:13 2008 Subject: [Frugalware-git] frugalware-current: news-notification-0.5rc2-2-x86_64 Message-ID: <20081005104458.4E43E11901BD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=161ed3371d9bb7213642cd6746683b824a7c484a commit 161ed3371d9bb7213642cd6746683b824a7c484a Author: voroskoi Date: Sat Oct 4 19:55:21 2008 +0200 news-notification-0.5rc2-2-x86_64 rebuilt with curl>=7.19 diff --git a/source/gnome-extra/news-notification/FrugalBuild b/source/gnome-extra/news-notification/FrugalBuild index 1eeb7b2..56ec200 100644 --- a/source/gnome-extra/news-notification/FrugalBuild +++ b/source/gnome-extra/news-notification/FrugalBuild @@ -3,13 +3,13 @@ pkgname=news-notification pkgver=0.5rc2 -pkgrel=1 +pkgrel=2 pkgdesc="News notification popup windows for Gnome." _F_sourceforge_ext=".tgz" _F_sourceforge_dirname="newsnotif" _F_sourceforge_realname="$_F_sourceforge_dirname" Finclude sourceforge -depends=('libnotify' 'freetype2' 'libxau' 'libxdmcp' 'curl' 'tidy' 'libxdamage' 'libxext') +depends=('libnotify' 'freetype2' 'libxau' 'libxdmcp' 'curl>=7.19.0' 'tidy' 'libxdamage' 'libxext') groups=('gnome-extra') archs=('i686' 'x86_64') source=($source $pkgname.png) From voroskoi at frugalware.org Sun Oct 5 12:44:58 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:15 2008 Subject: [Frugalware-git] frugalware-current: vagalume-0.7-2-x86_64 Message-ID: <20081005104458.9677C119021D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0cdee4c7b3e0aae315f88b8fa2d44e7b44806804 commit 0cdee4c7b3e0aae315f88b8fa2d44e7b44806804 Author: voroskoi Date: Sat Oct 4 20:00:56 2008 +0200 vagalume-0.7-2-x86_64 rebuilt with curl>=7.19 diff --git a/source/gnome-extra/vagalume/FrugalBuild b/source/gnome-extra/vagalume/FrugalBuild index 02ffbb6..48f6139 100644 --- a/source/gnome-extra/vagalume/FrugalBuild +++ b/source/gnome-extra/vagalume/FrugalBuild @@ -3,10 +3,10 @@ pkgname=vagalume pkgver=0.7 -pkgrel=1 +pkgrel=2 pkgdesc="Vagalume is a Last.fm client for Gnome" url="http://vagalume.igalia.com/" -depends=('gtk+2' 'freetype2' 'glibc' 'libxau' 'libxdmcp' 'gstreamer' 'curl' 'libxdamage' 'libxext' 'gst-plugins-ugly-mad' 'libgcrypt') +depends=('gtk+2' 'freetype2' 'glibc' 'libxau' 'libxdmcp' 'gstreamer' 'curl>=7.19.0' 'libxdamage' 'libxext' 'gst-plugins-ugly-mad' 'libgcrypt') options=('scriptlet') _F_gnome_iconcache="y" _F_gnome_desktop="y" From voroskoi at frugalware.org Sun Oct 5 12:45:00 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:17 2008 Subject: [Frugalware-git] frugalware-current: clinkc-2.2-2-x86_64 Message-ID: <20081005104501.A6F2011904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ab5f621061073d733ed3e0437f597d3e18d7ed8b commit ab5f621061073d733ed3e0437f597d3e18d7ed8b Author: voroskoi Date: Sat Oct 4 20:06:10 2008 +0200 clinkc-2.2-2-x86_64 rebuilt with curl>=7.19 diff --git a/source/lib-extra/clinkc/FrugalBuild b/source/lib-extra/clinkc/FrugalBuild index 7380cc5..878e864 100644 --- a/source/lib-extra/clinkc/FrugalBuild +++ b/source/lib-extra/clinkc/FrugalBuild @@ -3,9 +3,9 @@ pkgname=clinkc pkgver=2.2 -pkgrel=1 +pkgrel=2 pkgdesc="CyberLink for C is a UPnP library using C for small and embedded platforms." -depends=('libxml2' 'expat' 'curl') +depends=('libxml2' 'expat' 'curl>=7.19.0') makedepends=('doxygen') groups=('lib-extra') archs=('i686' 'x86_64') From voroskoi at frugalware.org Sun Oct 5 12:45:01 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:18 2008 Subject: [Frugalware-git] frugalware-current: moc-2.4.3-4-x86_64 Message-ID: <20081005104501.C0B3A1190220@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1d4bf850b2c78e469a115d596ebf89f322090be2 commit 1d4bf850b2c78e469a115d596ebf89f322090be2 Author: voroskoi Date: Sun Oct 5 08:46:59 2008 +0200 moc-2.4.3-4-x86_64 rebuilt with curl>=7.19 diff --git a/source/multimedia-extra/moc/FrugalBuild b/source/multimedia-extra/moc/FrugalBuild index 8919d90..7b8d07a 100644 --- a/source/multimedia-extra/moc/FrugalBuild +++ b/source/multimedia-extra/moc/FrugalBuild @@ -4,10 +4,10 @@ pkgname=moc pkgver=2.4.3 -pkgrel=3 +pkgrel=4 pkgdesc="MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use." url="http://moc.daper.net/" -depends=('flac' 'libvorbis' 'libmpcdec' 'taglib' 'speex' 'libmad' 'libid3tag' 'alsa-lib' 'libsamplerate' 'curl' 'ncurses') +depends=('flac' 'libvorbis' 'libmpcdec' 'taglib' 'speex' 'libmad' 'libid3tag' 'alsa-lib' 'libsamplerate' 'curl>=7.19.0' 'ncurses') groups=('multimedia-extra') archs=('i686' 'x86_64') up2date="Flasttar ftp://ftp.daper.net/pub/soft/moc/stable" From voroskoi at frugalware.org Sun Oct 5 12:45:01 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:19 2008 Subject: [Frugalware-git] frugalware-current: vorbis-tools-1.2.0-3-x86_64 Message-ID: <20081005104501.E3287119021C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2de21641096e735ba6ce9039c0af0271d9854520 commit 2de21641096e735ba6ce9039c0af0271d9854520 Author: voroskoi Date: Sun Oct 5 08:51:09 2008 +0200 vorbis-tools-1.2.0-3-x86_64 rebuilt with curl>=7.19 diff --git a/source/multimedia/vorbis-tools/FrugalBuild b/source/multimedia/vorbis-tools/FrugalBuild index c5149e6..fff80d6 100644 --- a/source/multimedia/vorbis-tools/FrugalBuild +++ b/source/multimedia/vorbis-tools/FrugalBuild @@ -4,10 +4,10 @@ pkgname=vorbis-tools pkgver=1.2.0 -pkgrel=2 +pkgrel=3 pkgdesc="Tools to play, encode and manage Ogg Vorbis files" url="http://www.vorbis.com/" -depends=('libvorbis' 'libao' 'curl' 'zlib' 'flac' 'speex>=1.2beta3.2') +depends=('libvorbis' 'libao' 'curl>=7.19.0' 'zlib' 'flac' 'speex>=1.2beta3.2') groups=('multimedia') archs=('i686' 'x86_64') #up2date="lynx -dump 'http://downloads.xiph.org/releases/vorbis/?C=M;O=D'|grep '/vorbis-tools.*\.tar\.*'|sed -n 's/.*-\(.*\)\.tar\..*/\1/; 1 p'" From voroskoi at frugalware.org Sun Oct 5 12:45:02 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:20 2008 Subject: [Frugalware-git] frugalware-current: curlftpfs-0.9.2-2-x86_64 Message-ID: <20081005104502.4E72511901D1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=909fa3ff5b41444ece9e70330f4e1031dd033ff7 commit 909fa3ff5b41444ece9e70330f4e1031dd033ff7 Author: voroskoi Date: Sun Oct 5 08:59:47 2008 +0200 curlftpfs-0.9.2-2-x86_64 rebuilt with curl>=7.19 diff --git a/source/network-extra/curlftpfs/FrugalBuild b/source/network-extra/curlftpfs/FrugalBuild index 52e9ef3..3663bee 100644 --- a/source/network-extra/curlftpfs/FrugalBuild +++ b/source/network-extra/curlftpfs/FrugalBuild @@ -3,10 +3,10 @@ pkgname=curlftpfs pkgver=0.9.2 -pkgrel=1 +pkgrel=2 pkgdesc="A FTP filesystem based on cURL and FUSE" url="http://curlftpfs.sourceforge.net/" -depends=('fuse' 'curl') +depends=('fuse' 'curl>=7.19.0') groups=('network-extra') archs=('i686' 'x86_64') Finclude sourceforge From voroskoi at frugalware.org Sun Oct 5 12:45:03 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:21 2008 Subject: [Frugalware-git] frugalware-current: ario-1.1-2-x86_64 Message-ID: <20081005104503.2733211901C5@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1494ac1dde2e80758255c278fed686c9c806a45a commit 1494ac1dde2e80758255c278fed686c9c806a45a Author: voroskoi Date: Sun Oct 5 09:03:11 2008 +0200 ario-1.1-2-x86_64 rebuilt with curl>=7.19 diff --git a/source/xapps-extra/ario/FrugalBuild b/source/xapps-extra/ario/FrugalBuild index 9df0480..d09a6c6 100644 --- a/source/xapps-extra/ario/FrugalBuild +++ b/source/xapps-extra/ario/FrugalBuild @@ -3,9 +3,9 @@ pkgname=ario pkgver=1.1 -pkgrel=1 +pkgrel=2 pkgdesc="A GTK2 client for MPD (Music player daemon)." -depends=('libglade' 'freetype2' 'glibc' 'libxau' 'libxdmcp' 'curl' 'avahi-glib' 'libxdamage' 'libxext' 'libsoup' 'dbus-glib') +depends=('libglade' 'freetype2' 'glibc' 'libxau' 'libxdmcp' 'curl>=7.19.0' 'avahi-glib' 'libxdamage' 'libxext' 'libsoup' 'dbus-glib') makedepends=('perl-xml-parser') options=('scriptlet') _F_sourceforge_dirname="$pkgname-player" From voroskoi at frugalware.org Sun Oct 5 12:45:03 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:22 2008 Subject: [Frugalware-git] frugalware-current: freetuxtv-0.1.1-3-x86_64 Message-ID: <20081005104503.44EBD1190397@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a0ffb4b143a13f0a7b47115965949d2b7f9bebbf commit a0ffb4b143a13f0a7b47115965949d2b7f9bebbf Author: voroskoi Date: Sun Oct 5 09:13:07 2008 +0200 freetuxtv-0.1.1-3-x86_64 rebuilt with curl>=7.19 diff --git a/source/xapps-extra/freetuxtv/FrugalBuild b/source/xapps-extra/freetuxtv/FrugalBuild index 22bcdd8..a7e2467 100644 --- a/source/xapps-extra/freetuxtv/FrugalBuild +++ b/source/xapps-extra/freetuxtv/FrugalBuild @@ -3,9 +3,9 @@ pkgname=freetuxtv pkgver=0.1.1 -pkgrel=2 +pkgrel=3 pkgdesc="Watch the TV with your box" -depends=('libglade' 'freetype2' 'libxau' 'libxdmcp' 'curl' \ +depends=('libglade' 'freetype2' 'libxau' 'libxdmcp' 'curl>=7.19.0' \ 'sqlite3' 'vlc>=0.9.1' 'libxdamage' 'libxext' 'e2fsprogs' \ 'libogg' 'libstdc++') groups=('xapps-extra') From voroskoi at frugalware.org Sun Oct 5 12:45:03 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:23 2008 Subject: [Frugalware-git] frugalware-current: gmpc-0.16.1-3-x86_64 Message-ID: <20081005104503.C1BE111901FA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=41592fe4c8d044779ea95cf12ecde6c7b9cf1c18 commit 41592fe4c8d044779ea95cf12ecde6c7b9cf1c18 Author: voroskoi Date: Sun Oct 5 09:18:11 2008 +0200 gmpc-0.16.1-3-x86_64 rebuilt with curl>=7.19 diff --git a/source/xapps-extra/gmpc/FrugalBuild b/source/xapps-extra/gmpc/FrugalBuild index 36d7baa..9a7b349 100644 --- a/source/xapps-extra/gmpc/FrugalBuild +++ b/source/xapps-extra/gmpc/FrugalBuild @@ -3,11 +3,11 @@ pkgname=gmpc pkgver=0.16.1 -pkgrel=2 +pkgrel=3 pkgdesc="Gnome Music Player Client." url="http://gmpcwiki.sarine.nl/index.php/GMPC" makedepends=('intltool') -depends=('gtk+2' 'libglade' 'libmpd>=0.16.1' 'curl') +depends=('gtk+2' 'libglade' 'libmpd>=0.16.1' 'curl>=7.19.0') rodepends=('mpd') makedepends=('gob2' 'perl-xml') groups=('xapps-extra') From voroskoi at frugalware.org Sun Oct 5 12:45:03 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:24 2008 Subject: [Frugalware-git] frugalware-current: google-gadgets-0.10.1-2-x86_64 Message-ID: <20081005104503.F174A119024D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d9e448dfff91bddcc061819fec1e80fd1eac7baf commit d9e448dfff91bddcc061819fec1e80fd1eac7baf Author: voroskoi Date: Sun Oct 5 09:35:41 2008 +0200 google-gadgets-0.10.1-2-x86_64 rebuilt with curl>=7.19 diff --git a/source/xapps-extra/google-gadgets/FrugalBuild b/source/xapps-extra/google-gadgets/FrugalBuild index e0b3ad0..9f2f78c 100644 --- a/source/xapps-extra/google-gadgets/FrugalBuild +++ b/source/xapps-extra/google-gadgets/FrugalBuild @@ -3,9 +3,10 @@ pkgname=google-gadgets pkgver=0.10.1 -pkgrel=1 +pkgrel=2 pkgdesc="Google Gadgets for Linux" -depends=('libstdc++' 'libxml2' 'libxau' 'libxdmcp' 'libtool' 'libxdamage' 'xulrunner' 'nspr' 'libxft' 'libxt' 'libice' 'gst-plugins-base' 'curl') +depends=('libstdc++' 'libxml2' 'libxau' 'libxdmcp' 'libtool' 'libxdamage' \ + 'xulrunner' 'nspr' 'libxft' 'libxt' 'libice' 'gst-plugins-base' 'curl>=7.19.0') options=('scriptlet') _F_googlecode_name="google-gadgets-for-linux" Finclude googlecode From voroskoi at frugalware.org Sun Oct 5 12:45:04 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:26 2008 Subject: [Frugalware-git] frugalware-current: gpredict-0.9.0-2-x86_64 Message-ID: <20081005104504.2EA7D11904D3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=90e2fcc4f9223218a533c3420b13f452deeac253 commit 90e2fcc4f9223218a533c3420b13f452deeac253 Author: voroskoi Date: Sun Oct 5 09:41:41 2008 +0200 gpredict-0.9.0-2-x86_64 rebuilt with curl>=7.19 diff --git a/source/xapps-extra/gpredict/FrugalBuild b/source/xapps-extra/gpredict/FrugalBuild index ddeb2a9..ee64553 100644 --- a/source/xapps-extra/gpredict/FrugalBuild +++ b/source/xapps-extra/gpredict/FrugalBuild @@ -3,11 +3,11 @@ pkgname=gpredict pkgver=0.9.0 -pkgrel=1 +pkgrel=2 pkgdesc="Gpredict is a program for satellite tracking." _F_sourceforge_dirname="groundstation" Finclude sourceforge -depends=('gtk+2' 'freetype2' 'glibc' 'libxau' 'libxdmcp' 'curl' 'libxdamage' 'libxext' 'libxml2' 'grig') +depends=('gtk+2' 'freetype2' 'glibc' 'libxau' 'libxdmcp' 'curl>=7.19.0' 'libxdamage' 'libxext' 'libxml2' 'grig') makedepends=('perl-xml-parser') options=('scriptlet') groups=('xapps-extra') From voroskoi at frugalware.org Sun Oct 5 12:45:04 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:27 2008 Subject: [Frugalware-git] frugalware-current: pinot-0.89-2-x86_64 Message-ID: <20081005104504.7814011901AF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bdf6f735e7df0d2a369e6c624c5fb29396c443ac commit bdf6f735e7df0d2a369e6c624c5fb29396c443ac Author: voroskoi Date: Sun Oct 5 09:50:15 2008 +0200 pinot-0.89-2-x86_64 rebuilt with curl>=7.19 diff --git a/source/xapps-extra/pinot/FrugalBuild b/source/xapps-extra/pinot/FrugalBuild index b47058e..35dd0eb 100644 --- a/source/xapps-extra/pinot/FrugalBuild +++ b/source/xapps-extra/pinot/FrugalBuild @@ -3,10 +3,10 @@ pkgname=pinot pkgver=0.89 -pkgrel=1 +pkgrel=2 pkgdesc="Personal search and metasearch for the Free Desktop" url="http://pinot.berlios.de/" -depends=('openssl' 'curl' 'cairomm' 'dbus>=1.1.2' 'dbus-glib' 'xapian-core>=1.0.8' 'gmime' 'atk' 'gtkmm>=2.12.4' \ +depends=('openssl' 'curl>=7.19.0' 'cairomm' 'dbus>=1.1.2' 'dbus-glib' 'xapian-core>=1.0.8' 'gmime' 'atk' 'gtkmm>=2.12.4' \ 'libtextcat' 'taglib' 'freetype2' 'libxcb' 'pango' 'libxml++' 'sqlite3>=3.3.8-2' 'shared-mime-info' 'libexif') makedepends=('desktop-file-utils' 'boost>=1.34.1') # add catdvi package to the repos From voroskoi at frugalware.org Sun Oct 5 12:45:05 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:28 2008 Subject: [Frugalware-git] frugalware-current: transmission-1.34-2-x86_64 Message-ID: <20081005104505.3E56E11904CE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=97b3bf811a8389167034f3442726d27d672f026c commit 97b3bf811a8389167034f3442726d27d672f026c Author: voroskoi Date: Sun Oct 5 09:54:59 2008 +0200 transmission-1.34-2-x86_64 rebuilt with curl>=7.19 diff --git a/source/xapps-extra/transmission/FrugalBuild b/source/xapps-extra/transmission/FrugalBuild index 18498ab..1d8f792 100644 --- a/source/xapps-extra/transmission/FrugalBuild +++ b/source/xapps-extra/transmission/FrugalBuild @@ -3,10 +3,10 @@ pkgname=transmission pkgver=1.34 -pkgrel=1 +pkgrel=2 pkgdesc="A free, lightweight BitTorrent Client." url="http://transmission.m0k.org/" -depends=('glibc' 'gtk+2' 'libxml2' 'freetype2' 'libxau' 'libxdmcp' 'curl' 'libxdamage' 'libxext' 'gettext') +depends=('glibc' 'gtk+2' 'libxml2' 'freetype2' 'libxau' 'libxdmcp' 'curl>=7.19.0' 'libxdamage' 'libxext' 'gettext') options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') From voroskoi at frugalware.org Sun Oct 5 12:45:05 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:29 2008 Subject: [Frugalware-git] frugalware-current: googleearth-4.3-2-i686 Message-ID: <20081005104505.E941911904E4@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=64af4e332b240129f0864625d800680ba5fa377b commit 64af4e332b240129f0864625d800680ba5fa377b Author: voroskoi Date: Sun Oct 5 10:11:14 2008 +0200 googleearth-4.3-2-i686 rebuilt with curl>=7.19 diff --git a/source/xapps-extra/googleearth/FrugalBuild b/source/xapps-extra/googleearth/FrugalBuild index 711a1e1..5f80a86 100644 --- a/source/xapps-extra/googleearth/FrugalBuild +++ b/source/xapps-extra/googleearth/FrugalBuild @@ -3,15 +3,15 @@ pkgname=googleearth pkgver=4.3 -pkgrel=1 +pkgrel=2 pkgdesc="A 3D interface to the planet" url="http://earth.google.com/" -depends=('mesa' 'libsm' 'openssl' 'curl' 'libstdc++' 'libxcursor' 'libmng' 'libxft' 'libpng') +depends=('mesa' 'libsm' 'openssl' 'curl>=7.19.0' 'libstdc++' 'libxcursor' 'libmng' 'libxft' 'libpng') groups=('xapps-extra') archs=('i686') up2date="lynx -dump http://earth.google.com/download-earth.html|grep '(beta)'|sed 's/.* \(.*\) (beta.*/\1/'" source=(http://dl.google.com/earth/client/current/GoogleEarthLinux.bin) -sha1sums=('7b0997db56ff37a2b9561dfb1fde79aea3cef0da') +sha1sums=('35b883f75ca0da4cc4b5888d345ed5ec2a53123e') options=('nobuild' 'nostrip') build() From voroskoi at frugalware.org Sun Oct 5 12:45:06 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:31 2008 Subject: [Frugalware-git] frugalware-current: xcfa-3.3.40-2-x86_64 Message-ID: <20081005104506.AE5551190212@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7f38f092b1e9009c4502ea359bc648f5206c29e2 commit 7f38f092b1e9009c4502ea359bc648f5206c29e2 Author: voroskoi Date: Sun Oct 5 10:09:08 2008 +0200 xcfa-3.3.40-2-x86_64 rebuilt with curl>=7.19 diff --git a/source/xapps-extra/xcfa/FrugalBuild b/source/xapps-extra/xcfa/FrugalBuild index 9d98d85..3a47d51 100644 --- a/source/xapps-extra/xcfa/FrugalBuild +++ b/source/xapps-extra/xcfa/FrugalBuild @@ -4,11 +4,11 @@ pkgname=xcfa pkgver=3.3.40 -pkgrel=1 +pkgrel=2 pkgdesc="Frontend which use miscellaneous external programs to extract and convert music files" url="http://www.xcfa.tuxfamily.org/" rodepends=('dvd+rw-tools') -depends=('gtk+2' 'freetype2' 'libxau' 'libxdmcp' 'taglib' 'curl' 'libxdamage' 'libxext' 'libxml2') +depends=('gtk+2' 'freetype2' 'libxau' 'libxdmcp' 'taglib' 'curl>=7.19.0' 'libxdamage' 'libxext' 'libxml2') options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') From voroskoi at frugalware.org Sun Oct 5 12:45:07 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:32 2008 Subject: [Frugalware-git] frugalware-current: stellarium-0.9.1-2-i686 Message-ID: <20081005104507.124AF11901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7f91b3098b3db012b3f814c69855e1fbc9b155a7 commit 7f91b3098b3db012b3f814c69855e1fbc9b155a7 Author: voroskoi Date: Sun Oct 5 10:58:01 2008 +0200 stellarium-0.9.1-2-i686 rebuilt with curl>=7.19 added gcc43.diff diff --git a/source/xapps-extra/stellarium/FrugalBuild b/source/xapps-extra/stellarium/FrugalBuild index 999bb4f..30e9258 100644 --- a/source/xapps-extra/stellarium/FrugalBuild +++ b/source/xapps-extra/stellarium/FrugalBuild @@ -4,14 +4,14 @@ pkgname=stellarium pkgver=0.9.1 -pkgrel=1 +pkgrel=2 pkgdesc="A free open source planetarium for your computer." _F_sourceforge_broken_up2date=1 makedepends=('boost>=1.34.1') _F_cmake_confopts="-DCMAKE_CXX_FLAGS=$CXXFLAGS -DCMAKE_C_FLAGS=$CFLAGS" Finclude sourceforge cmake url="http://www.stellarium.org/" -depends=('sdl_mixer' 'libpng' 'mesa' 'freetype2' 'libjpeg' 'libqtopengl' 'curl' 'qt4') +depends=('sdl_mixer' 'libpng' 'mesa' 'freetype2' 'libjpeg' 'libqtopengl' 'curl>=7.19.0' 'qt4') license="GPL" groups=('xapps-extra') archs=('i686') @@ -19,13 +19,15 @@ archs=('i686') ## http://sourceforge.net/tracker/index.php?func=detail&aid=1154587&group_id=48857&atid=454375 ## janny next release may have an icon in the tarball as well desktop files ## please check that. -source=($source $pkgname.png) +source=($source $pkgname.png gcc43.diff) sha1sums=('7cbfc207a4497d7f9afa0dda715fae21f8a0d9ef' \ - 'ab43d03d1e5616b2dadf5a1a0cb4c70e3265167d') + 'ab43d03d1e5616b2dadf5a1a0cb4c70e3265167d' \ + 'c2f1ae705283e4876360af5573e5a5bd1ec36fdb') options=('scriptlet') build() { Fcd + Fpatchall mkdir -p builds/unix || Fdie cd builds/unix || Fdie cmake -DCMAKE_INSTALL_PREFIX=/usr ../.. || Fdie diff --git a/source/xapps-extra/stellarium/gcc43.diff b/source/xapps-extra/stellarium/gcc43.diff new file mode 100644 index 0000000..824aac4 --- /dev/null +++ b/source/xapps-extra/stellarium/gcc43.diff @@ -0,0 +1,11 @@ +diff -aur stellarium-0.9.1/src/StringArray.cpp fw_stellarium-0.9.1/src/StringArray.cpp +--- stellarium-0.9.1/src/StringArray.cpp 2008-01-17 15:15:35.000000000 +0100 ++++ fw_stellarium-0.9.1/src/StringArray.cpp 2008-10-05 10:32:45.000000000 +0200 +@@ -19,6 +19,7 @@ + + #include "StringArray.hpp" + ++#include + #include + #include + #include From voroskoi at frugalware.org Sun Oct 5 12:45:06 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:33 2008 Subject: [Frugalware-git] frugalware-current: Revert "googleearth-4.3-2-i686" Message-ID: <20081005104506.EB15F11904E2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=67d1e32b6ed82be43ce689dfcfce27b0fdb16d59 commit 67d1e32b6ed82be43ce689dfcfce27b0fdb16d59 Author: voroskoi Date: Sun Oct 5 10:13:48 2008 +0200 Revert "googleearth-4.3-2-i686" lol, i've bumped a nobuild the end is near ;) This reverts commit 608752802f8876c578895df5c13ce62a25a431c4. diff --git a/source/xapps-extra/googleearth/FrugalBuild b/source/xapps-extra/googleearth/FrugalBuild index 5f80a86..711a1e1 100644 --- a/source/xapps-extra/googleearth/FrugalBuild +++ b/source/xapps-extra/googleearth/FrugalBuild @@ -3,15 +3,15 @@ pkgname=googleearth pkgver=4.3 -pkgrel=2 +pkgrel=1 pkgdesc="A 3D interface to the planet" url="http://earth.google.com/" -depends=('mesa' 'libsm' 'openssl' 'curl>=7.19.0' 'libstdc++' 'libxcursor' 'libmng' 'libxft' 'libpng') +depends=('mesa' 'libsm' 'openssl' 'curl' 'libstdc++' 'libxcursor' 'libmng' 'libxft' 'libpng') groups=('xapps-extra') archs=('i686') up2date="lynx -dump http://earth.google.com/download-earth.html|grep '(beta)'|sed 's/.* \(.*\) (beta.*/\1/'" source=(http://dl.google.com/earth/client/current/GoogleEarthLinux.bin) -sha1sums=('35b883f75ca0da4cc4b5888d345ed5ec2a53123e') +sha1sums=('7b0997db56ff37a2b9561dfb1fde79aea3cef0da') options=('nobuild' 'nostrip') build() From voroskoi at frugalware.org Sun Oct 5 12:45:07 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:34 2008 Subject: [Frugalware-git] frugalware-current: firefox-3.0.3-2-x86_64 Message-ID: <20081005104507.45E4D11904E9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=52b91d5a6bf7fdda163a94418100ce5ae5332dca commit 52b91d5a6bf7fdda163a94418100ce5ae5332dca Author: voroskoi Date: Sun Oct 5 11:03:35 2008 +0200 firefox-3.0.3-2-x86_64 rebuilt with curl>=7.19 diff --git a/source/xapps/firefox/FrugalBuild b/source/xapps/firefox/FrugalBuild index 79e5123..e25123c 100644 --- a/source/xapps/firefox/FrugalBuild +++ b/source/xapps/firefox/FrugalBuild @@ -5,10 +5,10 @@ pkgname=firefox pkgver=3.0.3 pathver=${pkgver} # version used in path names -pkgrel=1 +pkgrel=2 pkgdesc="Mozilla Firefox web browser" url="http://www.mozilla.org/products/firefox/" -depends=('gtk+2' 'libidl' 'desktop-file-utils' 'nss>=3.12' 'glibc>=2.6' 'dbus-glib' 'curl' 'nspr>=4.7.1' \ +depends=('gtk+2' 'libidl' 'desktop-file-utils' 'nss>=3.12' 'glibc>=2.6' 'dbus-glib' 'curl>=7.19.0' 'nspr>=4.7.1' \ 'lcms' 'libxau' 'libxdmcp' 'libxft' 'libxt' 'libstdc++' 'libxdamage' 'libice' 'bzip2' ) makedepends=('zip') groups=('xapps') From voroskoi at frugalware.org Sun Oct 5 12:45:07 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:36 2008 Subject: [Frugalware-git] frugalware-current: bzflag-2.0.12-2-i686 Message-ID: <20081005104507.D59C5119021A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=48634b4057c9463418e76fe4d0a0f7fd06eff7ef commit 48634b4057c9463418e76fe4d0a0f7fd06eff7ef Author: voroskoi Date: Sun Oct 5 11:29:47 2008 +0200 bzflag-2.0.12-2-i686 rebuilt with curl>=7.19 diff --git a/source/games-extra/bzflag/FrugalBuild b/source/games-extra/bzflag/FrugalBuild index eb4633e..c70c942 100644 --- a/source/games-extra/bzflag/FrugalBuild +++ b/source/games-extra/bzflag/FrugalBuild @@ -4,13 +4,13 @@ pkgname=bzflag pkgver=2.0.12 -pkgrel=1 +pkgrel=2 pkgdesc="BZFlag is a free multiplayer multiplatform 3D tank battle game." _F_sourceforge_ext=".tar.bz2" _F_sourceforge_broken_up2date=1 Finclude sourceforge url="http://www.bzflag.org/" -depends=('curl' 'sdl' 'libxt' 'libsm' 'glew>=1.5.0' 'ncurses' 'c-ares>=1.5.1') +depends=('curl>=7.19.0' 'sdl' 'libxt' 'libsm' 'glew>=1.5.0' 'ncurses' 'c-ares>=1.5.1') groups=('games-extra') archs=('i686' 'x86_64') sha1sums=('846e5cc2d94f9be2aac5960469c56d5ba9f4f565') From voroskoi at frugalware.org Sun Oct 5 12:45:07 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:37 2008 Subject: [Frugalware-git] frugalware-current: xmoto-0.4.2-4-i686 Message-ID: <20081005104507.EDEDA11904EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=95e49def579a6e53235cb4996d70c6d7a4109d4b commit 95e49def579a6e53235cb4996d70c6d7a4109d4b Author: voroskoi Date: Sun Oct 5 11:56:38 2008 +0200 xmoto-0.4.2-4-i686 rebuilt with curl>=7.19 diff --git a/source/games-extra/xmoto/FrugalBuild b/source/games-extra/xmoto/FrugalBuild index 1263b0a..fb24259 100644 --- a/source/games-extra/xmoto/FrugalBuild +++ b/source/games-extra/xmoto/FrugalBuild @@ -3,10 +3,10 @@ pkgname=xmoto pkgver=0.4.2 -pkgrel=3 +pkgrel=4 pkgdesc="A challenging 2D motocross platform game." url="http://xmoto.tuxfamily.org/" -depends=('sdl' 'libogg' 'libvorbis' 'libjpeg' 'ode>=0.10.1' 'sdl_mixer' 'libpng' 'freeglut' 'curl' 'lua' 'sqlite3' 'sdl_ttf') +depends=('sdl' 'libogg' 'libvorbis' 'libjpeg' 'ode>=0.10.1' 'sdl_mixer' 'libpng' 'freeglut' 'curl>=7.19.0' 'lua' 'sqlite3' 'sdl_ttf') groups=('games-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://xmoto.tuxfamily.org/dev/ChangeLog | grep -m1 'X-Moto' | sed 's/.* \(.*\) .*/\1/'" From voroskoi at frugalware.org Sun Oct 5 12:45:07 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:39 2008 Subject: [Frugalware-git] frugalware-current: tmw-0.0.26-2-x86_64 Message-ID: <20081005104507.6DB1B11901A5@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4e153d4019418fcaef74265cc7b82a7a8fb5edc0 commit 4e153d4019418fcaef74265cc7b82a7a8fb5edc0 Author: voroskoi Date: Sun Oct 5 11:23:58 2008 +0200 tmw-0.0.26-2-x86_64 rebuilt with curl>=7.19 diff --git a/source/games-extra/tmw/FrugalBuild b/source/games-extra/tmw/FrugalBuild index 2285cb6..3bb1d7d 100644 --- a/source/games-extra/tmw/FrugalBuild +++ b/source/games-extra/tmw/FrugalBuild @@ -3,13 +3,13 @@ pkgname=tmw pkgver=0.0.26 -pkgrel=1 +pkgrel=2 pkgdesc="The Mana World (TMW) is a serious effort to create an innovative free and open source MMORPG." _F_sourceforge_dirname="themanaworld" _F_sourceforge_realname="The Mana World" Finclude sourceforge url="http://themanaworld.org" -depends=('sdlimage' 'sdl_mixer' 'guichan' 'libgl' 'curl' 'sdl_net' 'physfs' 'libxdamage' 'libxml2' 'freeglut') +depends=('sdlimage' 'sdl_mixer' 'guichan' 'libgl' 'curl>=7.19.0' 'sdl_net' 'physfs' 'libxdamage' 'libxml2' 'freeglut') rodepends=('tmwmusic') groups=('games-extra') archs=('i686' 'x86_64') From voroskoi at frugalware.org Sun Oct 5 12:45:08 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:40 2008 Subject: [Frugalware-git] frugalware-current: warsow-0.42-2-x86_64 Message-ID: <20081005104508.4F1C311901F6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c38f22fe7d9e4ab62974b5f0324c723d6e37279f commit c38f22fe7d9e4ab62974b5f0324c723d6e37279f Author: voroskoi Date: Sun Oct 5 12:36:28 2008 +0200 warsow-0.42-2-x86_64 rebuilt with curl>=7.19 diff --git a/source/games-extra/warsow/FrugalBuild b/source/games-extra/warsow/FrugalBuild index 545c5ed..f704537 100644 --- a/source/games-extra/warsow/FrugalBuild +++ b/source/games-extra/warsow/FrugalBuild @@ -3,13 +3,13 @@ pkgname=warsow pkgver=0.42 -pkgrel=1 +pkgrel=2 pkgdesc="Free online multiplayer competitive FPS based on the Qfusion engine." url="http://www.warsow.net/" archs=('i686' 'x86_64') groups=('games-extra') makedepends=('unzip') -depends=('sdl' 'openal' 'curl' 'mesa' 'libxxf86dga' 'libjpeg' 'libvorbis' 'libxinerama') +depends=('sdl' 'openal' 'curl>=7.19.0' 'mesa' 'libxxf86dga' 'libjpeg' 'libvorbis' 'libxinerama') up2date=("lynx -dump $url |grep Release: |sed -e 's/.*ow \(.*\)/\1/'") source=(http://data.rodix.free.fr/${pkgname}/files/${pkgname}_${pkgver}_unified.zip \ http://data.rodix.free.fr/${pkgname}/files/${pkgname}_${pkgver}_sdk.zip \ From voroskoi at frugalware.org Sun Oct 5 12:45:08 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Oct 5 12:46:42 2008 Subject: [Frugalware-git] frugalware-current: Merge branch 'master' of voroskoi@git.frugalware.org:/home/ftp/pub/other/people/voroskoi/wipv Message-ID: <20081005104508.7782211904E8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8861b77dde172babedb2c3695c99d5e17b545ccc commit 8861b77dde172babedb2c3695c99d5e17b545ccc Merge: d036739... c38f22f... Author: voroskoi Date: Sun Oct 5 12:39:27 2008 +0200 Merge branch 'master' of voroskoi@git.frugalware.org:/home/ftp/pub/other/people/voroskoi/wipv From priyank at frugalware.org Sun Oct 5 13:01:07 2008 From: priyank at frugalware.org (Priyank) Date: Sun Oct 5 13:01:10 2008 Subject: [Frugalware-git] xfce46: xfconf-4.5.90-1-i686 Message-ID: <20081005110107.EEDE11190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=0805b30e425d0dcb5ee27b52e90f4345b607a230 commit 0805b30e425d0dcb5ee27b52e90f4345b607a230 Author: Priyank Date: Sun Oct 5 16:29:11 2008 +0530 xfconf-4.5.90-1-i686 * New package (replaces libxfce4mcs) diff --git a/source/xfce4/xfconf/FrugalBuild b/source/xfce4/xfconf/FrugalBuild new file mode 100644 index 0000000..fadfd4d --- /dev/null +++ b/source/xfce4/xfconf/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.07 SBU +# Maintainer: Priyank Gosalia + +pkgname=xfconf +pkgver=4.5.90 +pkgrel=1 +pkgdesc="XFCE Configuration library and tools" +depends=('libxfce4util>=4.5.90' 'dbus' 'dbus-glib>=0.76' 'gtk+2>=2.12.11') +groups=('xfce4' 'xfce4-core') +conflicts=('libxfce4mcs') +replaces=('libxfce4mcs') +archs=('i686' 'x86_64') +Finclude xfce4 +sha1sums=('69776a53580a6017cc6f98f2536e55d120355a6a') + + +# optimization OK From priyank at frugalware.org Sun Oct 5 13:02:32 2008 From: priyank at frugalware.org (Priyank) Date: Sun Oct 5 13:02:33 2008 Subject: [Frugalware-git] xfce46: README: updated build order Message-ID: <20081005110232.122AA1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=c6fee9a4fb98bba779852d0bf33ad2c512cc8c2b commit c6fee9a4fb98bba779852d0bf33ad2c512cc8c2b Author: Priyank Date: Sun Oct 5 16:31:33 2008 +0530 README: updated build order diff --git a/source/xfce4/README b/source/xfce4/README index 179e456..d0e771c 100644 --- a/source/xfce4/README +++ b/source/xfce4/README @@ -3,12 +3,13 @@ Xfce 4.4.0 - Build Sequence xfce4-dev-tools libxfce4util -libxfce4mcs libxfcegui4 -xfce-mcs-manager +libxfce4menu +libexo +xfconf + gtk-xfce-engine xfce-frugalware -xfce-mcs-plugins xfce4-session xfce-utils xfce4-panel From priyank at frugalware.org Sun Oct 5 13:19:56 2008 From: priyank at frugalware.org (Priyank) Date: Sun Oct 5 13:19:59 2008 Subject: [Frugalware-git] xfce46: xfce4-panel-4.5.90-1-i686 Message-ID: <20081005111956.C73461190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=bdb55c4c888557432f4fa26a491480ba991f6029 commit bdb55c4c888557432f4fa26a491480ba991f6029 Author: Priyank Date: Sun Oct 5 16:48:02 2008 +0530 xfce4-panel-4.5.90-1-i686 * Version bump * Updated depends diff --git a/source/xfce4/xfce4-panel/FrugalBuild b/source/xfce4/xfce4-panel/FrugalBuild index e7c376f..e9dc8b3 100644 --- a/source/xfce4/xfce4-panel/FrugalBuild +++ b/source/xfce4/xfce4-panel/FrugalBuild @@ -1,25 +1,19 @@ -# Compiling Time: 0.27 SBU +# Compiling Time: 0.31 SBU # Maintainer: Priyank Gosalia pkgname=xfce4-panel -pkgver=4.4.2 +pkgver=4.5.90 pkgrel=1 pkgdesc="Panel for the Xfce4 desktop environment." -makedepends=('xfce-mcs-manager>=4.4.2') -depends=('pango' 'atk' 'libxml2' 'libxfcegui4>=4.4.2' 'libxfce4mcs>=4.4.2') +makedepends=('perl-xml') +depends=('pango' 'atk' 'libxml2' 'libxfcegui4>=$pkgver' 'libxfce4util>=4.5.90' \ + 'startup-notification' 'libwnck' 'libexo>=0.3.80') groups=('xfce4' 'xfce4-core') conflicts=('xfce4-showdesktop-plugin' 'xfce4-taskbar-plugin' 'xfce4-windowlist-plugin' 'xfce4-iconbox' 'xfce4-systray') replaces=('xfce4-showdesktop-plugin' 'xfce4-taskbar-plugin' 'xfce4-windowlist-plugin' 'xfce4-iconbox' 'xfce4-systray') archs=('i686' 'x86_64') -Finclude xfce4 -sha1sums=('f66a5f46abc21324e5a375e52a37b98757eae121') - -build() -{ - Fbuild - - # Remove a duplicate png (already provided by libxfcegui4) - Frm usr/share/icons/hicolor/48x48/apps/xfce-filemanager.png -} +_F_gnome_iconcache=y +Finclude xfce4 gnome-scriptlet +sha1sums=('5f6c415fbaeae57f6e9194f3fe5b3d170bb4ce72') # optimization OK From devil505linux at gmail.com Sun Oct 5 14:15:12 2008 From: devil505linux at gmail.com (Devil505) Date: Sun Oct 5 14:15:14 2008 Subject: [Frugalware-git] frugalware-current: gens-2.15.4-1-i686 Message-ID: <20081005121512.105761190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=653e1dde708b4bcdfe128050801be30cbe399fbd commit 653e1dde708b4bcdfe128050801be30cbe399fbd Author: Devil505 Date: Sun Oct 5 14:13:47 2008 +0200 gens-2.15.4-1-i686 * fix up2date * version bump * changed desktopfile category for game;emulator diff --git a/source/games-extra/gens/FrugalBuild b/source/games-extra/gens/FrugalBuild index 8288ad3..242bbde 100644 --- a/source/games-extra/gens/FrugalBuild +++ b/source/games-extra/gens/FrugalBuild @@ -2,22 +2,23 @@ # Maintainer: Devil505 pkgname=gens -pkgver=2.15.2 +pkgver=2.15.4 pkgrel=1 pkgdesc="An emulator for multiple Sega videogamesystems such as the Genesis, Master System, Sega CD and 32X." depends=('sdl' 'gtk+2' 'freetype2' 'libxau' 'libxdmcp' 'libxdamage' 'libxext' 'libxml2') makedepends=('nasm') options=('scriptlet') -_F_sourceforge_broken_up2date="1" +_F_sourceforge_realname="Gens Source Code" +_F_sourceforge_prefix="Gens " Finclude sourceforge groups=('games-extra') archs=('i686') -sha1sums=('8c0a45cfc5f215ac4aadc41b504aa3ccf39df124') +sha1sums=('b1fb02fd3a55adea4031cd326b7c50e6ea9be9e6') _F_desktop_name="Gens" _F_desktop_desc="Sega Genesis Emulator" _F_desktop_icon="/usr/share/gens/gens_small.png" -_F_desktop_categories="Application;Game" +_F_desktop_categories="Game;Emulator;" build() { From vmiklos at frugalware.org Sun Oct 5 20:05:11 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Oct 5 20:05:12 2008 Subject: [Frugalware-git] frugalware-current: babl-0.0.22-1-ppc Message-ID: <20081005180511.75AF21190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5cc508457254f178233647e7b48fcceb3561d9d5 commit 5cc508457254f178233647e7b48fcceb3561d9d5 Author: Miklos Vajna Date: Sun Oct 5 20:05:03 2008 +0200 babl-0.0.22-1-ppc added ppc to archs() diff --git a/source/lib-extra/babl/FrugalBuild b/source/lib-extra/babl/FrugalBuild index 1066af5..93a0aee 100644 --- a/source/lib-extra/babl/FrugalBuild +++ b/source/lib-extra/babl/FrugalBuild @@ -5,7 +5,7 @@ pkgname=babl pkgver=0.0.22 pkgrel=1 pkgdesc="Babl is a dynamic, any to any, pixel format conversion library." -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') url="http://www.gegl.org/$pkgname" groups=('lib-extra') depends=('glibc') From vmiklos at frugalware.org Sun Oct 5 20:14:21 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Oct 5 20:14:22 2008 Subject: [Frugalware-git] frugalware-current: gegl-0.0.18-1-ppc Message-ID: <20081005181421.A05941190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=72e6c243a3f107ab1c453b8a812c27601aad39a3 commit 72e6c243a3f107ab1c453b8a812c27601aad39a3 Author: Miklos Vajna Date: Sun Oct 5 20:14:11 2008 +0200 gegl-0.0.18-1-ppc added ppc to archs() diff --git a/source/xlib-extra/gegl/FrugalBuild b/source/xlib-extra/gegl/FrugalBuild index 5f25e40..b42ad99 100644 --- a/source/xlib-extra/gegl/FrugalBuild +++ b/source/xlib-extra/gegl/FrugalBuild @@ -9,7 +9,7 @@ url="http://www.gegl.org/" groups=('xlib-extra') depends=('glib' 'babl' 'libpng' 'gtk+2' 'freetype2' 'libxau' 'libxdmcp' \ 'dejavu-ttf' 'libxdamage' 'libxext' 'libxml2') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') options=('scriptlet') urldl="ftp://ftp.gimp.org/pub/$pkgname/0.0" up2date="lynx -dump $urldl | Flasttarbz2" From vmiklos at frugalware.org Sun Oct 5 21:59:35 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Oct 5 21:59:37 2008 Subject: [Frugalware-git] homepage-ng: Frugalware newsletter issue 32 Message-ID: <20081005195935.803181190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=04b4022cab69c52deebb88b382835962f527e3d4 commit 04b4022cab69c52deebb88b382835962f527e3d4 Author: Russell Dickenson Date: Sun Oct 5 17:19:28 2008 +1000 Frugalware newsletter issue 32 diff --git a/frugalware/weeklynews/issue32.html b/frugalware/weeklynews/issue32.html new file mode 100755 index 0000000..859556f --- /dev/null +++ b/frugalware/weeklynews/issue32.html @@ -0,0 +1,167 @@ +

Frugalware Linux Newsletter - Issue 32

+ +

...to inform...to educate...to entertain

+ +

Every artist was first an amateur - Ralph Waldo Emerson

+ +

Welcome

 +

The newsletter's aim is to keep you up to date with what's happened recently in the world of the Linux distribution 'Frugalware'.

+ +

+ Features of this issue include: +

    +
  • Feature Article - Give a somatic look to your Frugalware
    • +
  • Happy birthday to Gimmix
    • +
  • Frugalware joins the art world
    • +
  • Tips and tricks - mutt timezone filter
    • +
+

+ + +

Events

 +

+ Here's a selection of events which occurred since the previous newsletter: +

+
    +
  • +

    Happy birthday to Gimmix

    +

    Gimmix - the excellent MPD GUI client - turned 2 years old on 26 September 2008 and to celebrate its author released version 0.5.0. For those that don't know, Gimmix's author is also a member of the Frugalware development team - Priyank!

    +
    • +
  • +

    Frugalware joins the art world

    +

    Most Linux users want their distribution to look good - ranging from startup screen, login screen to wallpaper and icons. Imagining how you want your desktop to look is usually easy. Turning these dreams into reality is much more difficult. There are at least two problems here:

    +

      +
    1. everyone likes different artwork - some people liking a minimalistic look, while others want a desktop filled with "eye candy";
      2. +
    2. geeks don't usually make good artists because they're are usually logically-minded and not artistic.
      3. +
    + +

    Devil505 has been busy recently, working on these problems for the benefit of Frugalware. He's put together an art team and established two new web sites devoted to Frugalware art. The web site for official Frugalware artwork team already includes some great wallpapers, Splashy themes and GDM themes. frugalware-art.org hosts general Frugalware artwork, to which everyone can upload their work. One exciting item created by the artwork team is an SVG version of the Frugalware logo. Why is this so exciting? Because we can now create wallpapers etc in various sizes and have the Frugalware logo scaled to match.

    +

    Everyone's welcome to join the artwork team and contribute their work. Even if you aren't an artist you can help the team by telling them what you do and don't like about their work. Getting feedback from Frugalware's users is very helpful because it helps guide the artwork's development. Personally I quite like some of Leo's work because it's a little more interesting than most distribution's artwork.

    +

    +
    • +
+ +

Feature Article - Give a somatic look to your Frugalware - by Devil505

 + +

Somatic is an original artwork theme created by David Lanham. One day a French Ubuntu user - Pokemon_jojo - made an icon theme for the Gnome desktop, themes for GDM and backgrounds based on Lanham's drawings. I found this artwork very nice with its "cartoonish" style and I decided to package it for Frugalware Linux.

+ +

To install the icon theme:

+ 

# pacman-g2 -S somatic-icon-theme

+ +

Then choose it in gnome->appearance->properties.

+

Preview: http://www.zimagez.com/zimage/preview-somatic.php

+ +

To install the GDM themes: + 

# pacman-g2 -S somatic-gdm-themes

+ +

Start gdmsetup and select one of these themes.

+

Preview: http://www.zimagez.com/zimage/somatic-gdm.php

+ +

To install Somatic wallpapers

+ 

# pacman-g2 -S somatic-backgrounds

+ +

Files are located in /usr/share/pixmaps/backgrounds/somatic. Preview: http://www.zimagez.com/zimage/bureau-somatic-wall.php

+ +

Now your Frugalware has a "somatic" look :-)

+ + +

Getting To Know You

 + +

In this section of the newsletter, we get to know Frugalware Linux a little at a time. This is not meant to replace the official documentation but instead present it in a different way. It should also suit those people who, like me, have short attention spans. :)

+ +

pacman-g2 - new and old configuration files

+

When pacman-g2 is removing a package, it will usually leave any configuration files behind with a extension ".pacsave". When it's finished installing a new package, pacman-g2 will usually leave the original configuration files but rename them with an extension of ".pacnew". The contents of ".pacnew" files should be manually merged into the existing version.

+ + +

Tips and tricks

 + + Disclaimer - Be aware that the hints & tips provided here have NOT been tested and so come with no warranty. +
    +
  • +

    mutt - local and original timezone filter - submitted by VMiklos

    +

    VMiklos created a filter in mutt, so that he can always see the date of emails in local time and in the original timezone as well. For example, he can see "this mail was sent 2 mins ago" and also "for the sender, this was early morning".

    +

    The filter - written in Python - can be found here. It also contains two small filters to avoid some inline ads (sourceforge adds such ads and also an Hungarian site). To use this filter you need to: +

      +
    1. save it to ~/.mutt
      2. +
    2. add 'set display_filter="$HOME/.mutt/display-filter.py"' in ~/.mutt/muttrc
      3. +

    +
    • +
+

This section relies on your contributions! If have some tips and tricks that you would like to be shown in the newsletter, please post them on the forums.

+ + +

Focus On Package(s)

 + +

Cowsay

+

This is a utility written in Perl 5 that has just one purpose - to add a little fun to your terminal. At the command line you enter 

cowsay "text"
and in ASCII art, the picture of a cow appears, with the text you specified appearing in a speech bubble. It's hard to explain in words, so here's an example:

+ 

+ --------------------------------------
+/ Lady Luck brings added income today. \
+\ Lady friend takes it away tonight.   /
+ --------------------------------------
+ \   ^__^
+  \  (oo)\_______
+     (__)\       )\/\
+         ||----w |
+         ||     ||
+

+

Of course having a cow saying the same thing every time could get boring. To solve this you can combine fortune with cowsay to get a random saying from the fortune sayings database(s). The command for this is: 

fortune | cowsay
Fortune has many options, including: +
    +
  • setting a maximum fortune length
    • +
  • specifying a weighting on from which database the fortune is selected
    • +
  • replacing the cow with anotehr animal - including a pengin!
    • +
+

Why not try it out soon and have some fun?

+ + +

Bug fixes

 + +

The following table gives you a overview of activity on bugs and feature requests as at 1 October 2008. In each cell of the table is a link to a detailed list of the relevant bugs or feature requests.

+ + + + + + + + + + + + + + + + + + + + + + +
ActivityBugsFeature
Requests
Open175200
Opened since the last newsletter252
Closed since the previous newsletter202
+ + +

Security announcements

 + +

NOTE - According to the normal support arrangements for Frugalware, the release of 0.9 ("Solaria") means that no further security or bug fixes will be released for Frugalware 0.8 ("Kalgan").

+ +

Here is a list of security issues which have been discovered and fixed in the 0.9 release since the previous newsletter. Note that FSA stands for "Frugalware Security Advisory."

+ + + + + +
FSAPackageFSA DescriptionUpgrade To
FSA529drupal-simplenewsA vulnerability has been reported in the Simplenews module for Drupal, which can be exploited by malicious users to conduct script insertion attacksdrupal-simplenews-5.x_1.5-1solaria1
FSA528phpmyadminA vulnerability has been reported in phpMyAdmin, which can be exploited by malicious people to conduct cross-site scripting attacksphpmyadmin-2.11.9.2-1solaria1
FSA527bitlbeeA security issue has been reported in BitlBee, which can be exploited by malicious people to bypass certain security restrictions and hijack accountsbitlbee-1.2.3-1solaria1
FSA526phpmyadminNorman Hippert has reported a vulnerability in phpMyAdmin, which can be exploited by malicious users to compromise a vulnerable systemphpmyadmin-2.11.9.1-1solaria1
+ + +

About the newsletter

 + +

Author

+

The Frugalware newsletter is written and edited by Russell Dickenson (AKA phayz). Credit for the Frugalware distribution goes to the development team.

+

Translations

+

The newsletter is currently translated into French and Danish. The French translation is provided by the French Frugalware community. The Danish translation is provided by the Danish Frugalware community. Thanks to all those involved in providing and hosting these translations.

+

Release

+

To allow time for review and corrections, each newsletter is written ahead of its release date. Therefore it may not mention events which occured in the few days before its release - e.g. security fixes. To be sure that you've got the very latest information on these topics, go to the appropriate page of the Frugalware web site.

+

Feedback

+

If you have feedback about the Frugalware newsletter - whether good or bad - please provide it via the forums. Your feedback is valuable because we want the newsletter to meet the needs of Frugalware's users.

diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml index 6d86be4..694c29a 100644 --- a/frugalware/xml/news.xml +++ b/frugalware/xml/news.xml @@ -22,6 +22,25 @@ Example: Mon, 07 Aug 2006 12:34:56 -0600 --> + 113 + Frugalware Newsletter Issue 32 + Sun, 05 Oct 2008 17:13:54 +1000 + phayz + 0 + + Features of this issue include: +
    +
  • Feature Article - Give a somatic look to your Frugalware
    • +
  • Happy birthday to Gimmix
    • +
  • Frugalware joins the art world
    • +
  • Tips and tricks - mutt timezone filter
    • +
+ You can read it here. We hope you like it! + ]]> + + + 112 Kalgan: End of life Fri, 12 Sep 2008 16:41:33 +0200 From vmiklos at frugalware.org Sun Oct 5 23:04:39 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Oct 5 23:04:40 2008 Subject: [Frugalware-git] frugalware-current: sbcl-1.0.21-1-i686 Message-ID: <20081005210439.0E0741190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3cfa4812fbcc01436514486b3c5198fd33944414 commit 3cfa4812fbcc01436514486b3c5198fd33944414 Author: Miklos Vajna Date: Sun Oct 5 23:04:22 2008 +0200 sbcl-1.0.21-1-i686 - version bump diff --git a/source/devel-extra/sbcl/FrugalBuild b/source/devel-extra/sbcl/FrugalBuild index 11570ae..8d0dcc9 100644 --- a/source/devel-extra/sbcl/FrugalBuild +++ b/source/devel-extra/sbcl/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna pkgname=sbcl -pkgver=1.0.20 +pkgver=1.0.21 pkgrel=1 pkgdesc="Steel Bank Common Lisp" depends=('glibc') @@ -13,7 +13,7 @@ _F_sourceforge_ext="-source.tar.bz2" Finclude sourceforge url="http://sbcl.sourceforge.net/" source=($source no_local_lib_please.patch cflags.patch) -sha1sums=('c90806484eba13d58b768db187b7c8e9aa4078dc' \ +sha1sums=('3e4960c7ed170f7898221d504584cd9fc5b40d4f' \ '29df2f80163179eb2c38d22836e9ed8c0778bfd2' \ 'd41025710da5f3d9fc9a93dd83c8f998142f4482') From vmiklos at frugalware.org Mon Oct 6 00:01:24 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Oct 6 00:01:26 2008 Subject: [Frugalware-git] frugalware-current: cgit-0.8-1-i686 Message-ID: <20081005220124.D6DA51190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=272c2817343fd85f9d0458aa580c4a80bba655f5 commit 272c2817343fd85f9d0458aa580c4a80bba655f5 Author: Miklos Vajna Date: Sun Oct 5 23:59:07 2008 +0200 cgit-0.8-1-i686 - version bump diff --git a/source/network-extra/cgit/FrugalBuild b/source/network-extra/cgit/FrugalBuild index fad40c4..34b2f85 100644 --- a/source/network-extra/cgit/FrugalBuild +++ b/source/network-extra/cgit/FrugalBuild @@ -2,10 +2,10 @@ # Maintainer: Miklos Vajna pkgname=cgit -pkgver=0.7.2 -gitver=1.5.3.8 -pkgrel=2 -pkgsha1="3b1846754cef4732e285b23bba94bd76c5af8606" +pkgver=0.8 +gitver=1.6.0.2 +pkgrel=1 +pkgsha1="ae83752b418328a369d4a6658fc673458012e1f1" pkgdesc="A fast webinterface for git." url="http://hjemli.net/git/cgit/" depends=('curl>=7.19.0' 'openssl') @@ -13,21 +13,21 @@ backup=(etc/{cgitrc,httpd/conf/modules.d/cgit.conf}) groups=('network-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url|grep tag/|sed 's/.*=v//;q'" -source=("http://hjemli.net/git/cgit/blob/index.html?id=$pkgsha1\&path=cgit-$pkgver.tar.gz" \ +source=(http://hjemli.net/git/cgit/snapshot/cgit-$pkgver.tar.bz2 \ http://www.kernel.org/pub/software/scm/git/git-$gitver.tar.bz2 \ cgit.conf) -sha1sums=('9aac5a40fa42dca467cc087cf63a4c8fbcf029da' \ - 'acca91988e674c5976e15a290be65f2775296162' \ - 'ba8bab178c3036d8d0e6743cc91c6ab5cd3efb7b') +sha1sums=('c4280f37f4fc7804647d6194ab37c213cd55c718' \ + '4a1d78604d1fb6c0deb43a498feb454970fb6704' \ + 'ba8bab178c3036d8d0e6743cc91c6ab5cd3efb7b') build() { - Fcd + Fcd $pkgname mv ../git-$gitver/* git/ Fmake Fmakeinstall CGIT_SCRIPT_PATH=/var/www/cgit - Ffilerel /etc/cgitrc + Fdocrel cgitrc.5.txt Ffile /etc/httpd/conf/modules.d/cgit.conf Fmkdir /var/cache/cgit chown 99:99 $Fdestdir/var/cache/cgit From vmiklos at frugalware.org Mon Oct 6 00:26:31 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Oct 6 00:26:35 2008 Subject: [Frugalware-git] frugalware-current: fakeroot-1.10-1-i686 Message-ID: <20081005222631.C1D2A1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f40b34660fced06318c7a3f0b2bf7f8378273f33 commit f40b34660fced06318c7a3f0b2bf7f8378273f33 Author: Miklos Vajna Date: Mon Oct 6 00:26:21 2008 +0200 fakeroot-1.10-1-i686 - version bump diff --git a/source/devel/fakeroot/FrugalBuild b/source/devel/fakeroot/FrugalBuild index 132f066..5cd2cf1 100644 --- a/source/devel/fakeroot/FrugalBuild +++ b/source/devel/fakeroot/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: Miklos Vajna pkgname=fakeroot -pkgver=1.9.7 +pkgver=1.10 pkgrel=1 pkgdesc="Gives a fake root environment" url="http://packages.debian.org/unstable/utils/fakeroot" @@ -13,7 +13,7 @@ groups=('devel' 'devel-core') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://ftp.debian.org/debian/pool/main/f/fakeroot/?M=A|grep gz$|sed -n 's/.*_\(.*\)\.t.*/\1/;$ p'" source=(http://ftp.debian.org/debian/pool/main/f/fakeroot/${pkgname}_$pkgver.tar.gz) -sha1sums=('dd7bf827358faa5f40ec8356cbdd57899e8b5e2e') +sha1sums=('8376a43022eec1003ae1d645abde23c3872d85d3') build() { From hermier at frugalware.org Mon Oct 6 08:00:41 2008 From: hermier at frugalware.org (Michel Hermier) Date: Mon Oct 6 08:00:43 2008 Subject: [Frugalware-git] frugalware-current: nvidia.sh Message-ID: <20081006060041.5CD271190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=57a91a3b9aea9a2fb3f5f0ca39e68505facab7c0 commit 57a91a3b9aea9a2fb3f5f0ca39e68505facab7c0 Author: Michel Hermier Date: Mon Oct 6 07:47:28 2008 +0200 nvidia.sh * Add nvidia.sh to help the build of the nvidia modules. Will be used in current and in the nvidia-beta repository. diff --git a/source/include/nvidia.install b/source/include/nvidia.install new file mode 100644 index 0000000..568aa79 --- /dev/null +++ b/source/include/nvidia.install @@ -0,0 +1,71 @@ +post_install() { + echo "*** In order to use this package you have to accept Nvidia's license which" + echo "*** can be found at /usr/share/doc/nvidia-*/LICENSE." + echo "*** If you don't accept it, please remove the package!" + + if [ -e /etc/X11/xorg.conf ]; then + sed -i 's/^.*Load "dri"/# Load "dri"/' /etc/X11/xorg.conf + sed -i 's/Driver.*"\(nv\|vesa\|vga\)"/Driver "nvidia"/' /etc/X11/xorg.conf + else + echo "WARNING: /etc/X11/xorg.conf does not exist!" + fi + + exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l` + if [ "$exist" -eq 0 ]; then + echo nvidia >> /etc/sysconfig/modules + fi + /sbin/depmod -ea $_F_kernelmod_uname + ## if nvidia dependent kernel is the current kernel + if [ -e /lib/modules/`uname -r`/kernel/drivers/video/nvidia.ko ]; then + ## Try to load it + /sbin/modprobe nvidia + fi +} + +post_upgrade() { + echo -n "Runing depmod for nvidia kernel module for kernel $_F_kernelmod_uname ..." + /sbin/depmod -ea $_F_kernelmod_uname + echo " done." + ## if that exisit we bumped / upgraded the package only no new kernel + ## on a new kernel we do nothing because one has to reboot anyway + if [ -e /lib/modules/`uname -r`/kernel/drivers/video/nvidia.ko ]; then + ## see if is loaded , if yes kill it and modprobe again if not do nothing + if grep -q nvidia /proc/modules; then + echo -n "Reloading nvidia kernel module.." + modprobe --remove nvidia + sleep 1 + modprobe nvidia + echo " done." + fi + fi +} + +pre_remove() { + if test `lsmod | grep ^nvidia | wc -l` -gt 0; then + /sbin/modprobe --remove nvidia + fi + + if [ -e /etc/X11/xorg.conf ]; then + sed -i 's/^.*# Load "dri"/Load "dri"/' /etc/X11/xorg.conf + sed -i 's/\(^Driver *\)"nvidia"/\1"nv"/' /etc/X11/xorg.conf + fi + + exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l` + if [ "$exist" -eq 1 ]; then + grep -v '^nvidia' /etc/sysconfig/modules > /etc/sysconfig/modules.tmp + mv /etc/sysconfig/modules.tmp /etc/sysconfig/modules + fi + if [ -e /usr/lib/xorg/temp/libglx.so ]; then + mv /usr/lib/xorg/temp/libglx.so /usr/lib/xorg/modules/extensions/ + fi +} + +post_remove() { + /sbin/depmod -a $_F_kernelmod_uname + echo "*** Nvidia driver is removed now. To have a working Xorg Server again run : ***" + echo "*** pacman-g2 -S libgl libglx ****" +} + +op=$1 +shift +$op $* diff --git a/source/include/nvidia.sh b/source/include/nvidia.sh new file mode 100644 index 0000000..88cdbc9 --- /dev/null +++ b/source/include/nvidia.sh @@ -0,0 +1,179 @@ +#!/bin/sh + +### +# = nvidia.sh(3) +# Michel Hermier +# +# == NAME +# nvidia.sh - for Frugalware +# +# == SYNOPSIS +# Common schema for nVidia packages. +# +# == EXAMPLE +# -------------------------------------------------- +# pkgname=nvidia +# pkgver=173.14.12 +# pkgrel=3 +# archs=('i686' 'x86_64') +# Finclude nvidia +# case "$_F_nvidia_arch" in +# x86) sha1sums=('01d297c477b95593e9fbf5c73e501a4f5617b497');; +# x86_64) sha1sums=('78d3034314df7f9c95526707d7fcf4543f5993ed');; +# esac +# -------------------------------------------------- +# +# == OPTIONS +# * _F_nvidia_name (defaults to NVIDIA-Linux-$_F_nvidia_arch-$pkgver-pkg$F_nvidia_pkgnum): the nvidia package name +# * _F_nvidia_arch (defaults guessed using CARCH): the nvidia package arch +# * _F_nvidia_pkgnum (defaults guessed using _F_nvidia_arch): the nvidia package number +# * _F_nvidia_linkver (defaults to pkgver): the link number used by the nvidia shared libraries +# * _F_nvidia_install (defaults to nvidia.install): Install file +### +# General variables +if [ -z "$_F_nvidia_arch" ]; then + if echo "$CARCH" | grep -q 'i.86'; then + _F_nvidia_arch=x86 + elif [ "$CARCH" == "x86_64" ]; then + _F_nvidia_arch=x86_64 + else + Fmessage "Unkown nvidia arch for $CARCH" + Fdie + fi +fi +if [ -z "$_F_nvidia_pkgnum" ]; then + case "$_F_nvidia_arch" in + x86) _F_nvidia_pkgnum=1;; + x86_64) _F_nvidia_pkgnum=2;; + *) Fmessage "Unkown default nvidia pkgnum for $_F_nvidia_arch" + Fdie + esac +fi +if [ -z "$_F_nvidia_name" ]; then + _F_nvidia_name=NVIDIA-Linux-$_F_nvidia_arch-$pkgver-pkg$_F_nvidia_pkgnum +fi +if [ -z "$_F_nvidia_linkver" ]; then + _F_nvidia_linkver=$pkgver +fi +if [ -z "$_F_nvidia_install" ]; then + _F_nvidia_install="nvidia.install" +fi + +### +# == OVERWRITTEN VARIABLES +# * groups +# * pkgdesc +# * source +# * up2date +# * url +# * _F_cd_path +# * _F_kernelmod_scriptlet +### +groups=('x11-extra') +pkgdesc="3D accelerated display driver for Nvidia cards" +url="http://www.nvidia.com/object/linux_display_archive.html" +source=(ftp://download.nvidia.com/XFree86/Linux-$_F_nvidia_arch/$pkgver/$_F_nvidia_name.run) +up2date="lynx -dump http://www.nvidia.com/object/unix.html|grep -m1 'Latest Version:'|sed 's/.*]//;s/-/_/'" + +_F_cd_path=$_F_nvidia_name +_F_kernelmod_scriptlet=$_F_nvidia_install + +### +# == APPENDED VARIABLES +# * depends: add xorg-server and pkgconfig to depends +# * conflicts: add libgl and libglx to conflicts +# * provides: add ligl and libglx to provides +# * options: add nostrip to options +### +depends=(${depends[@]} 'xorg-server>=1.1.0' 'pkgconfig') +conflicts=(${conflicts[@]} 'libgl' 'libglx') +provides=(${provides[@]} 'libgl' 'libglx') +options=(${options[@]} 'nostrip') + +if [ "$pkgname" != "nvidia" ]; then + conflicts=(${conflicts[@]} 'nvidia') + provides=(${provides[@]} 'nvidia') +fi + +### +# == INCLUDES DEPENDANCES +# * kernel-module +### + +Finclude kernel-module + +### +# == PROVIDED FUNCTIONS +# * Fbuild_nvidia: Builds the software +# * build(): just calls Fbuild_nvidia +### + +Fbuild_nvidia() { + cd $Fsrcdir + sh $_F_nvidia_name.run --extract-only + Fcd + Fpatchall + + # Install the binaries + Fexerel usr/bin/nvidia-* /usr/bin/ + + # Xorg modules + Fmkdir usr/lib/xorg/ + Fcp $_F_cd_path/usr/X11R6/lib/modules /usr/lib/xorg/modules + + # Libraries + Fexerel usr/lib/*.so* /usr/lib/ + Fexerel usr/lib/libGL.la /usr/lib/libGL.la + Fsed "__LIBGL_PATH__" "/usr/lib" $Fdestdir/usr/lib/libGL.la + + # Weird TLS stuff + Fmkdir usr/lib/tls + Fexerel usr/lib/tls/*.so* /usr/lib/tls/ + Fexerel usr/X11R6/lib/libXv* /usr/lib/ + + # Data + Fmkdir usr/share + Fcp $_F_cd_path/usr/share/pixmaps /usr/share/ + Fcp $_F_cd_path/usr/share/applications /usr/share/ + Fcp $_F_cd_path/usr/share/man /usr/ + Frm usr/man/man1/nvidia-installer.1.gz + Fsed "__UTILS_PATH__" "/usr/bin" $Fdestdir/usr/share/applications/nvidia-settings.desktop + Fsed "__PIXMAP_PATH__" "/usr/share/pixmaps" $Fdestdir/usr/share/applications/nvidia-settings.desktop + + # Library links + Fln "libGL.so.$_F_nvidia_linkver" "/usr/lib/libGL.so" + Fln "libGL.so.$_F_nvidia_linkver" "/usr/lib/libGL.so.1" + Fln "libGL.so.$_F_nvidia_linkver" "/usr/lib/libGL.so.1.2" + Fln "libGLcore.so.$_F_nvidia_linkver" "/usr/lib/libGLcore.so.1" + Fln "libnvidia-cfg.so.$_F_nvidia_linkver" "/usr/lib/libnvidia-cfg.so.1" + Fln "libnvidia-cfg.so.$_F_nvidia_linkver" "/usr/lib/libnvidia-cfg.so" + Fln "libnvidia-tls.so.$_F_nvidia_linkver" "/usr/lib/libnvidia-tls.so.1" + Fln "libnvidia-tls.so.$_F_nvidia_linkver" "/usr/lib/tls/libnvidia-tls.so.1" + Fln "libglx.so.$_F_nvidia_linkver" "/usr/lib/xorg/modules/extensions/libglx.so" + Fln "libXvMCNVIDIA.so.$_F_nvidia_linkver" "/usr/lib/libXvMCNVIDIA.so" + Fln "libXvMCNVIDIA.so.$_F_nvidia_linkver" "/usr/lib/libXvMCNVIDIA.so.1" + Fln "libXvMCNVIDIA.so.$_F_nvidia_linkver" "/usr/lib/libXvMCNVIDIA_dynamic.so.1" + Fln "libnvidia-wfb.so.$_F_nvidia_linkver" "/usr/lib/xorg/modules/libnvidia-wfb.so" + Fln "libnvidia-wfb.so.$_F_nvidia_linkver" "/usr/lib/xorg/modules/libnvidia-wfb.so.1" + Fln "libnvidia-wfb.so.$_F_nvidia_linkver" "/usr/lib/xorg/modules/libwfb.so" + + # Kernel module + cd usr/src/nv || Fdie + ln -s Makefile.kbuild Makefile || Fdie + make SYSSRC=$_F_kernelmod_dir/build module || Fdie + cd ../../.. || Fdie + Ffilerel usr/src/nv/nvidia.ko $_F_kernelmod_dir/kernel/drivers/video/nvidia.ko + + # Kernel module scriptlet + cp $Fincdir/nvidia.install ${Fsrcdir%/src} + Fbuild_kernelmod_scriptlet + + # Documentation + Fdoc $_F_cd_path/LICENSE + Fcp $_F_cd_path/usr/share/doc/* /usr/share/doc/$pkgname-$pkgver/ + Fln "$pkgname-$pkgver" "/usr/share/doc/$pkgname" +} + +build() { + Fbuild_nvidia +} From bouleetbil at frogdev.info Mon Oct 6 08:08:37 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Oct 6 08:08:37 2008 Subject: [Frugalware-git] frugalware-current: bcprov-141-1-i686 Message-ID: <20081006060837.03F841190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1ac9b1b8471c6cc69dace29c022c1d858453b4e9 commit 1ac9b1b8471c6cc69dace29c022c1d858453b4e9 Author: bouleetbil Date: Mon Oct 6 08:05:35 2008 +0200 bcprov-141-1-i686 *version bump diff --git a/source/devel-extra/bcprov/FrugalBuild b/source/devel-extra/bcprov/FrugalBuild index 7d91cf5..61fb2ec 100644 --- a/source/devel-extra/bcprov/FrugalBuild +++ b/source/devel-extra/bcprov/FrugalBuild @@ -3,7 +3,7 @@ pkgname=bcprov _F_archive_name="$pkgname-jdk14" -pkgver=140 +pkgver=141 pkgrel=1 pkgdesc="Java cryptography APIs." url="http://www.bouncycastle.org/java.html" @@ -12,7 +12,7 @@ source=(http://downloads.bouncycastle.org/java/$_F_archive_name-$pkgver.tar.gz b Finclude java groups=('devel-extra') archs=('i686' 'x86_64') -sha1sums=('78f3b376008c7aa8f54455a2a299a9df2f12e530' \ +sha1sums=('b7431faaf6225c08626f70b51fc9dba4f7fed5a0' \ '9db4bf71cf4214351b54ed77442296619cf71fd0') build() { From bouleetbil at frogdev.info Mon Oct 6 08:33:53 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Oct 6 08:33:54 2008 Subject: [Frugalware-git] frugalware-current: bcmail-141-1-i686 Message-ID: <20081006063353.91BE41190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d7fba85cc4a06413da3585178c38b73b99cc815f commit d7fba85cc4a06413da3585178c38b73b99cc815f Author: bouleetbil Date: Mon Oct 6 08:23:20 2008 +0200 bcmail-141-1-i686 *version bump diff --git a/source/devel-extra/bcmail/FrugalBuild b/source/devel-extra/bcmail/FrugalBuild index 1acaffb..a40b82f 100644 --- a/source/devel-extra/bcmail/FrugalBuild +++ b/source/devel-extra/bcmail/FrugalBuild @@ -3,7 +3,7 @@ pkgname=bcmail _F_archive_name="$pkgname-jdk14" -pkgver=140 +pkgver=141 pkgrel=1 pkgdesc="Java cryptography APIs." url="http://www.bouncycastle.org/java.html" @@ -13,7 +13,7 @@ Finclude java depends=(${depends[@]} 'jaf' 'bcprov' 'junit' 'gnumail') groups=('devel-extra') archs=('i686' 'x86_64') -sha1sums=('807a3ac4040ca7dc3f537fb5f20572f5c69c18ee' \ +sha1sums=('6b09d5f914297fb43e6ee1dfaae47333fa40774b' \ '9db4bf71cf4214351b54ed77442296619cf71fd0') build() { From boobaa at frugalware.org Mon Oct 6 08:56:39 2008 From: boobaa at frugalware.org (CSÉCSY László) Date: Mon Oct 6 08:56:41 2008 Subject: [Frugalware-git] frugalware-current: perl-locale-maketext-lexicon-0.71-1-i686 Message-ID: <20081006065639.D99921190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b9aafa94fdb80a5cc9a9f2a3181265daf8e5b61a commit b9aafa94fdb80a5cc9a9f2a3181265daf8e5b61a Author: CSÉCSY László Date: Mon Oct 6 08:56:03 2008 +0200 perl-locale-maketext-lexicon-0.71-1-i686 version bump diff --git a/source/devel-extra/perl-locale-maketext-lexicon/FrugalBuild b/source/devel-extra/perl-locale-maketext-lexicon/FrugalBuild index 98b8ff3..8b4eef6 100644 --- a/source/devel-extra/perl-locale-maketext-lexicon/FrugalBuild +++ b/source/devel-extra/perl-locale-maketext-lexicon/FrugalBuild @@ -4,12 +4,12 @@ pkgname=perl-locale-maketext-lexicon _F_perl_name=Locale-Maketext-Lexicon -_F_perl_author=J/JE/JESSE -pkgver=0.68 +_F_perl_author=A/AU/AUDREYT +pkgver=0.71 pkgrel=1 pkgdesc="Use other catalog formats in Maketext" depends=('perl') groups=('devel-extra') Finclude perl archs=('i686' 'x86_64') -sha1sums=('51bb4db6821432e56c57324ed9c90ac0ae3fc888') +sha1sums=('b211e2b363529c34ff56e11e9d5f5a139b0705fc') From boobaa at frugalware.org Mon Oct 6 08:58:12 2008 From: boobaa at frugalware.org (CSÉCSY László) Date: Mon Oct 6 08:58:13 2008 Subject: [Frugalware-git] frugalware-current: jhead-2.84-1-i686 Message-ID: <20081006065812.7091E1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=12ccd03e6344849e37b31f9877da79ecb8387027 commit 12ccd03e6344849e37b31f9877da79ecb8387027 Author: CSÉCSY László Date: Mon Oct 6 08:58:04 2008 +0200 jhead-2.84-1-i686 version bump diff --git a/source/apps-extra/jhead/FrugalBuild b/source/apps-extra/jhead/FrugalBuild index f73cad6..b5d4df2 100644 --- a/source/apps-extra/jhead/FrugalBuild +++ b/source/apps-extra/jhead/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: CSÉCSY László pkgname=jhead -pkgver=2.82 +pkgver=2.84 pkgrel=1 pkgdesc="Exif Jpeg camera setting parser and thumbnail remover" url="http://www.sentex.net/~mwandel/jhead/" @@ -26,4 +26,4 @@ build() { } # optimization OK -sha1sums=('816c2216b04cbb84cd0939427b111377d9da045a') +sha1sums=('63251c63a7d88e4f7b00f287ebc7b1095c2422f6') From iron at frugalware.org Mon Oct 6 10:21:40 2008 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Oct 6 10:21:42 2008 Subject: [Frugalware-git] homepage-ng: fw newsletter issue32 link correction Message-ID: <20081006082140.528231190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=48c9e6e40d75784eaf55276dc90c9fb498aabd50 commit 48c9e6e40d75784eaf55276dc90c9fb498aabd50 Author: Krisztian VASAS Date: Mon Oct 6 10:21:35 2008 +0200 fw newsletter issue32 link correction diff --git a/frugalware/weeklynews/issue32.html b/frugalware/weeklynews/issue32.html index 859556f..b54f627 100755 --- a/frugalware/weeklynews/issue32.html +++ b/frugalware/weeklynews/issue32.html @@ -35,7 +35,7 @@
  • geeks don't usually make good artists because they're are usually logically-minded and not artistic.
    • -

    Devil505 has been busy recently, working on these problems for the benefit of Frugalware. He's put together an art team and established two new web sites devoted to Frugalware art. The web site for official Frugalware artwork team already includes some great wallpapers, Splashy themes and GDM themes. frugalware-art.org hosts general Frugalware artwork, to which everyone can upload their work. One exciting item created by the artwork team is an SVG version of the Frugalware logo. Why is this so exciting? Because we can now create wallpapers etc in various sizes and have the Frugalware logo scaled to match.

    +

    Devil505 has been busy recently, working on these problems for the benefit of Frugalware. He's put together an art team and established two new web sites devoted to Frugalware art. The web site for official Frugalware artwork team already includes some great wallpapers, Splashy themes and GDM themes. frugalware-art.org hosts general Frugalware artwork, to which everyone can upload their work. One exciting item created by the artwork team is an SVG version of the Frugalware logo. Why is this so exciting? Because we can now create wallpapers etc in various sizes and have the Frugalware logo scaled to match.

    Everyone's welcome to join the artwork team and contribute their work. Even if you aren't an artist you can help the team by telling them what you do and don't like about their work. Getting feedback from Frugalware's users is very helpful because it helps guide the artwork's development. Personally I quite like some of Leo's work because it's a little more interesting than most distribution's artwork.

    From devil505linux at gmail.com Mon Oct 6 18:57:58 2008 From: devil505linux at gmail.com (Devil505) Date: Mon Oct 6 18:58:00 2008 Subject: [Frugalware-git] frugalware-current: freenukum-0.2.10-1-i686 Message-ID: <20081006165758.45FB91190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4a5ec17a0cf55ad9da5786b8a1515f9ec19e99ba commit 4a5ec17a0cf55ad9da5786b8a1515f9ec19e99ba Author: Devil505 Date: Mon Oct 6 18:56:15 2008 +0200 freenukum-0.2.10-1-i686 * new package diff --git a/source/games-extra/freenukum/FrugalBuild b/source/games-extra/freenukum/FrugalBuild new file mode 100644 index 0000000..ac90b92 --- /dev/null +++ b/source/games-extra/freenukum/FrugalBuild @@ -0,0 +1,31 @@ +# Compiling Time: 0.02 SBU +# Maintainer: Devil505 + +pkgname=freenukum +pkgver=0.2.10 +pkgrel=1 +pkgdesc="A free port of the old EGA graphics based 2D game Duke Nukem" +url="https://launchpad.net/freenukum/" +depends=('sdl_ttf') +makedepends=('pkgconfig') +groups=('games-extra') +archs=('i686') +up2date="elinks -dump 'https://launchpad.net/$pkgname/+download' | Flasttar" +source=(http://launchpad.net/$pkgname/trunk/0.2/+download/$pkgname-$pkgver.tar.gz) +sha1sums=('607c6c8820ea73883e6ce90e5e5be5cfe160e58d') + +build() { + Fcd + Fconf + Fmake + Fmkdir usr/bin + Fexerel src/$pkgname usr/bin/$pkgname + Fmkdir usr/share/man/man6 + Finstallrel 644 doc/$pkgname.6 usr/share/man/man6/$pkgname.6 + Fmkdir usr/share/applications/ + Finstallrel 644 $pkgname.desktop usr/share/applications/$pkgname.desktop + echo "Icon=$pkgname" >> $Fdestdir/usr/share/applications/$pkgname.desktop + Ficonrel data/icons/48x48/$pkgname.png +} + +# optimization OK From vmiklos at frugalware.org Mon Oct 6 19:48:18 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Oct 6 19:48:19 2008 Subject: [Frugalware-git] frugalware-current: docs/po4a.cfg: remove user.txt, it contains only includes now Message-ID: <20081006174818.D459711901A1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=abe06d69f68fe51344a2f4bca009ef87d6df08e7 commit abe06d69f68fe51344a2f4bca009ef87d6df08e7 Author: Miklos Vajna Date: Mon Oct 6 19:48:07 2008 +0200 docs/po4a.cfg: remove user.txt, it contains only includes now diff --git a/docs/po4a.cfg b/docs/po4a.cfg index aa77795..bf71793 100644 --- a/docs/po4a.cfg +++ b/docs/po4a.cfg @@ -19,7 +19,6 @@ [type: simpletext] index-user.txt $lang:$lang/index-user.txt [type: simpletext] index-devel.txt $lang:$lang/index-devel.txt # user documents -[type: simpletext] user.txt $lang:$lang/user.txt [type: simpletext] about.txt $lang:$lang/about.txt [type: simpletext] quickref.txt $lang:$lang/quickref.txt [type: simpletext] install.txt $lang:$lang/install.txt From vmiklos at frugalware.org Mon Oct 6 19:48:18 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Oct 6 19:48:20 2008 Subject: [Frugalware-git] frugalware-current: docs: add a custom config for merged documents to avoid sed hacks Message-ID: <20081006174818.B6E911190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1269ff11abfb6677b24c24900eaf690b29e2f996 commit 1269ff11abfb6677b24c24900eaf690b29e2f996 Author: Miklos Vajna Date: Mon Oct 6 19:45:55 2008 +0200 docs: add a custom config for merged documents to avoid sed hacks diff --git a/docs/Makefile b/docs/Makefile index b2e36d7..b8f8dac 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -45,16 +45,12 @@ GENERATED_SOURCES = packages.txt manual.txt user.txt devel.txt po images $(DYNAM LANGS = $(shell grep '\[po4a_langs\]' po4a.cfg |sed 's/\[po4a_langs\] //') MERGE = : > $(2); \ - for i in `cat $(1) |grep link:.*html |sed 's/.*:\(.*\).html\[.*/\1.txt/'`; \ + for i in header.txt `cat $(1) |grep link:.*html |sed 's/.*:\(.*\).html\[.*/\1.txt/'`; \ do \ [ "$$i" = "$(2)" ] && continue; \ - cat $$i >> $(2); \ + echo "include::$$i[]" >> $(2); \ echo >> $(2); \ - done; \ - sed -i 's/^\(=\+ \)/=\1/' $(2); \ - sed -i '/^\^\{2,\}$$/s/\^/+/g' $(2); \ - sed -i '/^~\{2,\}$$/s/~/^/g' $(2); \ - sed -i '1i include::header.txt[]\n' $(2) + done I18NBUILD = po4a -k 0 po4a.cfg; \ for i in $(LANGS); \ @@ -103,19 +99,22 @@ images: ln -s /etc/asciidoc/images ./ %.html: %.txt - asciidoc -a toc -a numbered -a sectids -a lang=$(shell basename `pwd`|sed 's/docs//') $(basename $@).txt + if [[ "(manual.txt|user.txt|devel.txt)" =~ "$^" ]]; then CONF="--conf-file=merge.conf"; fi; \ + asciidoc $$CONF -a toc -a numbered -a sectids -a lang=$(shell basename `pwd`|sed 's/docs//') $^ -%.text: %.html - lynx -dump $(basename $@).html > $@ +%.text: %.txt + if [[ "(manual.txt|user.txt|devel.txt)" =~ "$^" ]]; then CONF="--conf-file=merge.conf"; fi; \ + a2x --asciidoc-opts="$$CONF" -a toc -a numbered -a sectids -f text -a lang=$(shell basename `pwd`|sed 's/docs//') $^ %.pdf: %.txt - a2x -a toc -a numbered -a sectids -f pdf -a lang=$(shell basename `pwd`|sed 's/docs//') $^ + if [[ "(manual.txt|user.txt|devel.txt)" =~ "$^" ]]; then CONF="--conf-file=merge.conf"; fi; \ + a2x --asciidoc-opts="$$CONF" -a toc -a numbered -a sectids -f pdf -a lang=$(shell basename `pwd`|sed 's/docs//') $^ %.txt: %.txt.in - sed 's/@VERSION@/$(VERSION)/' $(basename $@).txt.in > $@ + sed 's/@VERSION@/$(VERSION)/' $^ > $@ index.html: index.txt header.txt - asciidoc -a numbered -a sectids -a lang=$(shell basename `pwd`|sed 's/docs//') $(basename $@).txt + asciidoc -a numbered -a sectids -a lang=$(shell basename `pwd`|sed 's/docs//') $^ manual.txt: $(MANUAL_SOURCES) $(DYNAMIC_SOURCES) $(call MERGE,index.txt,manual.txt) diff --git a/docs/header.txt.in b/docs/header.txt.in index 404da36..b3bf8b6 100644 --- a/docs/header.txt.in +++ b/docs/header.txt.in @@ -1,4 +1,4 @@ -= Frugalware @VERSION@ Documentation +_ Frugalware @VERSION@ Documentation -------------------------------------------------------------------------- Copyright (C) 2003-2008 The Frugalware Developer Team. diff --git a/docs/merge.conf b/docs/merge.conf new file mode 100644 index 0000000..859764d --- /dev/null +++ b/docs/merge.conf @@ -0,0 +1,9 @@ +[titles] +underlines="__","==","--","~~","^^" +# Single-line title patterns. +sect0=^_ +(?P[\S].*?)( +_)?$ +sect1=^= +(?P<title>[\S].*?)( +=)?$ +sect2=^== +(?P<title>[\S].*?)( +==)?$ +sect3=^=== +(?P<title>[\S].*?)( +===)?$ +sect4=^==== +(?P<title>[\S].*?)( +====)?$ +blocktitle=^\.(?P<title>([^.\s].*)|(\.[^.\s].*))$ From hermier at frugalware.org Mon Oct 6 20:15:14 2008 From: hermier at frugalware.org (Michel Hermier) Date: Mon Oct 6 20:15:16 2008 Subject: [Frugalware-git] frugalware-current: nvidia.sh nvidia.install Message-ID: <20081006181514.A03161190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a4df142775db25b766021ce6a7205106e2e58860 commit a4df142775db25b766021ce6a7205106e2e58860 Author: Michel Hermier <hermier@frugalware.org> Date: Mon Oct 6 20:12:41 2008 +0200 nvidia.sh nvidia.install * Point the install comment to the correct documentation path. diff --git a/source/include/nvidia.install b/source/include/nvidia.install index 568aa79..4aa4e9c 100644 --- a/source/include/nvidia.install +++ b/source/include/nvidia.install @@ -1,6 +1,6 @@ post_install() { echo "*** In order to use this package you have to accept Nvidia's license which" - echo "*** can be found at /usr/share/doc/nvidia-*/LICENSE." + echo "*** can be found at /usr/share/doc/$pkgname-$pkgver/LICENSE." echo "*** If you don't accept it, please remove the package!" if [ -e /etc/X11/xorg.conf ]; then diff --git a/source/include/nvidia.sh b/source/include/nvidia.sh index 88cdbc9..c22a608 100644 --- a/source/include/nvidia.sh +++ b/source/include/nvidia.sh @@ -104,10 +104,19 @@ Finclude kernel-module ### # == PROVIDED FUNCTIONS +# * Fbuild_nvidia_scriptlet: Build the nvidia scriplet # * Fbuild_nvidia: Builds the software # * build(): just calls Fbuild_nvidia ### +Fbuild_nvidia_scriptlet() +{ + cp $Fincdir/nvidia.install ${Fsrcdir%/src} + Fsed '$pkgname' "$pkgname" ${Fsrcdir%/src}/$_F_kernelmod_scriptlet + Fsed '$pkgver' "$pkgver" ${Fsrcdir%/src}/$_F_kernelmod_scriptlet + Fbuild_kernelmod_scriptlet +} + Fbuild_nvidia() { cd $Fsrcdir sh $_F_nvidia_name.run --extract-only @@ -163,10 +172,7 @@ Fbuild_nvidia() { make SYSSRC=$_F_kernelmod_dir/build module || Fdie cd ../../.. || Fdie Ffilerel usr/src/nv/nvidia.ko $_F_kernelmod_dir/kernel/drivers/video/nvidia.ko - - # Kernel module scriptlet - cp $Fincdir/nvidia.install ${Fsrcdir%/src} - Fbuild_kernelmod_scriptlet + Fbuild_nvidia_scriptlet # Documentation Fdoc $_F_cd_path/LICENSE From vmiklos at frugalware.org Mon Oct 6 21:09:21 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Oct 6 21:09:23 2008 Subject: [Frugalware-git] bmf: openoffice.org-3.0ooo300_m9-1-i686 Message-ID: <20081006190921.6FE251190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=eff859ea38c830c067d69f34de1d0896cd36b25e commit eff859ea38c830c067d69f34de1d0896cd36b25e Author: Miklos Vajna <vmiklos@frugalware.org> Date: Mon Oct 6 21:05:49 2008 +0200 openoffice.org-3.0ooo300_m9-1-i686 - update to ooo300m9, aka 3.0rc4 diff --git a/source/xapps/openoffice.org/FrugalBuild b/source/xapps/openoffice.org/FrugalBuild index 7002139..4079b0c 100644 --- a/source/xapps/openoffice.org/FrugalBuild +++ b/source/xapps/openoffice.org/FrugalBuild @@ -18,10 +18,10 @@ else branch=-3-0 tree=ooo300 dir=`echo $tree|tr [a-z] [A-Z]` - milestone=7 + milestone=9 pkgver=$upstream${tree}_m$milestone pkgrel=1 - snapshot=r13987 + snapshot=r14214 fi pkgdesc="OpenOffice.org, a full office productivity suite." url="http://www.openoffice.org/" @@ -121,7 +121,6 @@ build() { # Remove our patches so that incremental build will be possible. #rm -f patches/src680/ecj-is-gcj.diff - sed -i '/reportdesign-useless-jfreereport-dep.diff/d' patches/dev300/apply Fpatchall # SMP build @@ -138,11 +137,9 @@ build() { --with-gcc-speedup=ccache \ --with-openclipart=/usr/share/openclipart \ --enable-gtk \ - --enable-hunspell \ --with-binsuffix=no \ --disable-dependency-tracking \ - --with-installed-ooo-dirname=openoffice.org \ - --with-mono-gac-root=/usr/lib" + --with-installed-ooo-dirname=openoffice.org" # Set our version. Fsed "AC_PACKAGE_VERSION" "$pkgver-$pkgrel" configure.in @@ -154,7 +151,7 @@ build() { if ! Fuse $USE_DEVEL; then Fconf --with-lang=ALL else - Fconf --with-lang="en-US de es fr hu" --enable-separate-helpcontent + Fconf --with-lang="en-US de es fr hu" fi ./download || return 1 From bouleetbil at frogdev.info Mon Oct 6 21:38:28 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Oct 6 21:38:31 2008 Subject: [Frugalware-git] bouleetbilgnome224: consolekit-0.3.0-1-i686 Message-ID: <20081006193828.9084B1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=919e504a5252291e4079930a46bbf6c33a54a8cb commit 919e504a5252291e4079930a46bbf6c33a54a8cb Author: bouleetbil <bouleetbil@frogdev.info> Date: Mon Oct 6 21:35:28 2008 +0200 consolekit-0.3.0-1-i686 *new package diff --git a/source/xapps-extra/consolekit/FrugalBuild b/source/xapps-extra/consolekit/FrugalBuild new file mode 100644 index 0000000..c839735 --- /dev/null +++ b/source/xapps-extra/consolekit/FrugalBuild @@ -0,0 +1,30 @@ +# Compiling time: 0.38 SBU +# Maintainer: bouleetbil <bouleetbil@frogdev.info> + +pkgname=consolekit +_F_archive_name="ConsoleKit" +pkgver=0.3.0 +pkgrel=1 +pkgdesc="Framework for defining and tracking users, login sessions and seats." +url="http://www.freedesktop.org/wiki/Software/ConsoleKit" +source=(http://people.freedesktop.org/~mccann/dist/$_F_archive_name-$pkgver.tar.bz2 rc.xconsolekit \ + consolekit-0.3.0-shutdown.patch close_log.diff) +up2date="lynx -dump http://people.freedesktop.org/~mccann/dist/ | Flasttar" +depends=('libx11' 'dbus-glib' 'zlib') +install="$pkgname.install" +groups=('xapps-extra') +archs=('i686' 'x86_64') +sha1sums=('e3b6156622cc14ebca7382a55b8ed15f2f2bad98' \ + '5efcbfa507b4b5a1aff2670b3b2b507b50ba2d77' \ + 'f02205b3273047afdfe4438fac4f71f50655112b' \ + 'f05ccbcab5cc768edfe76307066c88dc721b9448') + +#If you bump this package think to verify if gnome-session can reboot or shutdown +#for now this package is only use by gnome-session but the next gnome* could use. + +build() { + Fbuild + Frcd2 xconsolekit +} + +# optimization OK diff --git a/source/xapps-extra/consolekit/close_log.diff b/source/xapps-extra/consolekit/close_log.diff new file mode 100755 index 0000000..3f23533 --- /dev/null +++ b/source/xapps-extra/consolekit/close_log.diff @@ -0,0 +1,27 @@ +/*Fixes #17866*/ +--- a/src/ck-event-logger.c ++++ b/src/ck-event-logger.c +@@ -180,8 +180,10 @@ retry: + static void + reopen_file_stream (CkEventLogger *event_logger) + { +- close (event_logger->priv->fd); +- fclose (event_logger->priv->file); ++ /* fclose will also close the underlying fd */ ++ if (event_logger->priv->file != NULL) { ++ fclose (event_logger->priv->file); ++ } + + /* FIXME: retries */ + open_log_file (event_logger); +@@ -420,8 +422,8 @@ ck_event_logger_finalize (GObject *objec + g_async_queue_unref (event_logger->priv->event_queue); + } + +- if (event_logger->priv->fd != -1) { +- close (event_logger->priv->fd); ++ if (event_logger->priv->file != NULL) { ++ fclose (event_logger->priv->file); + } + + g_free (event_logger->priv->log_filename); diff --git a/source/xapps-extra/consolekit/consolekit-0.3.0-shutdown.patch b/source/xapps-extra/consolekit/consolekit-0.3.0-shutdown.patch new file mode 100755 index 0000000..682f820 --- /dev/null +++ b/source/xapps-extra/consolekit/consolekit-0.3.0-shutdown.patch @@ -0,0 +1,32 @@ +From b09ddd0f5c9de463ad0d1ebd329a9d16b084e192 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Wed, 1 Oct 2008 22:27:24 +0200 +Subject: [PATCH] allow shutdown without policykit or RBAC intervention. + +--- + src/ck-manager.c | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/src/ck-manager.c b/src/ck-manager.c +index bcb9350..54a78e6 100644 +--- a/src/ck-manager.c ++++ b/src/ck-manager.c +@@ -1349,7 +1349,6 @@ ck_manager_restart (CkManager *manager, + } + #else + g_warning ("Compiled without PolicyKit or RBAC support!"); +- goto out; + #endif + + g_debug ("ConsoleKit preforming Restart: %s", action); +@@ -1409,7 +1408,6 @@ ck_manager_stop (CkManager *manager, + } + #else + g_warning ("Compiled without PolicyKit or RBAC support!"); +- goto out; + #endif + + g_debug ("Stopping system"); +-- +1.6.0.2 + diff --git a/source/xapps-extra/consolekit/consolekit.install b/source/xapps-extra/consolekit/consolekit.install new file mode 100644 index 0000000..64093a1 --- /dev/null +++ b/source/xapps-extra/consolekit/consolekit.install @@ -0,0 +1,28 @@ +post_install() +{ + /usr/sbin/chkconfig --add rc.xconsolekit +} + +pre_upgrade() +{ + /sbin/service xconsolekit stop +} + +post_upgrade() +{ + post_install $1 + /sbin/service xconsolekit start +} + +pre_remove() +{ + /sbin/service xconsolekit stop + /usr/sbin/chkconfig --del rc.xconsolekit +} + +op=$1 +shift + +$op $* + +# vim: ft=sh diff --git a/source/xapps-extra/consolekit/rc.xconsolekit b/source/xapps-extra/consolekit/rc.xconsolekit new file mode 100755 index 0000000..4b8aa8f --- /dev/null +++ b/source/xapps-extra/consolekit/rc.xconsolekit @@ -0,0 +1,40 @@ +#!/bin/bash + +# (c) 2008 bouleetbil <bouleetbil@frogdev.info> +# rc.xconsolekit for FrugalWare +# distributed under GPL License + +# chkconfig: 2345 99 02 +# description: Framework for defining and tracking users, login sessions and seats. + +source /lib/initscripts/functions +TEXTDOMAIN=xconsolekit +TEXTDOMAINDIR=/lib/initscripts/messages + +actions=(restart start status stop) + +pid="pidof console-kit-daemon 2> /dev/null" + +rc_start() +{ + start_msg + if [ -z "$(eval $pid)" ]; then + /usr/sbin/console-kit-daemon -- 2>/dev/null 1>/dev/null + ok $? + else + ok 999 + fi +} + +rc_stop() +{ + stop_msg + if [ ! -z "$(eval $pid)" ] ;then + kill $(eval $pid) 2>/dev/null 1>/dev/null + ok $? + else + ok 999 + fi +} + +rc_exec $1 From bouleetbil at frogdev.info Mon Oct 6 21:57:35 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Oct 6 21:57:37 2008 Subject: [Frugalware-git] bouleetbilgnome224: gnome-session-2.24.0-5-i686 Message-ID: <20081006195735.A35381190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=d7b4af2eac921f4734d8f015536695cf1255ef02 commit d7b4af2eac921f4734d8f015536695cf1255ef02 Author: bouleetbil <bouleetbil@frogdev.info> Date: Mon Oct 6 21:53:24 2008 +0200 gnome-session-2.24.0-5-i686 *added patch for shutdown/restart *added rodepends consolekit diff --git a/source/gnome/gnome-session/FrugalBuild b/source/gnome/gnome-session/FrugalBuild index 1ac4395..d543f56 100644 --- a/source/gnome/gnome-session/FrugalBuild +++ b/source/gnome/gnome-session/FrugalBuild @@ -5,26 +5,30 @@ pkgname=gnome-session pkgver=2.24.0 -pkgrel=3 +pkgrel=5 pkgdesc="GNOME session manager" depends=('libgnomeui>=2.24.0' 'gnome-desktop>=2.24.0' \ 'dbus-glib>=0.76' 'gnome-control-center>=2.24.0.1' 'gnome-vfs>=2.24.0' 'libnotify' 'gnome-keyring>=2.24.0') makedepends=('intltool') +rodepends=('consolekit') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') _F_gnome_schemas=('/etc/gconf/schemas/gnome-session.schemas') _F_gnome_iconcache="y" _F_gnome_desktop="y" Finclude gnome gnome-scriptlet -source=(${source[@]} enable_splash.diff \ +source=(${source[@]} enable_splash.diff gnome-session-HEAD-shutdown.patch gnome-session-2.23.5-polkit-automagic.patch\ $pkgname http://ftp.frugalware.org/pub/other/artwork/gnome-theme/GNOME-Splash-1.0.png ) sha1sums=('5a4b329db62ae3518029982ae86fb1b138500c3e' \ '5a63c81ad2ecd0d29aa33c73d2717dcd1774333e' \ + 'aaa28556a4e3d0a0cc102b5d9ae90ded6f6da862' \ + '942a4a41abc28596f8baac7ff41c03a677ac64db' \ '047ac00bb24d52986aac94e232b4b40fa122f582' \ '222c9a2fd01872acc2fb69c17e9771cde2e1e5a2') build() { Fpatchall + Fautoreconf Fmake --disable-schemas-install Fmakeinstall GCONF_DISABLE_SCHEMA_INSTALL=1 Fbuild_gnome_scriptlet diff --git a/source/gnome/gnome-session/gnome-session-2.23.5-polkit-automagic.patch b/source/gnome/gnome-session/gnome-session-2.23.5-polkit-automagic.patch new file mode 100644 index 0000000..c92e474 --- /dev/null +++ b/source/gnome/gnome-session/gnome-session-2.23.5-polkit-automagic.patch @@ -0,0 +1,30 @@ +--- + From bheelinkg, fix automagic dependency on policykit + + configure.in | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff -Naur gnome-session-2.23.5/configure.in gnome-session-2.23.5.new/configure.in +--- gnome-session-2.23.5/configure.in 2008-07-23 03:08:03.000000000 +0530 ++++ gnome-session-2.23.5.new/configure.in 2008-08-09 11:34:35.000000000 +0530 +@@ -77,9 +77,18 @@ + PKG_CHECK_MODULES(EGG_SMCLIENT, gtk+-2.0) + PKG_CHECK_MODULES(EGG_LIBGNOMEUI, libgnomeui-2.0) + +-PKG_CHECK_MODULES(POLKIT_GNOME, polkit-gnome >= $POLKIT_GNOME_REQUIRED, have_polkit=yes, have_polkit=no) ++AC_ARG_ENABLE([polkit], ++ AC_HELP_STRING([--enable-polkit], [Enable PolicyKit support (default auto)]), ++ enable_polkit=$enableval, ++ enable_polkit=auto) ++if test "x$enable_polkit" != "xno"; then ++ PKG_CHECK_MODULES(POLKIT_GNOME, polkit-gnome >= $POLKIT_GNOME_REQUIRED, have_polkit=yes, have_polkit=no) ++ if test "x$enable_polkit" = "xyes" -a "x$have_polkit" = "xno"; then ++ AC_MSG_ERROR([PolicyKit support explicitly requested but dependencies not found]) ++ fi ++fi + +-if test "$have_polkit" = "yes"; then ++if test "x$have_polkit" = "xyes"; then + AC_DEFINE(HAVE_POLKIT_GNOME, [1], [whether PolKit GNOME was found]) + fi + diff --git a/source/gnome/gnome-session/gnome-session-HEAD-shutdown.patch b/source/gnome/gnome-session/gnome-session-HEAD-shutdown.patch new file mode 100644 index 0000000..9529a61 --- /dev/null +++ b/source/gnome/gnome-session/gnome-session-HEAD-shutdown.patch @@ -0,0 +1,73 @@ +--- + Straight forward fix to allow shutdown on systems not using policykit. + + If the system really don't have policykit, it will make things work + as in 2.22. + + If pk is in gsm but not in ck, it'll still work as in 2.22. + + If pk is present in both, you just have to fix the logic to make + gsm ask pk if the user has the permission to shutdown _before_ showing + buttons and in case this is not possible, just damn fix pk. + + gnome-session/gsm-consolekit.c | 14 ++------------ + 1 file changed, 2 insertions(+), 12 deletions(-) + +Index: b/gnome-session/gsm-consolekit.c +=================================================================== +--- a/gnome-session/gsm-consolekit.c ++++ b/gnome-session/gsm-consolekit.c +@@ -528,7 +528,7 @@ request_restart_priv (GsmConsolekit *man + g_free (error_message); + } + #else +- g_assert_not_reached (); ++ g_warning ("Failed to restart and Policykit support not enabled"); + #endif /* HAVE POLKIT */ + } + +@@ -568,7 +568,7 @@ request_stop_priv (GsmConsolekit *manage + } + } + #else +- g_assert_not_reached (); ++ g_warning ("Failed to shutdown and Policykit support not enabled"); + #endif /* HAVE POLKIT */ + } + +@@ -828,7 +828,6 @@ gsm_consolekit_can_switch_user (GsmConso + gboolean + gsm_consolekit_can_restart (GsmConsolekit *manager) + { +-#ifdef HAVE_POLKIT_GNOME + gboolean res; + GError *error; + error = NULL; +@@ -839,16 +838,11 @@ gsm_consolekit_can_restart (GsmConsoleki + g_error_free (error); + } + return res; +-#else +- g_debug ("GsmConsolekit: built without PolicyKit-gnome support - cannot restart system"); +- return FALSE; +-#endif + } + + gboolean + gsm_consolekit_can_stop (GsmConsolekit *manager) + { +-#ifdef HAVE_POLKIT_GNOME + gboolean res; + GError *error; + error = NULL; +@@ -859,10 +853,6 @@ gsm_consolekit_can_stop (GsmConsolekit * + g_error_free (error); + } + return res; +-#else +- g_debug ("GsmConsolekit: built without PolicyKit-gnome support - cannot stop system"); +- return FALSE; +-#endif + } + + GsmConsolekit * From bouleetbil at frogdev.info Mon Oct 6 23:06:20 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Oct 6 23:06:22 2008 Subject: [Frugalware-git] bouleetbilgnome224: gksu-2.0.0-4-i686 Message-ID: <20081006210620.7BEE91190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=1ac8c6894c799f71ee45ebb6278941a087cf9dbe commit 1ac8c6894c799f71ee45ebb6278941a087cf9dbe Author: bouleetbil <bouleetbil@frogdev.info> Date: Mon Oct 6 23:03:14 2008 +0200 gksu-2.0.0-4-i686 *added patch for use the new plugin dir diff --git a/source/gnome/gksu/FrugalBuild b/source/gnome/gksu/FrugalBuild index f457540..f7fb42a 100644 --- a/source/gnome/gksu/FrugalBuild +++ b/source/gnome/gksu/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gksu pkgver=2.0.0 -pkgrel=3 +pkgrel=4 pkgdesc="A GTK+2 frontend for su and sudo" url="http://www.gnu.org/non-gnu/gksu/" backup=(etc/gksu.conf) @@ -13,9 +13,10 @@ groups=('gnome' 'gnome-apps') archs=('i686' 'x86_64' 'ppc') options=('scriptlet') up2date="lynx -dump http://people.debian.org/~kov/gksu/ | grep -v libgksu | grep tar.gz$ | tail -n 1 | sed 's/.*gksu-\([0-9\.]*\).tar.gz/\1/'" -source=(http://people.debian.org/~kov/$pkgname/$pkgname-$pkgver.tar.gz Fix_gvfs222.diff) +source=(http://people.debian.org/~kov/$pkgname/$pkgname-$pkgver.tar.gz Fix_gvfs222.diff nautilus-2.24.diff) sha1sums=('f15d568f43ecbeedd050b8f09b1da94a7d574de5' \ - '813d7cd2ac823ca14210293d927ab98e34719321') + '813d7cd2ac823ca14210293d927ab98e34719321' \ + '33449f4cfa4eb92856a1bd8c2a1eb1ae307456d0') subpkgs=("nautilus-$pkgname") subdescs=('Gksu nautilus extension') diff --git a/source/gnome/gksu/nautilus-2.24.diff b/source/gnome/gksu/nautilus-2.24.diff new file mode 100644 index 0000000..04d319c --- /dev/null +++ b/source/gnome/gksu/nautilus-2.24.diff @@ -0,0 +1,75 @@ +diff -Nur -x '*.orig' -x '*~' gksu-2.0.0/nautilus-gksu/Makefile.am gksu-2.0.0.new/nautilus-gksu/Makefile.am +--- gksu-2.0.0/nautilus-gksu/Makefile.am 2006-09-15 10:45:10.000000000 +0800 ++++ gksu-2.0.0.new/nautilus-gksu/Makefile.am 2008-04-12 15:45:47.000000000 +0800 +@@ -2,7 +2,7 @@ + INCLUDES = ${NAUTILUS_CFLAGS} + AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" + +-nautilus_extensiondir=$(libdir)/nautilus/extensions-1.0 ++nautilus_extensiondir=$(libdir)/nautilus/extensions-2.0 + nautilus_extension_LTLIBRARIES = libnautilus-gksu.la + libnautilus_gksu_la_SOURCES = libnautilus-gksu.c + libnautilus_gksu_la_LDFLAGS = LDFLAGS = -module -avoid-version -no-undefined +diff -Nur -x '*.orig' -x '*~' gksu-2.0.0/nautilus-gksu/Makefile.in gksu-2.0.0.new/nautilus-gksu/Makefile.in +--- gksu-2.0.0/nautilus-gksu/Makefile.in 2006-09-24 04:23:10.000000000 +0800 ++++ gksu-2.0.0.new/nautilus-gksu/Makefile.in 2008-04-12 15:45:53.000000000 +0800 +@@ -241,7 +241,7 @@ + AM_CFLAGS = -g -O2 -Wall + INCLUDES = ${NAUTILUS_CFLAGS} + AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" +-nautilus_extensiondir = $(libdir)/nautilus/extensions-1.0 ++nautilus_extensiondir = $(libdir)/nautilus/extensions-2.0 + nautilus_extension_LTLIBRARIES = libnautilus-gksu.la + libnautilus_gksu_la_SOURCES = libnautilus-gksu.c + libnautilus_gksu_la_LDFLAGS = LDFLAGS = -module -avoid-version -no-undefined +-- gksu-2.0.0.orig/debian/patches/01_always_ask.patch +++ gksu-2.0.0/debian/patches/01_always_ask.patch +@ -0,0 +1,48 @@ +diff -Nur gksu-2.0.0/gksu/gksu.c gksu-2.0.0.new/gksu/gksu.c +--- gksu-2.0.0/gksu/gksu.c 2006-09-15 04:45:04.000000000 +0200 ++++ gksu-2.0.0.new/gksu/gksu.c 2007-03-05 09:09:47.000000000 +0100 +@@ -55,6 +55,7 @@ + {"prompt", optional_argument, NULL, 'P'}, + {"desktop", required_argument, NULL, 'D'}, + {"description", required_argument, NULL, 'D'}, ++ {"always-ask-pass", no_argument, NULL, 'A'}, + {0, 0, 0, 0} + }; + +@@ -119,6 +120,9 @@ + N_(" --su-mode, -w\n" + " Make GKSu use su, instead of using libgksu's\n" + " default.\n"), ++ N_(" --always-ask-pass\n" ++ " Make GKSu always ask for a password, even if it is cached\n" ++ " by sudo.\n"), + }; + + help_trans = g_strconcat(_(help_text[0]), _(help_text[1]), +@@ -129,6 +133,7 @@ + _(help_text[10]), _(help_text[11]), + _(help_text[12]), _(help_text[13]), + _(help_text[14]), _(help_text[15]), ++ _(help_text[16]), _(help_text[17]), + NULL); + g_print (_(help_trans), PACKAGE_VERSION, cmdname); + g_free (help_trans); +@@ -501,7 +506,7 @@ + gtk_init (&newargc, &newargv); + + context = gksu_context_new (); +- while ((c = getopt_long(newargc, newargv, "?hu:lpm:kt:i:gdsSwP::aD:", long_opts, NULL)) ++ while ((c = getopt_long(newargc, newargv, "?hu:lpm:kt:i:gdsSwP::aD:A", long_opts, NULL)) + != EOF) + { + switch (c) +@@ -564,6 +569,9 @@ + case 'w': + run_mode = SU_MODE; + break; ++ case 'A': ++ gksu_context_set_always_ask_password(context, TRUE); ++ break; + case 'P': + prompt = TRUE; + From bouleetbil at frogdev.info Tue Oct 7 08:28:01 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Oct 7 08:28:03 2008 Subject: [Frugalware-git] frugalware-current: dvdrip-0.98.9-1-i686 Message-ID: <20081007062801.35BC11190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=25097f8515792679a6aee537188638b48901745a commit 25097f8515792679a6aee537188638b48901745a Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Oct 7 08:24:36 2008 +0200 dvdrip-0.98.9-1-i686 *version bump diff --git a/source/xmultimedia-extra/dvdrip/FrugalBuild b/source/xmultimedia-extra/dvdrip/FrugalBuild index 4718eef..86e4ee8 100644 --- a/source/xmultimedia-extra/dvdrip/FrugalBuild +++ b/source/xmultimedia-extra/dvdrip/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil <bouleetbil@frogdev.info> pkgname=dvdrip -pkgver=0.98.8 +pkgver=0.98.9 pkgrel=1 url="http://www.exit1.org/dvdrip/" pkgdesc="dvd::rip is a full featured DVD copy program written in Perl" @@ -16,7 +16,7 @@ up2date="lynx -dump http://www.exit1.org/dvdrip/dist/ | Flasttar" source=(http://www.exit1.org/dvdrip/dist/${pkgname}-$pkgver.tar.gz) _F_desktop_icon="dvdrip.png" _F_desktop_categories="Application;AudioVideo;Video;" -sha1sums=('46d9a59e16ff3f1325018626c41f6774e66c1fcf') +sha1sums=('aee11a041afa369b845f992c73c218eff0690cfd') build() { Fbuild From vmiklos at frugalware.org Tue Oct 7 16:13:51 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Oct 7 16:13:53 2008 Subject: [Frugalware-git] bmf: openoffice.org-3.0ooo300_m9-2-i686 Message-ID: <20081007141351.DA8D91190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=ffde68bce98ccf9a743646edef405427541b3a1a commit ffde68bce98ccf9a743646edef405427541b3a1a Author: Miklos Vajna <vmiklos@frugalware.org> Date: Tue Oct 7 16:09:56 2008 +0200 openoffice.org-3.0ooo300_m9-2-i686 - update to newer ooo-build snapshot. ideally this should fix the broken spellchecker, as soon as we update the external packages as well. diff --git a/source/xapps/openoffice.org/FrugalBuild b/source/xapps/openoffice.org/FrugalBuild index 4079b0c..8865f6d 100644 --- a/source/xapps/openoffice.org/FrugalBuild +++ b/source/xapps/openoffice.org/FrugalBuild @@ -20,8 +20,8 @@ else dir=`echo $tree|tr [a-z] [A-Z]` milestone=9 pkgver=$upstream${tree}_m$milestone - pkgrel=1 - snapshot=r14214 + pkgrel=2 + snapshot=r14231 fi pkgdesc="OpenOffice.org, a full office productivity suite." url="http://www.openoffice.org/" From vmiklos at frugalware.org Tue Oct 7 16:16:56 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Oct 7 16:16:57 2008 Subject: [Frugalware-git] frugalware-current: gnokii-0.6.27-1-i686 Message-ID: <20081007141656.70F8F1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e81efb0dde34dc48df0b929d842e15b389cf4b40 commit e81efb0dde34dc48df0b929d842e15b389cf4b40 Author: Miklos Vajna <vmiklos@frugalware.org> Date: Tue Oct 7 16:16:46 2008 +0200 gnokii-0.6.27-1-i686 - version bump diff --git a/source/xapps/gnokii/FrugalBuild b/source/xapps/gnokii/FrugalBuild index 8711936..e6b00e3 100644 --- a/source/xapps/gnokii/FrugalBuild +++ b/source/xapps/gnokii/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna <vmiklos@frugalware.org> pkgname=gnokii -pkgver=0.6.26 +pkgver=0.6.27 pkgrel=1 pkgdesc="Tools and user space driver for use with mobile phones" url="http://www.gnokii.org/" @@ -14,7 +14,7 @@ options=('scriptlet') archs=('i686' 'x86_64') up2date="lynx -dump $url/download/gnokii/ | grep ]gnokii | sed -n -e 's/.*gnokii-\(.*\)\.tar\.bz2.*/\1/' -e '1 p'" source=(http://gnokii.org/download/gnokii/gnokii-$pkgver.tar.bz2) -sha1sums=('572e1de8dec46c962567995996605ad7964021e0') +sha1sums=('a7c6f9fa56bfe01e3c8e719bb8585a24469fe1e7') subpkgs=($pkgname-{mysql,pq}) subdescs=('MySQL support for gnokii.' 'PostgreSQL support for gnokii.') From priyank at frugalware.org Tue Oct 7 16:24:33 2008 From: priyank at frugalware.org (Priyank) Date: Tue Oct 7 16:24:35 2008 Subject: [Frugalware-git] frugalware-current: xarchiver-0.5.0beta2-1-i686 Message-ID: <20081007142433.271AC1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=56fab7773a8c14bc34eb1171d055421c0a7d3b1d commit 56fab7773a8c14bc34eb1171d055421c0a7d3b1d Author: Priyank <priyank@frugalware.org> Date: Tue Oct 7 19:51:44 2008 +0530 xarchiver-0.5.0beta2-1-i686 * Version bump diff --git a/source/xfce4/xarchiver/FrugalBuild b/source/xfce4/xarchiver/FrugalBuild index 6dc2185..46c897f 100644 --- a/source/xfce4/xarchiver/FrugalBuild +++ b/source/xfce4/xarchiver/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia <priyankmg@gmail.com> pkgname=xarchiver -pkgver=0.5.0beta1 +pkgver=0.5.0beta2 pkgrel=1 pkgdesc="A lightweight GTK2 only frontend to zip, bzip2, gzip, rar, 7z, arj and rpm." depends=('gtk+2' 'gzip' 'bzip2' 'tar') @@ -15,6 +15,6 @@ _F_gnome_iconcache="y" _F_gnome_desktop="y" Finclude gnome-scriptlet install=xarchiver.install -sha1sums=('61ebe4ce7798a81a4cce1c13720a77d2d4277ffd') +sha1sums=('494f827e3706ed717db39b05e8f9f1ba2869f5ba') # optimization OK From vmiklos at frugalware.org Tue Oct 7 16:26:26 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Oct 7 16:26:28 2008 Subject: [Frugalware-git] frugalware-current: dvd+rw-tools-7.1-1-i686 Message-ID: <20081007142626.3BF2D1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c0db3d3bb83bac4d5af2b64b4651662a604c5f72 commit c0db3d3bb83bac4d5af2b64b4651662a604c5f72 Author: Miklos Vajna <vmiklos@frugalware.org> Date: Tue Oct 7 16:26:05 2008 +0200 dvd+rw-tools-7.1-1-i686 - up2date fix diff --git a/source/apps/dvd+rw-tools/FrugalBuild b/source/apps/dvd+rw-tools/FrugalBuild index eaa015b..5434ed4 100644 --- a/source/apps/dvd+rw-tools/FrugalBuild +++ b/source/apps/dvd+rw-tools/FrugalBuild @@ -9,7 +9,7 @@ url="http://fy.chalmers.se/~appro/linux/DVD+RW/" depends=('libstdc++') groups=('apps') archs=('i686' 'x86_64' 'ppc') -up2date="lynx -dump $url/tools/|grep '.tar.gz'|sort -n -r|grep -m1 '.tar.gz'|sed 's/.*-\(.*\).t.*/\1/'" +up2date="Flasttar $url/tools/" source=(http://fy.chalmers.se/~appro/linux/DVD+RW/tools/$pkgname-$pkgver.tar.gz \ gcc43.diff) sha1sums=('6400e013934ff589b4b224eced03fd9f42ed719b' \ From bouleetbil at frogdev.info Tue Oct 7 20:10:30 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Oct 7 20:10:31 2008 Subject: [Frugalware-git] bouleetbilgnome224: gksu-2.0.0-5-i686 Message-ID: <20081007181030.8A3D31190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=53078eb70af746d42b261b6fdf66869b8bfb4266 commit 53078eb70af746d42b261b6fdf66869b8bfb4266 Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Oct 7 20:06:55 2008 +0200 gksu-2.0.0-5-i686 *added a wrapper for gksu use dbus diff --git a/source/gnome/gksu/FrugalBuild b/source/gnome/gksu/FrugalBuild index f7fb42a..72a8d0c 100644 --- a/source/gnome/gksu/FrugalBuild +++ b/source/gnome/gksu/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gksu pkgver=2.0.0 -pkgrel=4 +pkgrel=5 pkgdesc="A GTK+2 frontend for su and sudo" url="http://www.gnu.org/non-gnu/gksu/" backup=(etc/gksu.conf) @@ -30,6 +30,10 @@ build() { Fautoreconf Fmake Fmakeinstall + #since gnome-2.24 all gnome* should be launch with dbus-launch + #the package that don't use dbus-launch is launch normally + Fmv /usr/bin/gksu /usr/bin/gksu.bin + Fwrapper "/usr/bin/gksu.bin dbus-launch \$@" gksu Fsed "x-terminal-emulator" "gnome-terminal" $Fdestdir/usr/share/applications/gksu.desktop Fsplit nautilus-$pkgname usr/lib } From bouleetbil at frogdev.info Tue Oct 7 20:13:02 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Oct 7 20:13:04 2008 Subject: [Frugalware-git] bouleetbilgnome224: rhythmbox-0.11.5-3-i686 Message-ID: <20081007181302.D621B1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=665577216211ff570c6e2cf692097c53212b0702 commit 665577216211ff570c6e2cf692097c53212b0702 Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Oct 7 20:09:15 2008 +0200 rhythmbox-0.11.5-3-i686 *rebuild with libsoup>=2.24.0.1-2 *disable broken gtk-doc diff --git a/source/gnome/rhythmbox/FrugalBuild b/source/gnome/rhythmbox/FrugalBuild index 3549085..6d5069e 100644 --- a/source/gnome/rhythmbox/FrugalBuild +++ b/source/gnome/rhythmbox/FrugalBuild @@ -4,13 +4,13 @@ pkgname=rhythmbox pkgver=0.11.5 -pkgrel=1 +pkgrel=3 pkgdesc="A music management application for GNOME" url="http://www.rhythmbox.org/" -depends=('libgnomeui>=2.20.0' 'nautilus-cd-burner>=2.20.0' 'rarian' 'desktop-file-utils' \ - 'totem>=2.20.0' 'gst-plugins-base-oil' 'avahi-glib' 'libnotify' 'libsexy' 'libgpod>=0.6.0' \ - 'libsoup>=2.2.104-2' 'gnome-media>=2.20.1' 'dbus-glib>=0.74' 'python>=2.5') -makedepends=('intltool' 'gnome-doc-utils' 'gtk-doc') +depends=('libgnomeui>=2.24.0' 'nautilus-cd-burner>=2.24.0' 'rarian' 'desktop-file-utils' \ + 'totem>=2.24.0' 'gst-plugins-base-oil' 'avahi-glib' 'libnotify' 'libsexy' 'libgpod>=0.6.0' \ + 'libsoup>=2.24.0.1-2' 'gnome-media>=2.24.0' 'dbus-glib>=0.74' 'python>=2.5') +makedepends=('intltool' 'gnome-doc-utils') rodepends=('notification-daemon') groups=('gnome') archs=('i686' 'x86_64') @@ -20,7 +20,7 @@ _F_gnome_desktop="y" _F_gnome_iconcache="y" Finclude gnome-scriptlet gnome unset MAKEFLAGS -Fconfopts="$Fconfopts --enable-mdns=avahi --with-playback=gstreamer-0-10 --enable-gtk-doc --enable-daap --enable-audioscrobbler" +Fconfopts="$Fconfopts --enable-mdns=avahi --with-playback=gstreamer-0-10 --enable-daap --enable-audioscrobbler" sha1sums=('ccec2523f3a6f3746bf1091558819b602f74114f') # optimization OK From bouleetbil at frogdev.info Tue Oct 7 20:14:42 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Oct 7 20:14:43 2008 Subject: [Frugalware-git] bouleetbilgnome224: ruby-gtk2-0.18.0-1-i686 Message-ID: <20081007181442.16F8B1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=856d19419add7cc9cc5bf56751629023c377b306 commit 856d19419add7cc9cc5bf56751629023c377b306 Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Oct 7 20:11:21 2008 +0200 ruby-gtk2-0.18.0-1-i686 *change m8r *fixe up2date *#version bump diff --git a/source/xlib-extra/ruby-gtk2/FrugalBuild b/source/xlib-extra/ruby-gtk2/FrugalBuild index cc6f2ae..7603fe0 100644 --- a/source/xlib-extra/ruby-gtk2/FrugalBuild +++ b/source/xlib-extra/ruby-gtk2/FrugalBuild @@ -1,23 +1,19 @@ # Compiling Time: 0.52 SBU -# Maintainer: Bence Nagy <nagybence@tipogral.hu> +# Maintainer: bouleetbil <bouleetbil@frogdev.info> +# Contributor: Bence Nagy <nagybence@tipogral.hu> pkgname=ruby-gtk2 -pkgver=0.16.0 +pkgver=0.18.0 pkgrel=1 pkgdesc="Ruby language bindings for GTK+ development libraries" depends=('freetype2' 'gtk+2' 'ruby') options=('scriptlet') groups=('xlib-extra') archs=('i686' 'x86_64') +_F_sourceforge_realname="ruby-gnome2" _F_sourceforge_dirname="ruby-gnome2" Finclude sourceforge url="http://ruby-gnome2.sourceforge.jp/" -sha1sums=('45b2c18523c1fca39ae346766b38550ed7005b6f') - -build() -{ - Fmake - make DESTDIR=$Fdestdir install || Fdie -} +sha1sums=('cdfcf1e161b8e5d8bd9daa5d6ccea24ff74fdfcf') # optimization OK From bouleetbil at frogdev.info Tue Oct 7 21:23:46 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Oct 7 21:23:47 2008 Subject: [Frugalware-git] frugalware-current: asymptote-1.44-1-i686 Message-ID: <20081007192346.2F18E1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6d813242640d57433c037281b06ca3a0907535b9 commit 6d813242640d57433c037281b06ca3a0907535b9 Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Oct 7 21:20:30 2008 +0200 asymptote-1.44-1-i686 *version bump diff --git a/source/xapps-extra/asymptote/FrugalBuild b/source/xapps-extra/asymptote/FrugalBuild index a435708..6399b96 100644 --- a/source/xapps-extra/asymptote/FrugalBuild +++ b/source/xapps-extra/asymptote/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: uzsolt <udvzsolt@gmail.com> pkgname=asymptote -pkgver=1.43 +pkgver=1.44 pkgrel=1 pkgdesc="Asymptote is a powerful descriptive vector graphics language." depends=('libgc' 'gsl' 'ncurses' 'readline' 'libstdc++' 'fftw' 'imaging' \ @@ -16,7 +16,7 @@ _F_sourceforge_ext=.src.tgz Finclude sourceforge url="http://asymptote.sourceforge.net/" license=('GPL2') -sha1sums=('07b98fb4bba37cfebcc9fe926f5f767ed6de7787') +sha1sums=('de966ca3d3ce6d4e296fc697a201c685f5139809') _F_desktop_desc="A asymptote GUI" _F_desktop_exec="xasy" _F_desktop_categories="Graphics;VectorGraphics;" From bouleetbil at frogdev.info Tue Oct 7 21:38:56 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Oct 7 21:38:57 2008 Subject: [Frugalware-git] frugalware-current: babl-0.0.22-1-i686 Message-ID: <20081007193856.224F31190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2b3aa6794390674d5e2cd542fdcbfb131e141993 commit 2b3aa6794390674d5e2cd542fdcbfb131e141993 Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Oct 7 21:35:19 2008 +0200 babl-0.0.22-1-i686 *move to lib diff --git a/source/lib-extra/babl/FrugalBuild b/source/lib-extra/babl/FrugalBuild deleted file mode 100644 index 93a0aee..0000000 --- a/source/lib-extra/babl/FrugalBuild +++ /dev/null @@ -1,18 +0,0 @@ -# Compiling Time: 0.09 SBU -# Maintainer: bouleetbil <bouleetbil@frogdev.info> - -pkgname=babl -pkgver=0.0.22 -pkgrel=1 -pkgdesc="Babl is a dynamic, any to any, pixel format conversion library." -archs=('i686' 'x86_64' 'ppc') -url="http://www.gegl.org/$pkgname" -groups=('lib-extra') -depends=('glibc') -options=('scriptlet') -urldl="ftp://ftp.gtk.org/pub/$pkgname/0.0" -up2date="lynx -dump $urldl | Flasttarbz2" -source=($urldl/$pkgname-$pkgver.tar.bz2) -sha1sums=('9de50fb5833f41691f50f6e735d6422aad52ea94') - -# optimization OK diff --git a/source/lib/babl/FrugalBuild b/source/lib/babl/FrugalBuild new file mode 100644 index 0000000..76f8a08 --- /dev/null +++ b/source/lib/babl/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling Time: 0.09 SBU +# Maintainer: bouleetbil <bouleetbil@frogdev.info> + +pkgname=babl +pkgver=0.0.22 +pkgrel=1 +pkgdesc="Babl is a dynamic, any to any, pixel format conversion library." +archs=('i686' 'x86_64' 'ppc') +url="http://www.gegl.org/$pkgname" +groups=('lib') +depends=('glibc') +options=('scriptlet') +urldl="ftp://ftp.gtk.org/pub/$pkgname/0.0" +up2date="lynx -dump $urldl | Flasttarbz2" +source=($urldl/$pkgname-$pkgver.tar.bz2) +sha1sums=('9de50fb5833f41691f50f6e735d6422aad52ea94') + +# optimization OK From bouleetbil at frogdev.info Tue Oct 7 21:41:56 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Oct 7 21:41:59 2008 Subject: [Frugalware-git] frugalware-current: gegl-0.0.18-1-i686 Message-ID: <20081007194156.CFCF11190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0c94fa6df8ff5408474140c22ce1ecd625ea9026 commit 0c94fa6df8ff5408474140c22ce1ecd625ea9026 Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Oct 7 21:39:07 2008 +0200 gegl-0.0.18-1-i686 *move to xlib diff --git a/source/xlib-extra/gegl/FrugalBuild b/source/xlib-extra/gegl/FrugalBuild deleted file mode 100644 index b42ad99..0000000 --- a/source/xlib-extra/gegl/FrugalBuild +++ /dev/null @@ -1,19 +0,0 @@ -# Compiling Time: 0.48 SBU -# Maintainer: bouleetbil <bouleetbil@frogdev.info> - -pkgname=gegl -pkgver=0.0.18 -pkgrel=1 -pkgdesc="GEGL is a graph based image processing framework." -url="http://www.gegl.org/" -groups=('xlib-extra') -depends=('glib' 'babl' 'libpng' 'gtk+2' 'freetype2' 'libxau' 'libxdmcp' \ - 'dejavu-ttf' 'libxdamage' 'libxext' 'libxml2') -archs=('i686' 'x86_64' 'ppc') -options=('scriptlet') -urldl="ftp://ftp.gimp.org/pub/$pkgname/0.0" -up2date="lynx -dump $urldl | Flasttarbz2" -source=($urldl/$pkgname-$pkgver.tar.bz2) -sha1sums=('f8113ad33161337eb107ad84c0ac968dca1d02d2') - -# optimization OK diff --git a/source/xlib/gegl/FrugalBuild b/source/xlib/gegl/FrugalBuild new file mode 100644 index 0000000..9844894 --- /dev/null +++ b/source/xlib/gegl/FrugalBuild @@ -0,0 +1,19 @@ +# Compiling Time: 0.48 SBU +# Maintainer: bouleetbil <bouleetbil@frogdev.info> + +pkgname=gegl +pkgver=0.0.18 +pkgrel=1 +pkgdesc="GEGL is a graph based image processing framework." +url="http://www.gegl.org/" +groups=('xlib') +depends=('glib' 'babl' 'libpng' 'gtk+2' 'freetype2' 'libxau' 'libxdmcp' \ + 'dejavu-ttf' 'libxdamage' 'libxext' 'libxml2') +archs=('i686' 'x86_64' 'ppc') +options=('scriptlet') +urldl="ftp://ftp.gimp.org/pub/$pkgname/0.0" +up2date="lynx -dump $urldl | Flasttarbz2" +source=($urldl/$pkgname-$pkgver.tar.bz2) +sha1sums=('f8113ad33161337eb107ad84c0ac968dca1d02d2') + +# optimization OK From bouleetbil at frogdev.info Tue Oct 7 21:47:16 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Oct 7 21:47:17 2008 Subject: [Frugalware-git] frugalware-current: kazehakase-0.5.5-1-i686 Message-ID: <20081007194716.898171190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=68b100713de6924cbc9d4d8af6481f53464563d7 commit 68b100713de6924cbc9d4d8af6481f53464563d7 Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Oct 7 21:44:39 2008 +0200 kazehakase-0.5.5-1-i686 *fixe up2date diff --git a/source/xapps-extra/kazehakase/FrugalBuild b/source/xapps-extra/kazehakase/FrugalBuild index ab35d17..eeec386 100644 --- a/source/xapps-extra/kazehakase/FrugalBuild +++ b/source/xapps-extra/kazehakase/FrugalBuild @@ -12,7 +12,7 @@ groups=('xapps-extra') archs=('i686' 'x86_64') options=('scriptlet') source=("http://osdn.dl.sourceforge.jp/kazehakase/32341/$pkgname-$pkgver.tar.gz") -up2date="lynx -dump 'http://sourceforge.jp/frs/index.php?group_id=388&release_id=2211' | grep "/projects/kazehakase/document/kazehakase_Kazehakase-" | cut -d '-' -f 2 | sort | tail -1 | cut -d_ -f1" +up2date="lynx -dump 'http://sourceforge.jp/frs/index.php?group_id=388&release_id=2211' | Flasttar" Fconfopts="$Fconfopts --enable-gtkmozembed --with-gecko-engine=xulrunner" sha1sums=('0de2c674f427384dca82ee28b571066a9553db2c') From bouleetbil at frogdev.info Tue Oct 7 21:49:51 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Oct 7 21:49:53 2008 Subject: [Frugalware-git] frugalware-current: alsaplayer-0.99.80-1-i686 Message-ID: <20081007194952.000541190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2bc50833f06b2ad6254cadd8904ef99fb9e367d1 commit 2bc50833f06b2ad6254cadd8904ef99fb9e367d1 Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Oct 7 21:47:08 2008 +0200 alsaplayer-0.99.80-1-i686 *fixe up2date diff --git a/source/xapps-extra/alsaplayer/FrugalBuild b/source/xapps-extra/alsaplayer/FrugalBuild index d63105f..0ad6d35 100644 --- a/source/xapps-extra/alsaplayer/FrugalBuild +++ b/source/xapps-extra/alsaplayer/FrugalBuild @@ -6,7 +6,7 @@ pkgver=0.99.80 pkgrel=1 pkgdesc="Media player primarily utilising ALSA" url="http://www.alsaplayer.org" -up2date="lynx -dump http://www.alsaplayer.org/download.php3 | Flasttarbz2" +up2date="lynx -dump http://www.alsaplayer.org/download.php | Flasttarbz2" source=($url/$pkgname-$pkgver.tar.bz2) depends=('libogg' 'libstdc++' 'gtk+2' 'freetype2' 'libxau' \ 'libxdmcp' 'libxdamage' 'libxext' 'libxml2' \ From bouleetbil at frogdev.info Tue Oct 7 21:58:28 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Oct 7 21:58:29 2008 Subject: [Frugalware-git] frugalware-current: jfreechart-1.0.11-1-i686 Message-ID: <20081007195828.1F5C51190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a0b1bf2b153e33326d4da11322440b0904098d30 commit a0b1bf2b153e33326d4da11322440b0904098d30 Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Oct 7 21:55:51 2008 +0200 jfreechart-1.0.11-1-i686 *version bump diff --git a/source/devel-extra/jfreechart/FrugalBuild b/source/devel-extra/jfreechart/FrugalBuild index ba98a92..333da88 100644 --- a/source/devel-extra/jfreechart/FrugalBuild +++ b/source/devel-extra/jfreechart/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil <bouleetbil@frogdev.info> pkgname=jfreechart -pkgver=1.0.10 +pkgver=1.0.11 pkgrel=1 pkgdesc="JFreeChart is a free (LGPL) chart library for the Java(tm) platform." _F_sourceforge_realname="1. JFreeChart" @@ -11,7 +11,7 @@ depends=(${depends[@]} 'jaxp' 'itext' 'jcommon' 'servletapi') groups=('devel-extra') archs=('i686') url="http://www.jfree.org/jfreechart/" -sha1sums=('0b0ae9e24b3940d042a92a40d4f11229ba9294db') +sha1sums=('8f59dac673405ca6943396ee415f29853bdfff1d') build() { Fcd From crazy at frugalware.org Wed Oct 8 01:26:16 2008 From: crazy at frugalware.org (crazy) Date: Wed Oct 8 01:26:18 2008 Subject: [Frugalware-git] frugalware-current: lighttpd-1.4.20-1-x86_64 Message-ID: <20081007232616.87C8F1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f3282cdb6edd78bd48da10ab61c167875f7dc4a5 commit f3282cdb6edd78bd48da10ab61c167875f7dc4a5 Author: crazy <crazy@frugalware.org> Date: Wed Oct 8 01:24:48 2008 +0200 lighttpd-1.4.20-1-x86_64 * Version bump * closes FS#3375 in -current diff --git a/source/network-extra/lighttpd/FrugalBuild b/source/network-extra/lighttpd/FrugalBuild index e27f4cb..b23c016 100644 --- a/source/network-extra/lighttpd/FrugalBuild +++ b/source/network-extra/lighttpd/FrugalBuild @@ -3,27 +3,25 @@ # Contributor: BMH1980 <bmh1980de@yahoo.de> pkgname=lighttpd -pkgver=1.4.19 -pkgrel=2 +pkgver=1.4.20 +pkgrel=1 pkgdesc="A webserver designed and optimized for high performance environments." url="http://www.lighttpd.net/" license="BSD" up2date="lynx -dump http://www.lighttpd.net/download|grep -om1 'lighttpd-\(.*\).tar.bz2'|sed 's/.*-\(.*\).t.*/\1/'" source=($url/download/$pkgname-$pkgver.tar.bz2 \ $pkgname.conf rc.$pkgname index.html \ - http://frugalware.org/images/frugalware.png \ - CVE-2008-1531.patch) + http://frugalware.org/images/frugalware.png) groups=('network-extra') archs=('i686' 'x86_64') depends=('libmysqlclient' 'bzip2' 'lua' 'pcre' 'xfsprogs-attr' 'libldap' 'openssl') makedepends=('mysql') backup=(etc/$pkgname/$pkgname.conf) -sha1sums=('fd4450e7faae55ebe0905114722995b0c57397cc' \ +sha1sums=('e5944a40579e0f37c6a0eeb0ad751344b2d6006c' \ '1a1d742bba61f24b42a4aea99623ceabbd345d3e' \ 'f30cb68ad73467a43317afabe0f4a90472df222e' \ 'd6c2577965670f3e116d9358551cdc2f4b10b4b4' \ - '62fdfe9e07b2b55be660bd107bb6e1c742d90a3e' \ - 'fc6058fc40b2ac32d1aa82978757b236ebb76590') + '62fdfe9e07b2b55be660bd107bb6e1c742d90a3e') build() { From bouleetbil at frogdev.info Wed Oct 8 06:18:54 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Oct 8 06:18:56 2008 Subject: [Frugalware-git] frugalware-current: soundconverter-1.4.1-1-i686 Message-ID: <20081008041854.4A07A1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1f48c6cfb65608ec8af7a6d3904fcdc9b5324def commit 1f48c6cfb65608ec8af7a6d3904fcdc9b5324def Author: bouleetbil <bouleetbil@frogdev.info> Date: Wed Oct 8 06:15:45 2008 +0200 soundconverter-1.4.1-1-i686 *version bump diff --git a/source/gnome-extra/soundconverter/FrugalBuild b/source/gnome-extra/soundconverter/FrugalBuild index 095d72b..f875ced 100644 --- a/source/gnome-extra/soundconverter/FrugalBuild +++ b/source/gnome-extra/soundconverter/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil <bouleetbil@frogdev.info> pkgname=soundconverter -pkgver=1.4.0 +pkgver=1.4.1 pkgrel=1 pkgdesc="A simple sound converter application for the GNOME environment." groups=('gnome-extra') @@ -18,4 +18,4 @@ _F_gnome_iconcache="y" _F_gnome_desktop="y" options=('scriptlet') Finclude berlios gnome-scriptlet -sha1sums=('ae9af90c7cbec16f6866cfcb92652db37f3a3170') +sha1sums=('dd8524432a93c3ef16955f42fda248a0dde3e2d1') From bouleetbil at frogdev.info Wed Oct 8 06:30:00 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Oct 8 06:30:01 2008 Subject: [Frugalware-git] frugalware-current: gegl-0.0.20-1-i686 Message-ID: <20081008043000.6BF4E1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=245e98776be7bdc5877da7db2f6264cc7f9f59bd commit 245e98776be7bdc5877da7db2f6264cc7f9f59bd Author: bouleetbil <bouleetbil@frogdev.info> Date: Wed Oct 8 06:27:11 2008 +0200 gegl-0.0.20-1-i686 *version bump diff --git a/source/xlib/gegl/FrugalBuild b/source/xlib/gegl/FrugalBuild index 9844894..a98f86a 100644 --- a/source/xlib/gegl/FrugalBuild +++ b/source/xlib/gegl/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil <bouleetbil@frogdev.info> pkgname=gegl -pkgver=0.0.18 +pkgver=0.0.20 pkgrel=1 pkgdesc="GEGL is a graph based image processing framework." url="http://www.gegl.org/" @@ -14,6 +14,6 @@ options=('scriptlet') urldl="ftp://ftp.gimp.org/pub/$pkgname/0.0" up2date="lynx -dump $urldl | Flasttarbz2" source=($urldl/$pkgname-$pkgver.tar.bz2) -sha1sums=('f8113ad33161337eb107ad84c0ac968dca1d02d2') +sha1sums=('37be399b58d50a87134f2dfad389a476e1155874') # optimization OK From bouleetbil at frogdev.info Wed Oct 8 06:36:08 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Oct 8 06:36:10 2008 Subject: [Frugalware-git] frugalware-current: libcommon-0.2.0_3-1-i686 Message-ID: <20081008043608.1A15D1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=07e18bfb3fb04e5fe0b6d1aec981231a6eab0777 commit 07e18bfb3fb04e5fe0b6d1aec981231a6eab0777 Author: bouleetbil <bouleetbil@frogdev.info> Date: Wed Oct 8 06:32:48 2008 +0200 libcommon-0.2.0_3-1-i686 *delete dead package diff --git a/source/gnome-extra/libcommon/FrugalBuild b/source/gnome-extra/libcommon/FrugalBuild deleted file mode 100644 index 2835c62..0000000 --- a/source/gnome-extra/libcommon/FrugalBuild +++ /dev/null @@ -1,25 +0,0 @@ -# Compiling Time: 0.08 SBU -# Maintainer: bouleetbil <bouleetbil@frogdev.info> - -pkgname=libcommon -pkgver=0.2.0_3 -pkgrel=1 -pkgdesc="LibCommon is a reusable library written in C#." -depends=('gtk2-sharp') -groups=('gnome-extra') -options=('scriptlet') -archs=('i686' 'x86_64') -_F_sourceforge_ext="-src.tar.gz" -_F_sourceforge_sep="_" -_F_sourceforge_broken_up2date="1" -Finclude sourceforge mono -sha1sums=('bbfac23a23108b662ef0ef01c634c085bcd61225') -_F_cd_path=$_F_cd_path/$pkgname$_F_sourceforge_sep${pkgver/_/-} - -build() { - Fcd - Fmonoexport - sh autogen.sh $Fconfopts || Fdie - Fbuild - Fmonocleanup -} From hermier at frugalware.org Wed Oct 8 10:22:25 2008 From: hermier at frugalware.org (Michel Hermier) Date: Wed Oct 8 10:22:27 2008 Subject: [Frugalware-git] frugalware-current: deluge-1.0.0-2-i686 Message-ID: <20081008082225.BE56B1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2209f691c4d06bdd847a9c7ae289371f27629018 commit 2209f691c4d06bdd847a9c7ae289371f27629018 Author: Michel Hermier <hermier@frugalware.org> Date: Wed Oct 8 10:19:56 2008 +0200 deluge-1.0.0-2-i686 * Add missing librsvg gtk image loader. diff --git a/source/gnome-extra/deluge/FrugalBuild b/source/gnome-extra/deluge/FrugalBuild index 41934aa..adce559 100644 --- a/source/gnome-extra/deluge/FrugalBuild +++ b/source/gnome-extra/deluge/FrugalBuild @@ -4,10 +4,10 @@ pkgname=deluge pkgver=1.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="BitTorrent client written in Python and GTK+." url="http://deluge-torrent.org/" -depends=('pygtk' 'pyxdg' 'libboost-mt>=1.35.0' 'notify-python' 'notification-daemon' 'setuptools') +depends=('pygtk' 'pyxdg' 'libboost-mt>=1.35.0' 'notify-python' 'notification-daemon' 'setuptools' 'librsvg') makedepends=('boost>=1.35.0') groups=('gnome-extra') archs=('i686' 'x86_64') From hermier at frugalware.org Wed Oct 8 13:31:06 2008 From: hermier at frugalware.org (Michel Hermier) Date: Wed Oct 8 13:31:08 2008 Subject: [Frugalware-git] frugalware-current: nvidia-173xx-173.14.12-1-i686 Message-ID: <20081008113106.B664A1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f4a19dc83021ef5dfd3310964fa2c8a31135ee78 commit f4a19dc83021ef5dfd3310964fa2c8a31135ee78 Author: Michel Hermier <hermier@frugalware.org> Date: Wed Oct 8 13:23:58 2008 +0200 nvidia-173xx-173.14.12-1-i686 * new package, nvidia-173xx has gone legacy. diff --git a/source/x11-extra/nvidia-173xx/FrugalBuild b/source/x11-extra/nvidia-173xx/FrugalBuild new file mode 100644 index 0000000..713feb5 --- /dev/null +++ b/source/x11-extra/nvidia-173xx/FrugalBuild @@ -0,0 +1,13 @@ +# Compiling Time: 0.01 SBU +# Maintainer: Michel Hermier <hermier@frugalware.org> + +pkgname=nvidia-173xx +pkgver=173.14.12 +pkgrel=1 +archs=('i686' 'x86_64') +Finclude nvidia +case "$_F_nvidia_arch" in + x86) sha1sums=('01d297c477b95593e9fbf5c73e501a4f5617b497');; + x86_64) sha1sums=('78d3034314df7f9c95526707d7fcf4543f5993ed');; +esac + From vmiklos at frugalware.org Wed Oct 8 15:36:14 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Oct 8 15:36:17 2008 Subject: [Frugalware-git] frugalware-current: tig-0.12.1-1-i686 Message-ID: <20081008133614.787931190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7287a864d1a2a709a8292d25854127c3c9666cfa commit 7287a864d1a2a709a8292d25854127c3c9666cfa Author: Miklos Vajna <vmiklos@frugalware.org> Date: Wed Oct 8 15:36:03 2008 +0200 tig-0.12.1-1-i686 - version bump diff --git a/source/devel-extra/tig/FrugalBuild b/source/devel-extra/tig/FrugalBuild index 1229fa5..1d80b7b 100644 --- a/source/devel-extra/tig/FrugalBuild +++ b/source/devel-extra/tig/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna <vmiklos@frugalware.org> pkgname=tig -pkgver=0.12 +pkgver=0.12.1 pkgrel=1 pkgdesc="A text-mode interface for git." url="http://jonas.nitro.dk/tig/" @@ -13,7 +13,7 @@ backup=(etc/tigrc) archs=('i686' 'x86_64') up2date="lynx -dump http://jonas.nitro.dk/tig/releases/|Flasttar" source=(http://jonas.nitro.dk/tig/releases/tig-$pkgver.tar.gz) -sha1sums=('8d29ed2aee6728ae573c0f3be3607f5d6965a60d') +sha1sums=('b867a22e248e3c014489ea7c33567e4ca885d88a') build() { From vmiklos at frugalware.org Wed Oct 8 15:53:37 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Oct 8 15:53:38 2008 Subject: [Frugalware-git] frugalware-current: live-2008.10.07-1-i686 Message-ID: <20081008135337.203CD1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8b4cdec1d60a7be02f0f85c52642730c0a3ad393 commit 8b4cdec1d60a7be02f0f85c52642730c0a3ad393 Author: Miklos Vajna <vmiklos@frugalware.org> Date: Wed Oct 8 15:53:28 2008 +0200 live-2008.10.07-1-i686 - version bump diff --git a/source/multimedia/live/FrugalBuild b/source/multimedia/live/FrugalBuild index b632dd6..10cf18e 100644 --- a/source/multimedia/live/FrugalBuild +++ b/source/multimedia/live/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna <vmiklos@frugalware.org> pkgname=live -pkgver=2008.09.02 +pkgver=2008.10.07 pkgrel=1 pkgdesc="Source-code libraries for standards-based RTP/RTCP/RTSP multimedia streaming" url="http://www.live555.com/" @@ -11,7 +11,7 @@ groups=('multimedia') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://www.live555.com/liveMedia/public/|grep tar.gz$|sed 's/.*live.\(.*\)\.t.*/\1/;q'" source=(http://www.live555.com/liveMedia/public/live.$pkgver.tar.gz) -sha1sums=('ea65e82fa331dd843af75d2eb35f23cd07308062') +sha1sums=('8eb2ed31d4e14d4188c1e5ea730f5ed4a8662384') build() { From boobaa at frugalware.org Wed Oct 8 19:16:36 2008 From: boobaa at frugalware.org (CSÉCSY László) Date: Wed Oct 8 19:16:38 2008 Subject: [Frugalware-git] frugalware-current: php-5.2.6-3-i686 Message-ID: <20081008171636.9F4C11190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6f4e9021d420e89b2268e8f78fda4bfbf0104490 commit 6f4e9021d420e89b2268e8f78fda4bfbf0104490 Author: CSÉCSY László <boobaa@frugalware.org> Date: Wed Oct 8 19:16:12 2008 +0200 php-5.2.6-3-i686 added shared soap support diff --git a/source/devel/php/FrugalBuild b/source/devel/php/FrugalBuild index effe500..5e3bc70 100644 --- a/source/devel/php/FrugalBuild +++ b/source/devel/php/FrugalBuild @@ -4,7 +4,7 @@ pkgname=php pkgver=5.2.6 -pkgrel=2 +pkgrel=3 pkgdesc="A widely-used general-purpose scripting language" url="http://www.php.net" backup=(etc/{php.ini,httpd/conf/modules.d/$pkgname.conf}) @@ -48,6 +48,7 @@ build() --enable-pcntl \ --enable-sysvmsg \ --enable-mbstring \ + --enable-soap=shared \ --with-pdo-odbc=shared,unixODBC,/usr \ --with-pdo-pgsql=shared,/usr \ --with-pdo-mysql=shared,/usr \ From boobaa at frugalware.org Wed Oct 8 19:27:55 2008 From: boobaa at frugalware.org (CSÉCSY László) Date: Wed Oct 8 19:27:57 2008 Subject: [Frugalware-git] frugalware-0.9: php-5.2.6-2solaria1-i686 Message-ID: <20081008172755.433031190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.9.git;a=commitdiff;h=e52aa93824a6a5b82aa156d1e11c30093c755e6d commit e52aa93824a6a5b82aa156d1e11c30093c755e6d Author: CSÉCSY László <boobaa@frugalware.org> Date: Wed Oct 8 19:27:27 2008 +0200 php-5.2.6-2solaria1-i686 diff --git a/source/devel/php/FrugalBuild b/source/devel/php/FrugalBuild index fe46682..514f55f 100644 --- a/source/devel/php/FrugalBuild +++ b/source/devel/php/FrugalBuild @@ -4,7 +4,7 @@ pkgname=php pkgver=5.2.6 -pkgrel=1 +pkgrel=2solaria1 pkgdesc="A widely-used general-purpose scripting language" url="http://www.php.net" backup=(etc/{php.ini,httpd/conf/modules.d/$pkgname.conf}) @@ -17,7 +17,7 @@ groups=('devel') archs=('i686' 'x86_64') up2date="lynx -dump http://www.php.net/downloads.php |grep 'Complete Source Code' -3|sed -n 's/.*P \(.*\)/\1/;2 p'" source=(http://www.php.net/distributions/$pkgname-$pkgver.tar.gz \ - php.ini php.conf README.Frugalware) + php.ini php.conf README.Frugalware freetds-compat.patch) subpkgs=("$pkgname-cgi") suboptions=('nodocs') ## its depends on PHP and the same files are installed etc @@ -48,6 +48,7 @@ build() --enable-pcntl \ --enable-sysvmsg \ --enable-mbstring \ + --enable-soap=shared \ --with-pdo-odbc=shared,unixODBC,/usr \ --with-pdo-pgsql=shared,/usr \ --with-pdo-mysql=shared,/usr \ @@ -91,6 +92,12 @@ build() unset MAKEFLAGS Fcd Fpatchall + # these are for freetds-compat.patch + aclocal || Fdie + Fautoreconf + Facu + # see http://bugs.gentoo.org/show_bug.cgi?id=217392 + sed -re 's:(#ifdef HAVE_CONFIG_H.*):#define _GNU_SOURCE\n\1:' -i ext/posix/posix.c ## PHP-CGI first Fmessage "Building PHP-CGI.." sh buildconf --force || Fdie @@ -132,6 +139,7 @@ build() sha1sums=('54058c73eb5a314eb2b31925477f298d898b520a' \ '9ba6e9430bdba5f6ab2bad15e7cc354d0ea3fd58' \ '0850ef23512a02e8460dc36f08f453d148dcd9df' \ - '40ae88f0721e02a2c75de76be342c51c85bf734d') + '40ae88f0721e02a2c75de76be342c51c85bf734d' \ + '383fe3f8550d73f0cc0e386d41c90d5648240e91') # optimization OK diff --git a/source/devel/php/freetds-compat.patch b/source/devel/php/freetds-compat.patch new file mode 100644 index 0000000..3eb36cd --- /dev/null +++ b/source/devel/php/freetds-compat.patch @@ -0,0 +1,88 @@ +Allow ext/mssql and ext/pdo_dblib to build with >=freetds-0.82 +Original patch by jklowden at freetds dot org +ext/pdo_dblib patch by matthias at dsx ado at +Rediffed for Gentoo (wrong direction) +http://bugs.php.net/bug.php?id=44991 + +diff -r 57e37b68a255 -r f1222f67e562 ext/mssql/config.m4 +--- a/ext/mssql/config.m4 Tue Jul 01 19:37:24 2008 +0200 ++++ b/ext/mssql/config.m4 Thu Jul 17 11:35:57 2008 +0200 +@@ -10,11 +10,11 @@ + + if test "$PHP_MSSQL" = "yes"; then + for i in /usr/local /usr; do +- if test -f $i/include/tds.h; then ++ if test -f $i/include/sybdb.h; then + FREETDS_INSTALLATION_DIR=$i + FREETDS_INCLUDE_DIR=$i/include + break +- elif test -f $i/include/freetds/tds.h; then ++ elif test -f $i/include/freetds/sybdb.h; then + FREETDS_INSTALLATION_DIR=$i + FREETDS_INCLUDE_DIR=$i/include/freetds + break +@@ -27,10 +27,10 @@ + + elif test "$PHP_MSSQL" != "no"; then + +- if test -f $PHP_MSSQL/include/tds.h; then ++ if test -f $PHP_MSSQL/include/sybdb.h; then + FREETDS_INSTALLATION_DIR=$PHP_MSSQL + FREETDS_INCLUDE_DIR=$PHP_MSSQL/include +- elif test -f $PHP_MSSQL/include/freetds/tds.h; then ++ elif test -f $PHP_MSSQL/include/freetds/sybdb.h; then + FREETDS_INSTALLATION_DIR=$PHP_MSSQL + FREETDS_INCLUDE_DIR=$PHP_MSSQL/include/freetds + else +@@ -38,8 +38,8 @@ + fi + fi + +- if test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.a" && test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.so"; then +- AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.[a|so]) ++ if test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then ++ AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.[a|so]) + fi + + PHP_ADD_INCLUDE($FREETDS_INCLUDE_DIR) +diff -r 57e37b68a255 -r f1222f67e562 ext/pdo_dblib/config.m4 +--- a/ext/pdo_dblib/config.m4 Tue Jul 01 19:37:24 2008 +0200 ++++ b/ext/pdo_dblib/config.m4 Thu Jul 17 11:35:57 2008 +0200 +@@ -13,11 +13,11 @@ + if test "$PHP_PDO_DBLIB" = "yes"; then + + for i in /usr/local /usr; do +- if test -f $i/include/tds.h; then ++ if test -f $i/include/sybdb.h; then + PDO_FREETDS_INSTALLATION_DIR=$i + PDO_FREETDS_INCLUDE_DIR=$i/include + break +- elif test -f $i/include/freetds/tds.h; then ++ elif test -f $i/include/freetds/sybdb.h; then + PDO_FREETDS_INSTALLATION_DIR=$i + PDO_FREETDS_INCLUDE_DIR=$i/include/freetds + break; +@@ -30,10 +30,10 @@ + + elif test "$PHP_PDO_DBLIB" != "no"; then + +- if test -f $PHP_PDO_DBLIB/include/tds.h; then ++ if test -f $PHP_PDO_DBLIB/include/sybdb.h; then + PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB + PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include +- elif test -f $PHP_PDO_DBLIB/include/freetds/tds.h; then ++ elif test -f $PHP_PDO_DBLIB/include/freetds/sybdb.h; then + PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB + PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include/freetds + else +@@ -45,8 +45,8 @@ + PHP_LIBDIR=lib + fi + +- if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.a" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.so"; then +- AC_MSG_ERROR(Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.[a|so]) ++ if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then ++ AC_MSG_ERROR(Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.[a|so]) + fi + + PHP_ADD_INCLUDE($PDO_FREETDS_INCLUDE_DIR) From hermier at frugalware.org Wed Oct 8 20:02:16 2008 From: hermier at frugalware.org (Michel Hermier) Date: Wed Oct 8 20:02:19 2008 Subject: [Frugalware-git] frugalware-current: nvidia.sh Message-ID: <20081008180216.E7DCC1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=726613567f802dcdeb95b3bb6fdbe0b08cf9df6c commit 726613567f802dcdeb95b3bb6fdbe0b08cf9df6c Author: Michel Hermier <hermier@frugalware.org> Date: Wed Oct 8 19:57:43 2008 +0200 nvidia.sh * Do not die if CARCH is not found. * Added some options to help to up2date search for legacy drivers. * Do not symlink one of the lib not present in earlier legacy version. diff --git a/source/include/nvidia.sh b/source/include/nvidia.sh index c22a608..41e614e 100644 --- a/source/include/nvidia.sh +++ b/source/include/nvidia.sh @@ -29,6 +29,8 @@ # * _F_nvidia_pkgnum (defaults guessed using _F_nvidia_arch): the nvidia package number # * _F_nvidia_linkver (defaults to pkgver): the link number used by the nvidia shared libraries # * _F_nvidia_install (defaults to nvidia.install): Install file +# * _F_nvidia_legacyver (optionnal): version string has found at http://www.nvidia.com/object/unix.html +# * _F_nvidia_up2date (defaults depends of _F_nvidia_legacyver): an up2date grep string that will be followed ### # General variables if [ -z "$_F_nvidia_arch" ]; then @@ -36,17 +38,12 @@ if [ -z "$_F_nvidia_arch" ]; then _F_nvidia_arch=x86 elif [ "$CARCH" == "x86_64" ]; then _F_nvidia_arch=x86_64 - else - Fmessage "Unkown nvidia arch for $CARCH" - Fdie fi fi if [ -z "$_F_nvidia_pkgnum" ]; then case "$_F_nvidia_arch" in x86) _F_nvidia_pkgnum=1;; x86_64) _F_nvidia_pkgnum=2;; - *) Fmessage "Unkown default nvidia pkgnum for $_F_nvidia_arch" - Fdie esac fi if [ -z "$_F_nvidia_name" ]; then @@ -58,6 +55,13 @@ fi if [ -z "$_F_nvidia_install" ]; then _F_nvidia_install="nvidia.install" fi +if [ -z "$_F_nvidia_up2date" ]; then + if [ -z "$_F_nvidia_legacyver" ]; then + _F_nvidia_up2date="Latest Version:" + else + _F_nvidia_up2date="Latest Legacy GPU Version ($_F_nvidia_legacyver series):" + fi +fi ### # == OVERWRITTEN VARIABLES @@ -71,9 +75,9 @@ fi ### groups=('x11-extra') pkgdesc="3D accelerated display driver for Nvidia cards" -url="http://www.nvidia.com/object/linux_display_archive.html" -source=(ftp://download.nvidia.com/XFree86/Linux-$_F_nvidia_arch/$pkgver/$_F_nvidia_name.run) -up2date="lynx -dump http://www.nvidia.com/object/unix.html|grep -m1 'Latest Version:'|sed 's/.*]//;s/-/_/'" +url="http://www.nvidia.com/object/unix.html" +source=(http://us.download.nvidia.com/XFree86/Linux-$_F_nvidia_arch/$pkgver/$_F_nvidia_name.run) +up2date="lynx -dump http://www.nvidia.com/object/unix.html|grep -m1 '"$_F_nvidia_up2date"'|sed 's/.*]//;s/-/_/'" _F_cd_path=$_F_nvidia_name _F_kernelmod_scriptlet=$_F_nvidia_install @@ -162,9 +166,11 @@ Fbuild_nvidia() { Fln "libXvMCNVIDIA.so.$_F_nvidia_linkver" "/usr/lib/libXvMCNVIDIA.so" Fln "libXvMCNVIDIA.so.$_F_nvidia_linkver" "/usr/lib/libXvMCNVIDIA.so.1" Fln "libXvMCNVIDIA.so.$_F_nvidia_linkver" "/usr/lib/libXvMCNVIDIA_dynamic.so.1" - Fln "libnvidia-wfb.so.$_F_nvidia_linkver" "/usr/lib/xorg/modules/libnvidia-wfb.so" - Fln "libnvidia-wfb.so.$_F_nvidia_linkver" "/usr/lib/xorg/modules/libnvidia-wfb.so.1" - Fln "libnvidia-wfb.so.$_F_nvidia_linkver" "/usr/lib/xorg/modules/libwfb.so" + if [ -e "/usr/lib/xorg/modules/libnvidia-wfb.so.$_F_nvidia_linkver" ]; then + Fln "libnvidia-wfb.so.$_F_nvidia_linkver" "/usr/lib/xorg/modules/libnvidia-wfb.so" + Fln "libnvidia-wfb.so.$_F_nvidia_linkver" "/usr/lib/xorg/modules/libnvidia-wfb.so.1" + Fln "libnvidia-wfb.so.$_F_nvidia_linkver" "/usr/lib/xorg/modules/libwfb.so" + fi # Kernel module cd usr/src/nv || Fdie From hermier at frugalware.org Wed Oct 8 20:13:13 2008 From: hermier at frugalware.org (Michel Hermier) Date: Wed Oct 8 20:13:16 2008 Subject: [Frugalware-git] frugalware-current: nvidia-173xx-173.14.12-1-i686 Message-ID: <20081008181314.00C011190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e739f052fb313b9b018068f2347f71426635bb20 commit e739f052fb313b9b018068f2347f71426635bb20 Author: Michel Hermier <hermier@frugalware.org> Date: Wed Oct 8 20:08:40 2008 +0200 nvidia-173xx-173.14.12-1-i686 * Add the _F_nvidia_legacyver so that up2date (when the page will be updated) diff --git a/source/x11-extra/nvidia-173xx/FrugalBuild b/source/x11-extra/nvidia-173xx/FrugalBuild index 713feb5..41e93fe 100644 --- a/source/x11-extra/nvidia-173xx/FrugalBuild +++ b/source/x11-extra/nvidia-173xx/FrugalBuild @@ -5,6 +5,7 @@ pkgname=nvidia-173xx pkgver=173.14.12 pkgrel=1 archs=('i686' 'x86_64') +_F_nvidia_legacyver="1.0-173xx" Finclude nvidia case "$_F_nvidia_arch" in x86) sha1sums=('01d297c477b95593e9fbf5c73e501a4f5617b497');; From bouleetbil at frogdev.info Wed Oct 8 20:59:09 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Oct 8 20:59:11 2008 Subject: [Frugalware-git] bouleetbilgnome224: gnome-python-extras-2.19.1-2-i686 Message-ID: <20081008185909.E39DD1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=2056e696b80e79a87825dc061fc2bab15476cbb5 commit 2056e696b80e79a87825dc061fc2bab15476cbb5 Author: bouleetbil <bouleetbil@frogdev.info> Date: Wed Oct 8 20:53:42 2008 +0200 gnome-python-extras-2.19.1-2-i686 *rebuild gnome-python-extras-mozembed with xulrunner *it's broken since firefox3 diff --git a/source/gnome/gnome-python-extras/FrugalBuild b/source/gnome/gnome-python-extras/FrugalBuild index c66d88b..198a815 100644 --- a/source/gnome/gnome-python-extras/FrugalBuild +++ b/source/gnome/gnome-python-extras/FrugalBuild @@ -3,11 +3,11 @@ pkgname=gnome-python-extras pkgver=2.19.1 -pkgrel=1 +pkgrel=2 pkgdesc="Additional Python bindings for GNOME" url="http://www.pygtk.org/" -depends=('gnome-python-desktop>=2.22.0') -makedepends=('firefox>=2.0' 'libgtkhtml' 'gtkspell' 'libgda' 'libgksu') +depends=('gnome-python-desktop>=2.24.0') +makedepends=('xulrunner' 'libgtkhtml' 'gtkspell' 'libgda' 'libgksu') groups=('gnome') archs=('i686' 'x86_64') _F_gnome_devel="y" @@ -16,9 +16,10 @@ sha1sums=('f97303aa92c300050818ac8a01d0bc0657b2a9e3') subpkgs=("$pkgname-mozembed" "$pkgname-gtkhtml" "$pkgname-gtkspell") subdescs=('Mozilla embed library for PyGTK' 'GtkHTML library for PyGTK' 'GtkSpell library for PyGTK') -subdepends=("$pkgname=$pkgver firefox>=2.0" "$pkgname=$pkgver libgtkhtml" "$pkgname=$pkgver gtkspell") +subdepends=("$pkgname=$pkgver xulrunner" "$pkgname=$pkgver libgtkhtml" "$pkgname=$pkgver gtkspell") subgroups=('gnome-extra' 'gnome-extra' 'gnome-extra') subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64') +Fconfopts="${Fconfopts[@]} --with-gtkmozembed=xulrunner" build() { Fbuild From boobaa at frugalware.org Wed Oct 8 23:08:42 2008 From: boobaa at frugalware.org (CSÉCSY László) Date: Wed Oct 8 23:08:44 2008 Subject: [Frugalware-git] frugalware-current: drupal-5.11-1-i686 Message-ID: <20081008210842.189C61190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=88f80aa50ef255c646f7e47f51fcde8806165afa commit 88f80aa50ef255c646f7e47f51fcde8806165afa Author: CSÉCSY László <boobaa@frugalware.org> Date: Wed Oct 8 23:08:07 2008 +0200 drupal-5.11-1-i686 version bump closes #3392 in -current up2date fix diff --git a/source/network-extra/drupal/FrugalBuild b/source/network-extra/drupal/FrugalBuild index 656e38b..f6763ca 100644 --- a/source/network-extra/drupal/FrugalBuild +++ b/source/network-extra/drupal/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme <alex@alex-smith.me.uk> pkgname=drupal -pkgver=5.10 +pkgver=5.11 pkgrel=1 pkgdesc="An advanced content management system to manage your website" url="http://drupal.org" @@ -11,11 +11,11 @@ rodepends=('apache' 'php' 'mysql' 'webappconfig') depends=() groups=('network-extra') archs=('i686' 'x86_64') -up2date="lynx -dump http://drupal.org/download | grep -m1 'l-5[0-9\.]*.tar.gz' | Flasttar" +up2date="lynx -dump http://drupal.org/project/Drupal+project | grep -m1 'l-5[0-9\.]*.tar.gz' | Flasttar" backup=(var/www/drupal/sites/default/settings.php) source=(http://drupal.org/files/projects/drupal-$pkgver.tar.gz \ drupalsetup README.Frugalware) -sha1sums=('0c722d75608e25039ffee448a450721aba1de64a' \ +sha1sums=('79eada127a061052a922ba95d6daaf19bc8e81e5' \ 'c56deef0edee4cea4b9391d20358eb7e2faf0005' \ '64c0eadd7a2e00b11644458a4eeea8e3203fa739') options=('stick') From vmiklos at frugalware.org Wed Oct 8 23:12:36 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Oct 8 23:12:37 2008 Subject: [Frugalware-git] frugalware-current: drupal-webform-5.x_2.2-1-i686 Message-ID: <20081008211236.33C0F1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=928e874bb3d12a244c38b53b4eea1a4b6c407829 commit 928e874bb3d12a244c38b53b4eea1a4b6c407829 Author: Miklos Vajna <vmiklos@frugalware.org> Date: Wed Oct 8 23:12:25 2008 +0200 drupal-webform-5.x_2.2-1-i686 -version bump diff --git a/source/network-extra/drupal-webform/FrugalBuild b/source/network-extra/drupal-webform/FrugalBuild index cf7bbf2..e178c48 100644 --- a/source/network-extra/drupal-webform/FrugalBuild +++ b/source/network-extra/drupal-webform/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: CSÉCSY László <boobaa@frugalware.org> _F_drupal_module=webform -pkgver=5.x_2.1.3 +pkgver=5.x_2.2 pkgrel=1 pkgdesc="Adds a webform nodetype to your Drupal site" Finclude drupal -sha1sums=('063a1cb723c51fb83bfc987d67b0be62fe877269') +sha1sums=('18b8bfd84033a51951fd1abd7ebf7de35a282970') From boobaa at frugalware.org Wed Oct 8 23:13:06 2008 From: boobaa at frugalware.org (CSÉCSY László) Date: Wed Oct 8 23:13:07 2008 Subject: [Frugalware-git] frugalware-current: drupal6-6.5-1-i686 Message-ID: <20081008211306.52BD01190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bef3fdd5f320894c8b5e4af7697fa0d5db628060 commit bef3fdd5f320894c8b5e4af7697fa0d5db628060 Author: CSÉCSY László <boobaa@frugalware.org> Date: Wed Oct 8 23:12:33 2008 +0200 drupal6-6.5-1-i686 version bump closes #3393 in -current up2date fix diff --git a/source/network-extra/drupal6/FrugalBuild b/source/network-extra/drupal6/FrugalBuild index 09f8bac..fba8bd7 100644 --- a/source/network-extra/drupal6/FrugalBuild +++ b/source/network-extra/drupal6/FrugalBuild @@ -2,18 +2,18 @@ # Maintainer: CSÉCSY László <boobaa@frugalware.org> pkgname=drupal6 -pkgver=6.4 +pkgver=6.5 pkgrel=1 pkgdesc="An open source content management platform" url="http://drupal.org" rodepends=('apache' 'php') groups=('network-extra') archs=('i686' 'x86_64') -up2date="lynx -dump http://drupal.org/download | grep -m1 'l-6[0-9\.]*.tar.gz' | sed 's/.*-\(.*\)\.tar.*/\1/'" +up2date="lynx -dump http://drupal.org/project/Drupal+project | grep -m1 'l-6[0-9\.]*.tar.gz' | sed 's/.*-\(.*\)\.tar.*/\1/'" backup=(var/www/drupal6/sites/default/settings.php) source=(http://drupal.org/files/projects/drupal-$pkgver.tar.gz \ README.Frugalware) -sha1sums=('a8c5e9680f394281f53e584f88fe29a3c9cedfd7' \ +sha1sums=('f67ce3b42367d849900e47e835fc3e9ed52014bd' \ '3e301be2f8a247c86b5f32e68773c9618322e7d7') options=('stick') From boobaa at frugalware.org Wed Oct 8 23:20:19 2008 From: boobaa at frugalware.org (CSÉCSY László) Date: Wed Oct 8 23:20:21 2008 Subject: [Frugalware-git] frugalware-0.9: drupal-5.11-1solaria1-i686 Message-ID: <20081008212019.570601190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.9.git;a=commitdiff;h=1e996bc29cb6a24f1fc8c3d751c4e1676edbd09d commit 1e996bc29cb6a24f1fc8c3d751c4e1676edbd09d Author: CSÉCSY László <boobaa@frugalware.org> Date: Wed Oct 8 23:19:33 2008 +0200 drupal-5.11-1solaria1-i686 secfix verbump backport of 88f80aa closes #3392 in -stable diff --git a/source/network-extra/drupal/FrugalBuild b/source/network-extra/drupal/FrugalBuild index 656e38b..6ff9ace 100644 --- a/source/network-extra/drupal/FrugalBuild +++ b/source/network-extra/drupal/FrugalBuild @@ -3,19 +3,19 @@ # Contributor: AlexExtreme <alex@alex-smith.me.uk> pkgname=drupal -pkgver=5.10 -pkgrel=1 +pkgver=5.11 +pkgrel=1solaria1 pkgdesc="An advanced content management system to manage your website" url="http://drupal.org" rodepends=('apache' 'php' 'mysql' 'webappconfig') depends=() groups=('network-extra') archs=('i686' 'x86_64') -up2date="lynx -dump http://drupal.org/download | grep -m1 'l-5[0-9\.]*.tar.gz' | Flasttar" +up2date="lynx -dump http://drupal.org/project/Drupal+project | grep -m1 'l-5[0-9\.]*.tar.gz' | Flasttar" backup=(var/www/drupal/sites/default/settings.php) source=(http://drupal.org/files/projects/drupal-$pkgver.tar.gz \ drupalsetup README.Frugalware) -sha1sums=('0c722d75608e25039ffee448a450721aba1de64a' \ +sha1sums=('79eada127a061052a922ba95d6daaf19bc8e81e5' \ 'c56deef0edee4cea4b9391d20358eb7e2faf0005' \ '64c0eadd7a2e00b11644458a4eeea8e3203fa739') options=('stick') From boobaa at frugalware.org Wed Oct 8 23:26:45 2008 From: boobaa at frugalware.org (CSÉCSY László) Date: Wed Oct 8 23:26:46 2008 Subject: [Frugalware-git] frugalware-0.9: drupal6-6.5-1solaria1-i686 Message-ID: <20081008212645.9DB321190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.9.git;a=commitdiff;h=7263f0fa18813bd463d896e902813cf7c94d422c commit 7263f0fa18813bd463d896e902813cf7c94d422c Author: CSÉCSY László <boobaa@frugalware.org> Date: Wed Oct 8 23:26:11 2008 +0200 drupal6-6.5-1solaria1-i686 secfix verbump backport of bef3fdd closes #3393 in -stable diff --git a/source/network-extra/drupal6/FrugalBuild b/source/network-extra/drupal6/FrugalBuild index 09f8bac..24b8254 100644 --- a/source/network-extra/drupal6/FrugalBuild +++ b/source/network-extra/drupal6/FrugalBuild @@ -2,18 +2,18 @@ # Maintainer: CSÉCSY László <boobaa@frugalware.org> pkgname=drupal6 -pkgver=6.4 -pkgrel=1 +pkgver=6.5 +pkgrel=1solaria1 pkgdesc="An open source content management platform" url="http://drupal.org" rodepends=('apache' 'php') groups=('network-extra') archs=('i686' 'x86_64') -up2date="lynx -dump http://drupal.org/download | grep -m1 'l-6[0-9\.]*.tar.gz' | sed 's/.*-\(.*\)\.tar.*/\1/'" +up2date="lynx -dump http://drupal.org/project/Drupal+project | grep -m1 'l-6[0-9\.]*.tar.gz' | sed 's/.*-\(.*\)\.tar.*/\1/'" backup=(var/www/drupal6/sites/default/settings.php) source=(http://drupal.org/files/projects/drupal-$pkgver.tar.gz \ README.Frugalware) -sha1sums=('a8c5e9680f394281f53e584f88fe29a3c9cedfd7' \ +sha1sums=('f67ce3b42367d849900e47e835fc3e9ed52014bd' \ '3e301be2f8a247c86b5f32e68773c9618322e7d7') options=('stick') From boobaa at frugalware.org Wed Oct 8 23:40:32 2008 From: boobaa at frugalware.org (CSÉCSY László) Date: Wed Oct 8 23:40:34 2008 Subject: [Frugalware-git] frugalware-current: man-pages-3.11-1-i686 Message-ID: <20081008214032.E6F7D1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6f0dfe178932eab3a9b828dc494b0e5e1fc0bc7d commit 6f0dfe178932eab3a9b828dc494b0e5e1fc0bc7d Author: CSÉCSY László <boobaa@frugalware.org> Date: Wed Oct 8 23:40:04 2008 +0200 man-pages-3.11-1-i686 version bump diff --git a/source/apps/man-pages/FrugalBuild b/source/apps/man-pages/FrugalBuild index c0cc36d..758fa84 100644 --- a/source/apps/man-pages/FrugalBuild +++ b/source/apps/man-pages/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: VMiklos <vmiklos@frugalware.org> pkgname=man-pages -pkgver=3.10 +pkgver=3.11 pkgrel=1 pkgdesc="Man pages are online documentation for Linux" url="http://www.win.tue.nl/~aeb/linux/man" @@ -41,4 +41,4 @@ build() Frm /usr/share/man/man4/mouse.4 } -sha1sums=('4130343ecc59246b0df6c9c542f8849d8d8bca05') +sha1sums=('21727034e41f59b9787eef85af0778562b099e9b') From boobaa at frugalware.org Wed Oct 8 23:50:25 2008 From: boobaa at frugalware.org (CSÉCSY László) Date: Wed Oct 8 23:50:28 2008 Subject: [Frugalware-git] frugalware-current: perl-xml-rss-1.36-1-i686 Message-ID: <20081008215025.811801190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a66ddcb1ef3d962a7fd41fcc465744fe45448c77 commit a66ddcb1ef3d962a7fd41fcc465744fe45448c77 Author: CSÉCSY László <boobaa@frugalware.org> Date: Wed Oct 8 23:50:05 2008 +0200 perl-xml-rss-1.36-1-i686 version bump diff --git a/source/devel-extra/perl-xml-rss/FrugalBuild b/source/devel-extra/perl-xml-rss/FrugalBuild index 377f193..f9b08ca 100644 --- a/source/devel-extra/perl-xml-rss/FrugalBuild +++ b/source/devel-extra/perl-xml-rss/FrugalBuild @@ -3,7 +3,7 @@ _F_perl_name=XML-RSS _F_perl_author=S/SH/SHLOMIF -pkgver=1.35 +pkgver=1.36 pkgrel=1 pkgdesc="A perl module to manage RDF Site Summary (RSS) files" url="http://search.cpan.org/dist/XML-RSS/" @@ -12,4 +12,4 @@ makedepends=('perl-test-manifest') groups=('devel-extra') Finclude perl archs=('i686' 'x86_64') -sha1sums=('71709013f9c0c5f11b32e69fe5a889757bd91aeb') +sha1sums=('120fbfcbe94ff849b54c15f6f521828bf7865371') From vmiklos at frugalware.org Wed Oct 8 23:54:31 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Oct 8 23:54:32 2008 Subject: [Frugalware-git] homepage-ng: FSA530-wireshark Message-ID: <20081008215431.890381190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=2ff44e02a7299755d74ad675bf20a5d95a7b435b commit 2ff44e02a7299755d74ad675bf20a5d95a7b435b Author: Miklos Vajna <vmiklos@frugalware.org> Date: Wed Oct 8 23:54:29 2008 +0200 FSA530-wireshark diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index cd59d0e..be5885e 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -26,6 +26,21 @@ <fsas> <fsa> + <id>530</id> + <date>2008-10-08</date> + <author>Miklos Vajna</author> + <package>wireshark </package> + <vulnerable>1.0.2-2</vulnerable> + <unaffected>1.0.3-1solaria1</unaffected> + <bts>http://bugs.frugalware.org/task/3345</bts> + <cve>http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-3146 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-3932 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-3933</cve> + <desc>Some vulnerabilities have been reported in Wireshark, which can be exploited by malicious people to cause a DoS (Denial of Service). + 1) Various errors within epan/dissectors/packet-ncp2222.inc can be exploited to cause e.g. a crash or an infinite loop via specially crafted NCP packets. + 2) An error while uncompressing zlib-compressed packet data can be exploited to cause a crash via specially crafted packets.</desc> + </fsa> + <fsa> <id>529</id> <date>2008-09-26</date> <author>Miklos Vajna</author> From crazy at frugalware.org Thu Oct 9 02:48:54 2008 From: crazy at frugalware.org (crazy) Date: Thu Oct 9 02:48:57 2008 Subject: [Frugalware-git] frugalware-current: php-5.2.6-4-x86_64 Message-ID: <20081009004854.E93BA1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cb577d673e0bc948a6378700c970fa5f7539894f commit cb577d673e0bc948a6378700c970fa5f7539894f Author: crazy <crazy@frugalware.org> Date: Thu Oct 9 02:43:55 2008 +0200 php-5.2.6-4-x86_64 * release bump * delete man pages from php-cgi so we don't * conflict with php diff --git a/source/devel/php/FrugalBuild b/source/devel/php/FrugalBuild index 5e3bc70..6580c4e 100644 --- a/source/devel/php/FrugalBuild +++ b/source/devel/php/FrugalBuild @@ -4,7 +4,7 @@ pkgname=php pkgver=5.2.6 -pkgrel=3 +pkgrel=4 pkgdesc="A widely-used general-purpose scripting language" url="http://www.php.net" backup=(etc/{php.ini,httpd/conf/modules.d/$pkgname.conf}) @@ -85,7 +85,7 @@ build() --with-mime-magic \ --with-sqlite=shared \ --with-mhash=shared,/usr" - + ## this is true for both # OK make install does not really like SMP and random dies so .. JOBS="$MAKEFLAGS" @@ -111,9 +111,9 @@ build() make INSTALL_ROOT=$Fdestdir EXTENSION_DIR=/usr/lib/php PEAR_INSTALLDIR=/usr/share/pear install || Fdie ## remove stuff is in php Fcd $Fdestdir - Frm etc ./{.registry,.channels,.depdb*,.lock,.file*} usr/{include,share,lib,man} + Frm etc ./{.registry,.channels,.depdb*,.lock,.file*} usr/{include,share,lib,man} usr/php/man Frm usr/bin/{phpize,php-config,pecl,pear*,php} - + ## yeah mv because Fdoc will not work ## and if I don't move it it will be installed in PHP build as well =) Fmkdir usr/share/doc/$pkgname-cgi-$pkgver From devil505linux at gmail.com Thu Oct 9 08:24:08 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Oct 9 08:24:11 2008 Subject: [Frugalware-git] frugalware-current: python-mechanize-0.1.9-1-i686 Message-ID: <20081009062408.D08631190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d4d9bff6fec381601e4f8523c1927618dff1752c commit d4d9bff6fec381601e4f8523c1927618dff1752c Author: Devil505 <devil505linux@gmail.com> Date: Thu Oct 9 08:22:39 2008 +0200 python-mechanize-0.1.9-1-i686 * version bump diff --git a/source/devel-extra/python-mechanize/FrugalBuild b/source/devel-extra/python-mechanize/FrugalBuild index adc31fd..3c59ecd 100644 --- a/source/devel-extra/python-mechanize/FrugalBuild +++ b/source/devel-extra/python-mechanize/FrugalBuild @@ -1,8 +1,8 @@ -# Compiling Time: 0.05 SBU +# Compiling Time: 0.01 SBU # Maintainer: Devil505 <devil505linux@gmail.com> pkgname=python-mechanize -pkgver=0.1.8 +pkgver=0.1.9 pkgrel=1 _F_archive_name="mechanize" pkgdesc="Stateful programmatic web browsing in Python." @@ -13,4 +13,4 @@ groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url | Flasttar" source=($url/src/$_F_archive_name-$pkgver.tar.gz) -sha1sums=('e76a2597bdc98a6e71ff272214b4cec00c523d5d') +sha1sums=('6d34e0ee75d86fc95e87342721d6ad7f00bdbaba') From devil505linux at gmail.com Thu Oct 9 09:14:14 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Oct 9 09:14:17 2008 Subject: [Frugalware-git] frugalware-current: opencity-0.0.5-1-i686 Message-ID: <20081009071414.B0E361190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b86f34d0133e06310cc627d254df2f86663e865e commit b86f34d0133e06310cc627d254df2f86663e865e Author: Devil505 <devil505linux@gmail.com> Date: Thu Oct 9 09:13:53 2008 +0200 opencity-0.0.5-1-i686 * fix up2date diff --git a/source/games-extra/opencity/FrugalBuild b/source/games-extra/opencity/FrugalBuild index 125e114..78e64c4 100644 --- a/source/games-extra/opencity/FrugalBuild +++ b/source/games-extra/opencity/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Devil505 <devil505linux@gmail.com> pkgname=opencity -pkgver=0.0.5.1 +pkgver=0.0.5 pkgrel=1 pkgdesc="A full 3D city simulator game project" +_F_sourceforge_realname="Stable" _F_sourceforge_ext="stable.tar.bz2" -_F_sourceforge_broken_up2date=1 Finclude sourceforge url="http://www.opencity.info/" depends=('sdl_mixer' 'sdl_net' 'sdlimage' 'mesa') From devil505linux at gmail.com Thu Oct 9 09:16:29 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Oct 9 09:16:31 2008 Subject: [Frugalware-git] frugalware-current: xcfa-3.3.40-2-i686 Message-ID: <20081009071629.CCE6F1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a0819cc3131849a410131f378d31a44eecf6c46d commit a0819cc3131849a410131f378d31a44eecf6c46d Author: Devil505 <devil505linux@gmail.com> Date: Thu Oct 9 09:16:14 2008 +0200 xcfa-3.3.40-2-i686 * fix up2date & source diff --git a/source/xapps-extra/xcfa/FrugalBuild b/source/xapps-extra/xcfa/FrugalBuild index 3a47d51..7b6df68 100644 --- a/source/xapps-extra/xcfa/FrugalBuild +++ b/source/xapps-extra/xcfa/FrugalBuild @@ -12,7 +12,7 @@ depends=('gtk+2' 'freetype2' 'libxau' 'libxdmcp' 'taglib' 'curl>=7.19.0' 'libxda options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') -up2date="lynx -dump http://download.tuxfamily.org/xcfaudio/download/Src/ | Flasttar" +up2date="lynx -dump http://download.tuxfamily.org/xcfaudio/xcfa_download/src/ | Flasttar" Fconfopts="${Fconfopts[@]} --disable-ansi" -source=(http://download.tuxfamily.org/xcfaudio/download/Src/$pkgname-$pkgver.tar.gz) +source=(http://download.tuxfamily.org/xcfaudio/xcfa_download/src/$pkgname-$pkgver.tar.gz) sha1sums=('80c34caf20390b66b48719d206fd81890beaf5b4') From devil505linux at gmail.com Thu Oct 9 09:37:55 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Oct 9 09:37:57 2008 Subject: [Frugalware-git] frugalware-current: gpodder-0.13.0-1-i686 Message-ID: <20081009073755.EEC651190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=548c55bf56409a488cb56800b276b29daf6b7770 commit 548c55bf56409a488cb56800b276b29daf6b7770 Author: Devil505 <devil505linux@gmail.com> Date: Thu Oct 9 09:35:25 2008 +0200 gpodder-0.13.0-1-i686 * version bump diff --git a/source/gnome-extra/gpodder/FrugalBuild b/source/gnome-extra/gpodder/FrugalBuild index f79f905..5621429 100644 --- a/source/gnome-extra/gpodder/FrugalBuild +++ b/source/gnome-extra/gpodder/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 <devil505linux@gmail.com> pkgname=gpodder -pkgver=0.12.3 +pkgver=0.13.0 pkgrel=1 pkgdesc="A podcast receiver/catcher." depends=('pygtk' 'pyxml' 'wget' 'python' 'libglade' 'imagemagick' 'feedparser') @@ -13,6 +13,6 @@ Finclude berlios _F_gnome_iconcache="y" options=('scriptlet') Finclude gnome-scriptlet -sha1sums=('68185c39414b5c842cc1fa0d6d3fb8d0ef0fd862') +sha1sums=('c0d027f62150ef9f9f99b016641742def622d79b') From devil505linux at gmail.com Thu Oct 9 10:11:31 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Oct 9 10:11:32 2008 Subject: [Frugalware-git] frugalware-current: opencity-0.0.5-1-i686 Message-ID: <20081009081131.2EA1C1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5f2165d4a7a9f114750fa5f5b34009f6383cbc4d commit 5f2165d4a7a9f114750fa5f5b34009f6383cbc4d Author: Devil505 <devil505linux@gmail.com> Date: Thu Oct 9 10:11:13 2008 +0200 opencity-0.0.5-1-i686 * fix sha1sum diff --git a/source/games-extra/opencity/FrugalBuild b/source/games-extra/opencity/FrugalBuild index 78e64c4..fc322ba 100644 --- a/source/games-extra/opencity/FrugalBuild +++ b/source/games-extra/opencity/FrugalBuild @@ -13,5 +13,5 @@ depends=('sdl_mixer' 'sdl_net' 'sdlimage' 'mesa') groups=('games-extra') archs=('i686' 'x86_64') _F_cd_path="$pkgname-0.0.5stable" -sha1sums=('fff219e395b97611edf5e40c4c44f6b23e62b384') +sha1sums=('9214bd2e44356ef45306c08695f4d2576e8ed2fd') From devil505linux at gmail.com Thu Oct 9 14:20:16 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Oct 9 14:20:17 2008 Subject: [Frugalware-git] frugalware-current: consonance-0.3.1-1-i686 Message-ID: <20081009122016.0EF101190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=350cf292fabe6f4eb6ac18354ba59d6f1ab92dcf commit 350cf292fabe6f4eb6ac18354ba59d6f1ab92dcf Author: Devil505 <devil505linux@gmail.com> Date: Thu Oct 9 14:16:58 2008 +0200 consonance-0.3.1-1-i686 * new package diff --git a/source/xapps-extra/consonance/FrugalBuild b/source/xapps-extra/consonance/FrugalBuild new file mode 100644 index 0000000..3fcbbfb --- /dev/null +++ b/source/xapps-extra/consonance/FrugalBuild @@ -0,0 +1,22 @@ +# Compiling Time: 0.09 SBU +# Maintainer: Devil505 <devil505linux@gmail.com> + +pkgname=consonance +pkgver=0.3.1 +pkgrel=1 +pkgdesc="A lightweight music manager" +depends=('libmad' 'libao' 'libnotify' 'freetype2' 'libxau' 'libxdmcp' 'libsndfile' 'libvorbis' 'taglib' 'libxdamage' 'libxext') +_F_sourceforge_prefix="release v" +Finclude sourceforge +options=('scriptlet') +groups=('xapps-extra') +archs=('i686' 'x86_64') +sha1sums=('84d3e6ae84c20079046c04abf08b384c6b2a101c') + +build() +{ + Fbuild + Fsed "Icon=consonance.png" "Icon=/usr/share/consonance/data/consonance.png" $Fdestdir/usr/share/applications/$pkgname.desktop +} + +# optimization OK From devil505linux at gmail.com Thu Oct 9 14:42:36 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Oct 9 14:42:38 2008 Subject: [Frugalware-git] frugalware-current: log4net-1.2.10-1-i686 Message-ID: <20081009124236.A10FE1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f7d31341df1538d4870c9b335f38eedff8438002 commit f7d31341df1538d4870c9b335f38eedff8438002 Author: Devil505 <devil505linux@gmail.com> Date: Thu Oct 9 14:36:53 2008 +0200 log4net-1.2.10-1-i686 * new package diff --git a/source/devel-extra/log4net/FrugalBuild b/source/devel-extra/log4net/FrugalBuild new file mode 100644 index 0000000..fbb071a --- /dev/null +++ b/source/devel-extra/log4net/FrugalBuild @@ -0,0 +1,27 @@ +# Compiling Time: 0.05 SBU +# Maintainer: Devil505 <devil505linux@gmail.com> + +pkgname=log4net +pkgver=1.2.10 +pkgrel=1 +pkgdesc="tool to help the programmer output log statements to a variety of output targets." +url="http://logging.apache.org/$pkgname" +depends=('mono') +Finclude mono +makedepends=('nant' 'unzip') +groups=('devel-extra') +archs=('i686') +_F_archive_name="incubating-$pkgname" +up2date="lynx -dump $url/download.html |Flastarchive .zip" +source=(http://archive.apache.org/dist/incubator/$pkgname/$pkgver/incubating-$pkgname-$pkgver.zip) +sha1sums=('4f8ff9892665469f915855692c9fc02801038837') + +build() +{ + Fmonoexport + Fcd $pkgname-$pkgver + sn -k log4net.snk || Fdie + nant -buildfile:log4net.build compile-all || Fdie + gacutil -i bin/mono/2.0/release/log4net.dll -f -package $pkgname -root $Fdestdir/usr/lib || Fdie + Fmonocleanup +} \ No newline at end of file From vmiklos at frugalware.org Thu Oct 9 15:24:03 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Oct 9 15:24:04 2008 Subject: [Frugalware-git] frugalware-current: intltool-0.40.5-1-i686 Message-ID: <20081009132403.888B31190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c8bbbd861da91ce9c9598d61d6bd029ab209d93f commit c8bbbd861da91ce9c9598d61d6bd029ab209d93f Author: Miklos Vajna <vmiklos@frugalware.org> Date: Thu Oct 9 15:23:56 2008 +0200 intltool-0.40.5-1-i686 -version bump diff --git a/source/devel/intltool/FrugalBuild b/source/devel/intltool/FrugalBuild index cc7cdb4..69bcad1 100644 --- a/source/devel/intltool/FrugalBuild +++ b/source/devel/intltool/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna <vmiklos@frugalware.org> pkgname=intltool -pkgver=0.40.4 +pkgver=0.40.5 pkgrel=1 pkgdesc="Contains scripts and autoconf magic for internationalizing various kinds of data files." url="http://www.gnome.org/" @@ -11,4 +11,4 @@ groups=('devel') archs=('i686' 'x86_64' 'ppc') _F_gnome_devel=y Finclude gnome -sha1sums=('5121f74e3ffa5d167fd0ace3270afed98bb24c25') +sha1sums=('72a67f18dbc12e1af11bfff80100993107b4df84') From vmiklos at frugalware.org Thu Oct 9 15:29:00 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Oct 9 15:29:02 2008 Subject: [Frugalware-git] frugalware-current: fakeroot-1.10.1-1-i686 Message-ID: <20081009132900.E01CF1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ca69a88af5906784e64bc92fb1482582dd638407 commit ca69a88af5906784e64bc92fb1482582dd638407 Author: Miklos Vajna <vmiklos@frugalware.org> Date: Thu Oct 9 15:28:35 2008 +0200 fakeroot-1.10.1-1-i686 -version bump diff --git a/source/devel/fakeroot/FrugalBuild b/source/devel/fakeroot/FrugalBuild index 5cd2cf1..f19de17 100644 --- a/source/devel/fakeroot/FrugalBuild +++ b/source/devel/fakeroot/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: Miklos Vajna <vmiklos@frugalware.org> pkgname=fakeroot -pkgver=1.10 +pkgver=1.10.1 pkgrel=1 pkgdesc="Gives a fake root environment" url="http://packages.debian.org/unstable/utils/fakeroot" @@ -13,7 +13,7 @@ groups=('devel' 'devel-core') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://ftp.debian.org/debian/pool/main/f/fakeroot/?M=A|grep gz$|sed -n 's/.*_\(.*\)\.t.*/\1/;$ p'" source=(http://ftp.debian.org/debian/pool/main/f/fakeroot/${pkgname}_$pkgver.tar.gz) -sha1sums=('8376a43022eec1003ae1d645abde23c3872d85d3') +sha1sums=('a37cb027bd0fc026a47682a4de52fbf796ebcec6') build() { From devil505linux at gmail.com Thu Oct 9 16:06:27 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Oct 9 16:06:28 2008 Subject: [Frugalware-git] frugalware-current: christine-0.1.6-1-i686 Message-ID: <20081009140627.7B5DE1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bec964c1bbc8c05ac029713d74ffa96af9c9d78d commit bec964c1bbc8c05ac029713d74ffa96af9c9d78d Author: Devil505 <devil505linux@gmail.com> Date: Thu Oct 9 15:58:24 2008 +0200 christine-0.1.6-1-i686 * new package diff --git a/source/gnome-extra/christine/FrugalBuild b/source/gnome-extra/christine/FrugalBuild new file mode 100644 index 0000000..3eaead2 --- /dev/null +++ b/source/gnome-extra/christine/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling Time: 0.01 SBU +# Maintainer: Devil505 <devil505linux@gmail.com> + +pkgname=christine +pkgver=0.1.6 +pkgrel=1 +pkgdesc="This is Christine a new Python, GTK+, GStreamer bassed media player. Is intended to be beautiful, usefull and fat free." +_F_sourceforge_ext="-1.tar.bz2" +Finclude sourceforge +depends=('gtk+2' 'python' 'gstreamer' 'gst-python' 'mutagen' 'libnotify' 'glibc' 'gnome-python') +makedepends=('gconf' 'perl-xml-parser') +options=('scriptlet') +groups=('gnome-extra') +archs=('i686' 'x86-64') +sha1sums=('734b76ef2334b071392f3ef04899bac301157012') + +# optimization OK + From vmiklos at frugalware.org Thu Oct 9 16:19:45 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Oct 9 16:19:46 2008 Subject: [Frugalware-git] bouleetbilgnome224: vte-0.17.4-1-x86_64 Message-ID: <20081009141945.1141B1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=d814961583c22dfb2a92e92469bb79b13425da4e commit d814961583c22dfb2a92e92469bb79b13425da4e Author: Miklos Vajna <vmiklos@frugalware.org> Date: Thu Oct 9 16:18:47 2008 +0200 vte-0.17.4-1-x86_64 - makedepends() fix diff --git a/source/gnome/vte/FrugalBuild b/source/gnome/vte/FrugalBuild index 4218e44..49b5bb8 100644 --- a/source/gnome/vte/FrugalBuild +++ b/source/gnome/vte/FrugalBuild @@ -8,9 +8,9 @@ pkgdesc="Virtual Terminal Emulator" url="http://www.gnome.org/" depends=('gtk+2>=2.14.3') if [ "$CARCH" != "ppc" ]; then - makedepends=('pygtk>=2.12.0' 'gtk-doc>=1.9' 'perl-xml-parser') + makedepends=('pygtk>=2.12.0' 'gtk-doc>=1.9' 'perl-xml-parser' 'intltool') else - makedepends=('gtk-doc>=1.9' 'perl-xml-parser') + makedepends=('gtk-doc>=1.9' 'perl-xml-parser' 'intltool') fi groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') From devil505linux at gmail.com Thu Oct 9 18:57:19 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Oct 9 18:57:21 2008 Subject: [Frugalware-git] frugalware-current: freenukum-0.2.10-1-x86_64 Message-ID: <20081009165719.1AD521190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9274e495a8c659805876bcedff1ab6488128e723 commit 9274e495a8c659805876bcedff1ab6488128e723 Author: Devil505 <devil505linux@gmail.com> Date: Thu Oct 9 18:55:51 2008 +0200 freenukum-0.2.10-1-x86_64 * added x86_64 to archs diff --git a/source/games-extra/freenukum/FrugalBuild b/source/games-extra/freenukum/FrugalBuild index ac90b92..38754b0 100644 --- a/source/games-extra/freenukum/FrugalBuild +++ b/source/games-extra/freenukum/FrugalBuild @@ -9,7 +9,7 @@ url="https://launchpad.net/freenukum/" depends=('sdl_ttf') makedepends=('pkgconfig') groups=('games-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="elinks -dump 'https://launchpad.net/$pkgname/+download' | Flasttar" source=(http://launchpad.net/$pkgname/trunk/0.2/+download/$pkgname-$pkgver.tar.gz) sha1sums=('607c6c8820ea73883e6ce90e5e5be5cfe160e58d') From devil505linux at gmail.com Thu Oct 9 19:07:01 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Oct 9 19:07:01 2008 Subject: [Frugalware-git] frugalware-current: fceux-2.0.2-1-x86_64 Message-ID: <20081009170701.1614F1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e5c36c04f52f909d42749b81e6990d1b7772ce4c commit e5c36c04f52f909d42749b81e6990d1b7772ce4c Author: Devil505 <devil505linux@gmail.com> Date: Thu Oct 9 19:02:32 2008 +0200 fceux-2.0.2-1-x86_64 * added x86_64 to archs diff --git a/source/games-extra/fceux/FrugalBuild b/source/games-extra/fceux/FrugalBuild index 31d4c68..7256b69 100644 --- a/source/games-extra/fceux/FrugalBuild +++ b/source/games-extra/fceux/FrugalBuild @@ -12,7 +12,7 @@ Finclude sourceforge depends=('zlib' 'lua' 'libgl' 'sdl' 'libstdc++' 'libxext' 'libxdamage' 'zenity') makedepends=('scons') groups=('games-extra') -archs=('i686') +archs=('i686' 'x86_64') Fconfopts="${Fconfopts[@]} --with-opengl" _F_cd_path="fceu" sha1sums=('f9e1595ba104b13257b04095e54618da2b000f4a') From devil505linux at gmail.com Thu Oct 9 19:12:48 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Oct 9 19:12:49 2008 Subject: [Frugalware-git] frugalware-current: gfceux-2.0.2-1-x86_64 Message-ID: <20081009171248.2ACA91190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=94dbc382b07d41cfa46cfcd3edb3e5957d130eb5 commit 94dbc382b07d41cfa46cfcd3edb3e5957d130eb5 Author: Devil505 <devil505linux@gmail.com> Date: Thu Oct 9 19:10:20 2008 +0200 gfceux-2.0.2-1-x86_64 * added x86_64 to archs diff --git a/source/games-extra/gfceux/FrugalBuild b/source/games-extra/gfceux/FrugalBuild index 1e7d088..e47dfa3 100644 --- a/source/games-extra/gfceux/FrugalBuild +++ b/source/games-extra/gfceux/FrugalBuild @@ -12,7 +12,7 @@ _F_sourceforge_name="fceux" _F_sourceforge_realname="Source Code" Finclude sourceforge url="http://s189529521.onlinehome.us/gfceu" -archs=('i686') +archs=('i686' 'x86_64') groups=('games-extra') depends=('pygtk' 'fceux') options=('scriptlet') From devil505linux at gmail.com Thu Oct 9 19:21:17 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Oct 9 19:21:18 2008 Subject: [Frugalware-git] frugalware-current: tuxmath-1.6.3-1-x86_64 Message-ID: <20081009172117.6C71B1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e20f47cc63b7696eebfe5457737a6594f87802a4 commit e20f47cc63b7696eebfe5457737a6594f87802a4 Author: Devil505 <devil505linux@gmail.com> Date: Thu Oct 9 19:15:30 2008 +0200 tuxmath-1.6.3-1-x86_64 * added x86_64 to archs diff --git a/source/games-extra/tuxmath/FrugalBuild b/source/games-extra/tuxmath/FrugalBuild index ef47002..fd84094 100644 --- a/source/games-extra/tuxmath/FrugalBuild +++ b/source/games-extra/tuxmath/FrugalBuild @@ -11,7 +11,7 @@ pkgdesc="An educational math tutorial game starring Tux, the Linux Penguin" url="http://tux4kids.alioth.debian.org" depends=('sdlimage' 'sdl_ttf' 'sdl_mixer' 'sdl_pango') groups=('games-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://alioth.debian.org/frs/?group_id=31080 | sed 's/_w_fonts//g' | Flasttar" source=(http://alioth.debian.org/frs/download.php/${rel_id}/${pkgname}_w_fonts-${pkgver}.tar.gz) sha1sums=('4b14ed00d655de442fed8a2a5221a4da7f4f468a') From devil505linux at gmail.com Thu Oct 9 19:25:11 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Oct 9 19:25:11 2008 Subject: [Frugalware-git] frugalware-current: vmusic-doom2-1.0-1-x86_64 Message-ID: <20081009172511.4FE501190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d7f7b916cda84fbe6e160774593c1244c37c56d3 commit d7f7b916cda84fbe6e160774593c1244c37c56d3 Author: Devil505 <devil505linux@gmail.com> Date: Thu Oct 9 19:24:30 2008 +0200 vmusic-doom2-1.0-1-x86_64 * added x86_64 to archs diff --git a/source/games-extra/vmusic-doom2/FrugalBuild b/source/games-extra/vmusic-doom2/FrugalBuild index 915cf28..ea44c05 100644 --- a/source/games-extra/vmusic-doom2/FrugalBuild +++ b/source/games-extra/vmusic-doom2/FrugalBuild @@ -12,7 +12,7 @@ _F_sourceforge_ext=".zip" Finclude sourceforge rodepends=('vavoom') groups=(games-extra) -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('ad67eeb0c32cb28946b80df24aa8c88c4e169edf') build() { From devil505linux at gmail.com Thu Oct 9 19:29:37 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Oct 9 19:29:39 2008 Subject: [Frugalware-git] frugalware-current: vmusic-tnt-1.0-1-x86_64 Message-ID: <20081009172937.D68B61190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=69267c399d1103b8c5ad3cf5732895065699d478 commit 69267c399d1103b8c5ad3cf5732895065699d478 Author: Devil505 <devil505linux@gmail.com> Date: Thu Oct 9 19:28:51 2008 +0200 vmusic-tnt-1.0-1-x86_64 * added x86_64 to archs diff --git a/source/games-extra/vmusic-tnt/FrugalBuild b/source/games-extra/vmusic-tnt/FrugalBuild index 80792ad..7073716 100644 --- a/source/games-extra/vmusic-tnt/FrugalBuild +++ b/source/games-extra/vmusic-tnt/FrugalBuild @@ -12,7 +12,7 @@ _F_sourceforge_ext=".zip" Finclude sourceforge rodepends=('vavoom' 'vmusic-doom2') groups=(games-extra) -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('af62a24221686f8205632127393d9fd40e0d5ec2') build() { From devil505linux at gmail.com Thu Oct 9 19:32:37 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Oct 9 19:32:38 2008 Subject: [Frugalware-git] frugalware-current: enigma-1.01-1-x86_64 Message-ID: <20081009173237.7671D1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c61cc9cbbb92c8e52f51faaddfdde7819177909e commit c61cc9cbbb92c8e52f51faaddfdde7819177909e Author: Devil505 <devil505linux@gmail.com> Date: Thu Oct 9 19:32:00 2008 +0200 enigma-1.01-1-x86_64 * added x86_64 to archs diff --git a/source/games-extra/enigma/FrugalBuild b/source/games-extra/enigma/FrugalBuild index 4bfda64..4717fef 100644 --- a/source/games-extra/enigma/FrugalBuild +++ b/source/games-extra/enigma/FrugalBuild @@ -12,7 +12,7 @@ Finclude berlios source=($source Fix_GCC.4.3.diff) depends=('sdl>=1.2' 'sdl_ttf>=2.0.6' 'sdl_mixer>=1.2.4' 'sdlimage>=1.2.0' 'xerces-c>=2.4') groups=('games-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('2f9f5aaf3d233c248d818c3a2fd5ea873d34135f' \ '9c78ad87eb707f6d8846fa31718bf539ff5510e1') build() From devil505linux at gmail.com Thu Oct 9 19:34:17 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Oct 9 19:34:18 2008 Subject: [Frugalware-git] frugalware-current: vmusic-heretic-1.0-1-x86_64 Message-ID: <20081009173417.AD2F31190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9ad4791e5a326842e87faf8c31d31fe7ad8d04fd commit 9ad4791e5a326842e87faf8c31d31fe7ad8d04fd Author: Devil505 <devil505linux@gmail.com> Date: Thu Oct 9 19:33:44 2008 +0200 vmusic-heretic-1.0-1-x86_64 * added x86_64 to archs diff --git a/source/games-extra/vmusic-heretic/FrugalBuild b/source/games-extra/vmusic-heretic/FrugalBuild index f5e1c6a..e6bd1a6 100644 --- a/source/games-extra/vmusic-heretic/FrugalBuild +++ b/source/games-extra/vmusic-heretic/FrugalBuild @@ -12,7 +12,7 @@ _F_sourceforge_ext=".zip" Finclude sourceforge rodepends=('vavoom') groups=(games-extra) -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('2f9f3be58c80f7be848ce995630d2d638d53f262') build() { From devil505linux at gmail.com Thu Oct 9 19:36:13 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Oct 9 19:36:15 2008 Subject: [Frugalware-git] frugalware-current: vmusic-hexen-1.0-1-x86_64 Message-ID: <20081009173613.BFC3C1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=92a78ccd369c9f56b8534be4aadaeb948712620b commit 92a78ccd369c9f56b8534be4aadaeb948712620b Author: Devil505 <devil505linux@gmail.com> Date: Thu Oct 9 19:35:05 2008 +0200 vmusic-hexen-1.0-1-x86_64 * added x86_64 to archs diff --git a/source/games-extra/vmusic-hexen/FrugalBuild b/source/games-extra/vmusic-hexen/FrugalBuild index 46d1860..80987a1 100644 --- a/source/games-extra/vmusic-hexen/FrugalBuild +++ b/source/games-extra/vmusic-hexen/FrugalBuild @@ -12,7 +12,7 @@ _F_sourceforge_ext=".zip" Finclude sourceforge rodepends=('vavoom') groups=(games-extra) -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('923a42712fdeeeff1229991a8624198eafd3430a') build() { From devil505linux at gmail.com Thu Oct 9 19:37:22 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Oct 9 19:37:24 2008 Subject: [Frugalware-git] frugalware-current: vmusic-plutonia-1.0-1-x86_64 Message-ID: <20081009173722.A0C7B1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f8f6f928ab6f61e9a92378b404c9a96d2b265f81 commit f8f6f928ab6f61e9a92378b404c9a96d2b265f81 Author: Devil505 <devil505linux@gmail.com> Date: Thu Oct 9 19:36:46 2008 +0200 vmusic-plutonia-1.0-1-x86_64 * added x86_64 to archs diff --git a/source/games-extra/vmusic-plutonia/FrugalBuild b/source/games-extra/vmusic-plutonia/FrugalBuild index 8362b6b..26cdbca 100644 --- a/source/games-extra/vmusic-plutonia/FrugalBuild +++ b/source/games-extra/vmusic-plutonia/FrugalBuild @@ -12,7 +12,7 @@ _F_sourceforge_ext=".zip" Finclude sourceforge rodepends=('vavoom' 'vmusic-doom2' 'vmusic-doom1') groups=(games-extra) -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('893440fe9a345d5cf6f5c688f92cf919da5717b9') build() { From devil505linux at gmail.com Thu Oct 9 19:41:40 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Oct 9 19:41:41 2008 Subject: [Frugalware-git] frugalware-current: pymsn-0.3.3-1-x86_64 Message-ID: <20081009174141.02ADE1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1e7d4c6ec6fcb567a64fa26a8f2fd3760c3e1ccd commit 1e7d4c6ec6fcb567a64fa26a8f2fd3760c3e1ccd Author: Devil505 <devil505linux@gmail.com> Date: Thu Oct 9 19:40:34 2008 +0200 pymsn-0.3.3-1-x86_64 * added x86_64 to archs diff --git a/source/devel-extra/pymsn/FrugalBuild b/source/devel-extra/pymsn/FrugalBuild index f846e61..31124ec 100644 --- a/source/devel-extra/pymsn/FrugalBuild +++ b/source/devel-extra/pymsn/FrugalBuild @@ -11,5 +11,5 @@ source=("http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar depends=('pygobject' 'adns-python' 'pycrypto' 'pyopenssl' 'celementtree' 'pygobject' \ 'ctypeslib') groups=('devel-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('b652fe20ee9aa3a5c5e8fef262fb9e4b31b8fa72') From devil505linux at gmail.com Thu Oct 9 19:44:52 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Oct 9 19:44:54 2008 Subject: [Frugalware-git] frugalware-current: telepathy-python-0.15.1-1-x86_64 Message-ID: <20081009174452.884311190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dc8831a1139bcb906717d714e60ae62a91cc95ad commit dc8831a1139bcb906717d714e60ae62a91cc95ad Author: Devil505 <devil505linux@gmail.com> Date: Thu Oct 9 19:43:25 2008 +0200 telepathy-python-0.15.1-1-x86_64 * added x86_64 to archs diff --git a/source/devel-extra/telepathy-python/FrugalBuild b/source/devel-extra/telepathy-python/FrugalBuild index 7a3da91..d310a74 100644 --- a/source/devel-extra/telepathy-python/FrugalBuild +++ b/source/devel-extra/telepathy-python/FrugalBuild @@ -10,5 +10,5 @@ up2date="lynx -dump $url | Flasttar" source=("http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") depends=('dbus-python' 'libtelepathy') groups=('devel-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('d866ce727954b952fa00130564225975ce176998') From devil505linux at gmail.com Thu Oct 9 19:51:00 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Oct 9 19:51:02 2008 Subject: [Frugalware-git] frugalware-current: telepathy-mission-control-4.67-1-x86_64 Message-ID: <20081009175100.875191190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=32a556867f4759c497ba5015e6873618e4a88339 commit 32a556867f4759c497ba5015e6873618e4a88339 Author: Devil505 <devil505linux@gmail.com> Date: Thu Oct 9 19:47:23 2008 +0200 telepathy-mission-control-4.67-1-x86_64 * added x86_64 to archs diff --git a/source/gnome-extra/telepathy-mission-control/FrugalBuild b/source/gnome-extra/telepathy-mission-control/FrugalBuild index 13bbe13..e161109 100644 --- a/source/gnome-extra/telepathy-mission-control/FrugalBuild +++ b/source/gnome-extra/telepathy-mission-control/FrugalBuild @@ -7,7 +7,7 @@ pkgrel=1 pkgdesc="Mission Control, or MC, is a telepathy (chat and voip framework) component" depends=('glibc' 'gconf' 'telepathy-glib' 'libtelepathy') groups=('gnome-extra') -archs=('i686') +archs=('i686' 'x86_64') _F_sourceforge_name="telepathy-mission-control" _F_sourceforge_dirname="mission-control" _F_sourceforge_realname="mission-control" From devil505linux at gmail.com Thu Oct 9 20:22:26 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Oct 9 20:22:27 2008 Subject: [Frugalware-git] frugalware-current: trove-2.0.4-1-x86_64 Message-ID: <20081009182226.2EF2B1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6e286693b12d6f33f3d4283329688b4784207068 commit 6e286693b12d6f33f3d4283329688b4784207068 Author: Devil505 <devil505linux@gmail.com> Date: Thu Oct 9 20:12:54 2008 +0200 trove-2.0.4-1-x86_64 * added x86_64 diff --git a/source/devel-extra/trove/FrugalBuild b/source/devel-extra/trove/FrugalBuild index d495f0a..ab38506 100644 --- a/source/devel-extra/trove/FrugalBuild +++ b/source/devel-extra/trove/FrugalBuild @@ -9,7 +9,7 @@ _F_sourceforge_dirname="trove4j" Finclude java sourceforge source=($source FixBuild.diff) groups=('devel-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('f0952cb1eb14b77b3ea91708897aaef2798e1773' \ '0084f94c5075b511afb529f4ce627078fd2ca52f') From devil505linux at gmail.com Thu Oct 9 20:30:33 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Oct 9 20:30:34 2008 Subject: [Frugalware-git] frugalware-current: telepathy-butterfly-0.3.2-1-x86_64 Message-ID: <20081009183033.9B0021190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=affb27c161d74f56f1cef9ad6dc36d867cba02ea commit affb27c161d74f56f1cef9ad6dc36d867cba02ea Author: Devil505 <devil505linux@gmail.com> Date: Thu Oct 9 20:29:37 2008 +0200 telepathy-butterfly-0.3.2-1-x86_64 * added x86_64 to archs diff --git a/source/lib-extra/telepathy-butterfly/FrugalBuild b/source/lib-extra/telepathy-butterfly/FrugalBuild index 14c3692..9ed87ba 100644 --- a/source/lib-extra/telepathy-butterfly/FrugalBuild +++ b/source/lib-extra/telepathy-butterfly/FrugalBuild @@ -10,7 +10,7 @@ up2date="lynx -dump $url | Flasttar" source=("http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") depends=('telepathy-python' 'pymsn') groups=('lib-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('e2718a28d06c8b4e307dffd4c33d8d5ff2c190ce') build() { From devil505linux at gmail.com Thu Oct 9 20:33:57 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Oct 9 20:33:59 2008 Subject: [Frugalware-git] frugalware-current: telepathy-idle-0.1.2-1-x86_64 Message-ID: <20081009183357.BF4681190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f4a0b1f18a2ff434060735b341da4b9632bebd0e commit f4a0b1f18a2ff434060735b341da4b9632bebd0e Author: Devil505 <devil505linux@gmail.com> Date: Thu Oct 9 20:32:07 2008 +0200 telepathy-idle-0.1.2-1-x86_64 * added x86_64 to archs diff --git a/source/lib-extra/telepathy-idle/FrugalBuild b/source/lib-extra/telepathy-idle/FrugalBuild index fbb5096..e03dce5 100644 --- a/source/lib-extra/telepathy-idle/FrugalBuild +++ b/source/lib-extra/telepathy-idle/FrugalBuild @@ -10,7 +10,7 @@ up2date="lynx -dump $url | Flasttar" source=("http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") depends=('dbus-glib' 'openssl' 'telepathy-glib' 'libxslt') groups=('lib-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('c8ffa208b18db1a7b7f88237bbc5167c6a585f03') # optimization OK From bouleetbil at frogdev.info Thu Oct 9 20:48:22 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Oct 9 20:48:23 2008 Subject: [Frugalware-git] frugalware-current: lucene-2.4.0-1-i686 Message-ID: <20081009184822.938231190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=81048a5ba22418a98500ffafd36d01d54dc668ba commit 81048a5ba22418a98500ffafd36d01d54dc668ba Author: bouleetbil <bouleetbil@frogdev.info> Date: Thu Oct 9 20:44:33 2008 +0200 lucene-2.4.0-1-i686 *version bump diff --git a/source/devel-extra/lucene/Fix_Build.diff b/source/devel-extra/lucene/Fix_Build.diff new file mode 100644 index 0000000..172db76 --- /dev/null +++ b/source/devel-extra/lucene/Fix_Build.diff @@ -0,0 +1,12 @@ +--- lucene-2.4.0old/common-build.xml 2008-10-05 18:39:20.000000000 +0200 ++++ lucene-2.4.0/common-build.xml 2008-10-09 20:14:21.000000000 +0200 +@@ -480,8 +480,7 @@ + source="${javac.source}" + target="${javac.target}"> + <nested/> +- <compilerarg line="-Xmaxwarns 10000000"/> +- <compilerarg line="-Xmaxerrs 10000000"/> ++ + </javac> + </sequential> + </macrodef> diff --git a/source/devel-extra/lucene/FrugalBuild b/source/devel-extra/lucene/FrugalBuild index 5a858af..aac3658 100644 --- a/source/devel-extra/lucene/FrugalBuild +++ b/source/devel-extra/lucene/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil <bouleetbil@frogdev.info> pkgname=lucene -pkgver=2.3.2 +pkgver=2.4.0 pkgrel=1 pkgdesc="High-performance, full-featured text search engine written entirely in Java" url="http://jakarta.apache.org/$pkgname/" @@ -10,13 +10,15 @@ Finclude java groups=('devel-extra') archs=('i686') up2date="Flastarchive http://www.apache.org/dist/$pkgname/java/ -src.tar.gz" -source=(http://www.apache.org/dist/$pkgname/java/$pkgname-$pkgver-src.tar.gz) -sha1sums=('0088a7c521c1bcc4b218d52da72eabc43d2279c9') +source=(http://www.apache.org/dist/$pkgname/java/$pkgname-$pkgver-src.tar.gz Fix_Build.diff) +sha1sums=('7e7e59db8a006521459cde70376784bc95dac2f2' \ + '64f2bd8d7596232f8d28d6b547b47db2dcc5c37d') build() { Fcd + Fpatchall Fjavacleanup Fant - mv build/${pkgname}-core-2.3.jar ${pkgname}-core.jar || Fdie + mv build/${pkgname}-core-2.4.jar ${pkgname}-core.jar || Fdie Fjar ${pkgname}-core.jar } From devil505linux at gmail.com Thu Oct 9 20:50:13 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Oct 9 20:50:14 2008 Subject: [Frugalware-git] frugalware-current: solfege-3.10.4-1-x86_64 Message-ID: <20081009185013.AC5A91190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2ff43eef0b55adbbcb61ca4aa5e583ef2cc7fee8 commit 2ff43eef0b55adbbcb61ca4aa5e583ef2cc7fee8 Author: Devil505 <devil505linux@gmail.com> Date: Thu Oct 9 20:45:53 2008 +0200 solfege-3.10.4-1-x86_64 * added x86_64 diff --git a/source/xapps-extra/solfege/FrugalBuild b/source/xapps-extra/solfege/FrugalBuild index 778829f..d7adb14 100644 --- a/source/xapps-extra/solfege/FrugalBuild +++ b/source/xapps-extra/solfege/FrugalBuild @@ -7,7 +7,7 @@ pkgrel=1 pkgdesc="GNU Solfege is a computer program written to help you practice ear training" depends=('pygtk' 'timidity++' 'lame' 'python-mpd' 'libtimidity') groups=('xapps-extra') -archs=('i686') +archs=('i686' 'x86_64') _F_gnome_desktop="y" _F_sourceforge_realname="$pkgname stable" Finclude sourceforge gnome-scriptlet From devil505linux at gmail.com Thu Oct 9 20:55:30 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Oct 9 20:55:32 2008 Subject: [Frugalware-git] frugalware-current: valkyrie-1.3.0-1-x86_64 Message-ID: <20081009185530.B1CFA1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a462df1fa0b7dcc884336ed2363cb241d68a30ef commit a462df1fa0b7dcc884336ed2363cb241d68a30ef Author: Devil505 <devil505linux@gmail.com> Date: Thu Oct 9 20:53:14 2008 +0200 valkyrie-1.3.0-1-x86_64 * added x86_64 diff --git a/source/xapps-extra/valkyrie/FrugalBuild b/source/xapps-extra/valkyrie/FrugalBuild index 0f8fb3a..f792b95 100644 --- a/source/xapps-extra/valkyrie/FrugalBuild +++ b/source/xapps-extra/valkyrie/FrugalBuild @@ -10,7 +10,7 @@ url="http://www.open-works.net/projects/valkyrie.html" depends=('qt' 'libsm' 'libxmu' 'libxi' 'freetype2' 'libstdc++') rodepends=('valgrind>=3.3.0') groups=('xapps-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://valgrind.org/downloads/current.html | Flasttarbz2" source=(http://valgrind.org/downloads/$pkgname-$pkgver.tar.bz2) _F_desktop_icon="valkyrie.xpm" From devil505linux at gmail.com Thu Oct 9 21:02:37 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Oct 9 21:02:38 2008 Subject: [Frugalware-git] frugalware-current: rubrica-2.0.1-1-x86_64 Message-ID: <20081009190237.772971190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ef536139c04c02305f12f2644f20f2e81b69eaab commit ef536139c04c02305f12f2644f20f2e81b69eaab Author: Devil505 <devil505linux@gmail.com> Date: Thu Oct 9 21:02:17 2008 +0200 rubrica-2.0.1-1-x86_64 * added x86_64 to archs diff --git a/source/gnome-extra/rubrica/FrugalBuild b/source/gnome-extra/rubrica/FrugalBuild index fd29f47..55337b6 100644 --- a/source/gnome-extra/rubrica/FrugalBuild +++ b/source/gnome-extra/rubrica/FrugalBuild @@ -8,7 +8,7 @@ pkgver=2.0.1 pkgrel=1 pkgdesc="rubrica is an address book written using GTK+ and GNOME" groups=('gnome-extra') -archs=('i686') +archs=('i686' 'x86_64') depends=('libglade' 'gconf' 'glibc' 'libnotify' \ 'atk' 'pango' 'freetype2' 'libxau' 'libxdmcp' \ 'libxdamage' 'libxinerama' 'libxi' 'libxrandr' \ From devil505linux at gmail.com Thu Oct 9 21:06:00 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Oct 9 21:06:01 2008 Subject: [Frugalware-git] frugalware-current: gdata.py-1.2.1-1-x86_64 Message-ID: <20081009190600.D62931190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=06bb8059ba39b8473e4ad4325447caf9034821f2 commit 06bb8059ba39b8473e4ad4325447caf9034821f2 Author: Devil505 <devil505linux@gmail.com> Date: Thu Oct 9 21:05:11 2008 +0200 gdata.py-1.2.1-1-x86_64 * added x86_64 to archs diff --git a/source/devel-extra/gdata.py/FrugalBuild b/source/devel-extra/gdata.py/FrugalBuild index 5058057..604013f 100644 --- a/source/devel-extra/gdata.py/FrugalBuild +++ b/source/devel-extra/gdata.py/FrugalBuild @@ -9,6 +9,6 @@ _F_googlecode_dirname="gdata-python-client" Finclude googlecode depends=('elementtree') groups=('devel-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="$up2date |sed 's/.tar.gz.*//'" sha1sums=('5360ca69ae2a6d9524ffe1e5df1aa2e0a5377aa2') From bouleetbil at frogdev.info Thu Oct 9 21:16:29 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Oct 9 21:16:29 2008 Subject: [Frugalware-git] frugalware-current: wammu-0.29-1-i686 Message-ID: <20081009191629.6CE041190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=aac8f80d93431436a385e0e9fef12383e260bee5 commit aac8f80d93431436a385e0e9fef12383e260bee5 Author: bouleetbil <bouleetbil@frogdev.info> Date: Thu Oct 9 21:13:28 2008 +0200 wammu-0.29-1-i686 *version bump diff --git a/source/xapps-extra/wammu/FrugalBuild b/source/xapps-extra/wammu/FrugalBuild index 7c99dbb..94001d1 100644 --- a/source/xapps-extra/wammu/FrugalBuild +++ b/source/xapps-extra/wammu/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: bouleetbil <bouleetbil@frogdev.info> pkgname=wammu -pkgver=0.28 -pkgrel=2 +pkgver=0.29 +pkgrel=1 pkgdesc="Wammu is mobile phone manager" url="http://wammu.eu/" depends=('wxpython-u8' 'python-gammu' 'pybluez') @@ -12,7 +12,7 @@ archs=('i686' 'x86_64') source=("http://dl.cihar.com/wammu/latest/$pkgname-$pkgver.tar.bz2") up2date="lynx -dump http://wammu.eu/download/ | Flasttarbz2" options=('scriptlet') -sha1sums=('17072c2fd6d0acd7ab0fcad4f446b1edeb33af61') +sha1sums=('3e0f0a6cda0de9f6793675fd1817226e45e8584c') build(){ export SKIPWXCHECK=yes From devil505linux at gmail.com Thu Oct 9 22:07:41 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Oct 9 22:07:43 2008 Subject: [Frugalware-git] frugalware-current: firefox-emul-3.0.3_2-1-x86_64 Message-ID: <20081009200741.895631190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0f2f659c0cea649b6bf89203cf610647a6758788 commit 0f2f659c0cea649b6bf89203cf610647a6758788 Author: Devil505 <devil505linux@gmail.com> Date: Thu Oct 9 22:03:59 2008 +0200 firefox-emul-3.0.3_2-1-x86_64 version bump diff --git a/source/emul-extra/firefox-emul/FrugalBuild b/source/emul-extra/firefox-emul/FrugalBuild index 46099f0..ed98fd7 100644 --- a/source/emul-extra/firefox-emul/FrugalBuild +++ b/source/emul-extra/firefox-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=firefox-emul -pkgver=3.0.3_1 +pkgver=3.0.3_2 pkgrel=1 pkgdesc="Mozilla Firefox web browser (32bit emul)" url="http://www.mozilla.org/products/firefox/" @@ -11,4 +11,4 @@ depends=('gtk+2-emul' 'libidl-emul' 'nss-emul' 'libxml2-emul' 'libstdc++-emul' ' groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('ce196d75d99524919dd39d5d396ae2954eb77702') +sha1sums=('1e8a9b40bebdb06bcaee54cfeb49e2817b773dec') From devil505linux at gmail.com Thu Oct 9 22:26:10 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Oct 9 22:26:11 2008 Subject: [Frugalware-git] frugalware-current: glibc-emul-2.8_7-1-x86_64 Message-ID: <20081009202610.0D2EF1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c5ba3b2282ef0612164332e2ddfa8d2d48f7a86d commit c5ba3b2282ef0612164332e2ddfa8d2d48f7a86d Author: Devil505 <devil505linux@gmail.com> Date: Thu Oct 9 22:18:00 2008 +0200 glibc-emul-2.8_7-1-x86_64 version bump diff --git a/source/emul-extra/glibc-emul/FrugalBuild b/source/emul-extra/glibc-emul/FrugalBuild index 29f1d17..1be0f99 100644 --- a/source/emul-extra/glibc-emul/FrugalBuild +++ b/source/emul-extra/glibc-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=glibc-emul -pkgver=2.8_6 +pkgver=2.8_7 pkgrel=1 pkgdesc="GNU C Library for emulation of i686 on x86_64" url="http://www.gnu.org/software/libc/libc.html" @@ -10,4 +10,4 @@ depends=('glibc') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('1699401b9a2ab8d0526a76d50b01888e4f4f38bb') +sha1sums=('90bf66ab3d281fbf98cad82227e1e63c02cd7940') From voroskoi at frugalware.org Thu Oct 9 23:23:50 2008 From: voroskoi at frugalware.org (voroskoi) Date: Thu Oct 9 23:23:52 2008 Subject: [Frugalware-git] frugalware-current: unrar-3.8.4-1-i686 Message-ID: <20081009212350.ECD171190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f10e39b9019822fe89c07d44f2b5b19b4a3d1b90 commit f10e39b9019822fe89c07d44f2b5b19b4a3d1b90 Author: voroskoi <voroskoi@frugalware.org> Date: Thu Oct 9 23:23:31 2008 +0200 unrar-3.8.4-1-i686 version bump diff --git a/source/apps-extra/unrar/FrugalBuild b/source/apps-extra/unrar/FrugalBuild index 38fed91..8243946 100644 --- a/source/apps-extra/unrar/FrugalBuild +++ b/source/apps-extra/unrar/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi <voroskoi@frugalware.org> pkgname=unrar -pkgver=3.8.3 +pkgver=3.8.4 pkgrel=1 pkgdesc="Uncompress rar files" url="http://www.rarlab.com/" @@ -12,7 +12,7 @@ groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/rar_add.htm |grep unrarsrc |sed 's/.*c-\(.*\).t.*/\1/'" source=(http://www.rarlab.com/rar/unrarsrc-$pkgver.tar.gz) -sha1sums=('3b14c8b1ae43911e18c15a10d53db631d6ed6818') +sha1sums=('42ed2c4ed86756f150252870e8285776f458fdff') build() { Fcd $pkgname From vmiklos at frugalware.org Thu Oct 9 23:31:40 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Oct 9 23:31:40 2008 Subject: [Frugalware-git] pacman-g2: makepkg: remove obsolete --nolastmod Message-ID: <20081009213140.43D351190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=bd671053ca619ed1ce37a2f1bf4bef6f7f220c77 commit bd671053ca619ed1ce37a2f1bf4bef6f7f220c77 Author: Miklos Vajna <vmiklos@frugalware.org> Date: Thu Oct 9 23:32:07 2008 +0200 makepkg: remove obsolete --nolastmod diff --git a/scripts/makepkg b/scripts/makepkg index 58876be..74a838f 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -698,7 +698,6 @@ while [ "$#" -ne "0" ]; do --nodeps) NODEPS=1 ;; --noextract) NOEXTRACT=1 ;; --install) INSTALL=1 ;; - --nolastmod) ;; # we can remove this after Frugalware-0.6 is out --force) FORCE=1 ;; --nostrip) NOSTRIP=1 ;; --nobuild) NOBUILD=1 ;; From vmiklos at frugalware.org Thu Oct 9 23:34:04 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Oct 9 23:34:05 2008 Subject: [Frugalware-git] pacman-g2: makepkg: remove obsolete --logging as well Message-ID: <20081009213404.652A41190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=ba4f5e67db634cab62c5ef373b9d5419cab6df22 commit ba4f5e67db634cab62c5ef373b9d5419cab6df22 Author: Miklos Vajna <vmiklos@frugalware.org> Date: Thu Oct 9 23:34:08 2008 +0200 makepkg: remove obsolete --logging as well i know boobaa will hate me, since he always did a 'makepkg -fuck' and this commit now removes -k ;/ diff --git a/scripts/makepkg b/scripts/makepkg index 74a838f..30e48fc 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -708,7 +708,6 @@ while [ "$#" -ne "0" ]; do --chroot) CHROOT=1 ;; --host) CHROOT=0 ;; --noup2date) NOUP2DATE=1 ;; - --logging) ;; # we can remove this after Frugalware-0.7 is out --gzip) USEGZIP=1 ;; --help) usage @@ -739,9 +738,7 @@ while [ "$#" -ne "0" ]; do ;; i) INSTALL=1 ;; j) export MAKEFLAGS="-j$OPTARG" ;; - k) ;; # see logging l) DOWNLOAD="$OPTARG" ;; - L) ;; # see nolastmod m) USE_COLOR="n" ;; n) NOSTRIP=1 ;; o) NOBUILD=1; CHROOT=0 ;; From voroskoi at frugalware.org Fri Oct 10 00:00:29 2008 From: voroskoi at frugalware.org (voroskoi) Date: Fri Oct 10 00:00:31 2008 Subject: [Frugalware-git] frugalware-current: yasm-0.7.2-1-i686 Message-ID: <20081009220029.784F61190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4b06d375abba2cfd9343996bcf2f28d71032fdce commit 4b06d375abba2cfd9343996bcf2f28d71032fdce Author: voroskoi <voroskoi@frugalware.org> Date: Fri Oct 10 00:00:10 2008 +0200 yasm-0.7.2-1-i686 version bump diff --git a/source/devel-extra/yasm/FrugalBuild b/source/devel-extra/yasm/FrugalBuild index e54ef48..ab9c863 100644 --- a/source/devel-extra/yasm/FrugalBuild +++ b/source/devel-extra/yasm/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi <voroskoi@frugalware.org> pkgname=yasm -pkgver=0.7.1 +pkgver=0.7.2 pkgrel=1 pkgdesc="Yasm is a complete rewrite of the NASM assembler under BSD License with x64 support." url="http://www.tortall.net/projects/yasm/wiki" @@ -11,6 +11,6 @@ groups=('devel-extra') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump ${url}/Download |grep http.*tar.gz |Flasttar" source=(http://www.tortall.net/projects/yasm/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('c8adeb363ef52ee67c6e8e3041b509330aa30c87') +sha1sums=('0ec7bddb07747a70f4e492c9033271207c970057') # optimization OK From j3d1f0x at free.fr Fri Oct 10 01:02:21 2008 From: j3d1f0x at free.fr (gholafox) Date: Fri Oct 10 01:02:22 2008 Subject: [Frugalware-git] frugalware-current: rman-3.2-1-i686 Message-ID: <20081009230221.1EA561190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5824314a450e25c396b41eae2e9fdef526581103 commit 5824314a450e25c396b41eae2e9fdef526581103 Author: gholafox <j3d1f0x@free.fr> Date: Fri Oct 10 01:01:22 2008 +0200 rman-3.2-1-i686 * Change maintainer * Fix up2date * Add optimization.diff diff --git a/source/apps-extra/rman/FrugalBuild b/source/apps-extra/rman/FrugalBuild index dc003ce..cd50de7 100644 --- a/source/apps-extra/rman/FrugalBuild +++ b/source/apps-extra/rman/FrugalBuild @@ -1,23 +1,24 @@ -# Compiling Time: 0.25 SBU -# Maintainer: AlexExtreme <alex@alex-smith.me.uk> +# Compiling Time: 0.01 SBU +# Maintainer: gholafox <j3d1f0x@free.fr> +# Contributorr: AlexExtreme <alex@alex-smith.me.uk> pkgname=rman pkgver=3.2 pkgrel=1 -pkgdesc="PolyGlotMan is a Man page translator" +pkgdesc="Parse formatted man pages and man page source from most flavors of UNIX" depends=('glibc') groups=('apps-extra') archs=('i686' 'x86_64') +_F_sourceforge_realname="polyglotman" _F_sourceforge_dirname="polyglotman" Finclude sourceforge -url="http://polyglotman.sourceforge.net" -up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=4293'|grep -m1 'rman-\(.*\).tar.gz'|sed 's/.*an-\(.*\).t.*/\1/'" -sha1sums=('d3b2889b5feabb78a0422a1f5d3ae9fdf0333b79') - +source=($source optimization.diff) +sha1sums=('d3b2889b5feabb78a0422a1f5d3ae9fdf0333b79' \ + '58b4909ef6a16e993e19ac0c2f481116252e279a') build() { - Fcd - make + Fpatchall + Fmake Fexe $pkgname-$pkgver/rman /usr/bin/rman Ffilerel rman.1 /usr/man/man1/rman.1 } diff --git a/source/apps-extra/rman/optimization.diff b/source/apps-extra/rman/optimization.diff new file mode 100644 index 0000000..69f6224 --- /dev/null +++ b/source/apps-extra/rman/optimization.diff @@ -0,0 +1,24 @@ +--- Makefile 2003-07-26 21:15:00.000000000 +0200 ++++ Makefile1 2008-10-10 00:36:19.000000000 +0200 +@@ -15,10 +15,10 @@ + # this must be a directory that's in your bin PATH. + # MANDIR holds the man page. + +-BINDIR = /opt/local/bin ++BINDIR = /usr/bin + #BINDIR = /usr/local/bin + #BINDIR = //C/bin +-MANDIR = /usr/local/man/man1 ++MANDIR = /usr/man/man1 + # popular alternative + #BINDIR = /opt/local/bin + #MANDIR = /opt/local/man/man1 +@@ -26,7 +26,7 @@ + + ### if you have GNU gcc, use these definitions + CC = gcc +-CFLAGS = -O2 -finline-functions ++CFLAGS ?= -O2 -finline-functions + + ### if you just have a standard UNIX, use these instead of GNU. + ### CC must be an ANSI C compiler From vmiklos at frugalware.org Fri Oct 10 01:52:04 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 10 01:52:05 2008 Subject: [Frugalware-git] bouleetbilgnome224: empathy-2.24.0-1-x86_64 Message-ID: <20081009235204.4E9611190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=213278aad0d77046b6e2dde2662fcdb8e86fc065 commit 213278aad0d77046b6e2dde2662fcdb8e86fc065 Author: Miklos Vajna <vmiklos@frugalware.org> Date: Fri Oct 10 01:51:59 2008 +0200 empathy-2.24.0-1-x86_64 added x86_64 to archs() diff --git a/source/gnome-extra/empathy/FrugalBuild b/source/gnome-extra/empathy/FrugalBuild index be93efb..526bd4b 100644 --- a/source/gnome-extra/empathy/FrugalBuild +++ b/source/gnome-extra/empathy/FrugalBuild @@ -13,7 +13,7 @@ depends=('gconf' 'telepathy-glib' 'libxml2' 'enchant' \ 'aspell' 'iso-codes' 'telepathy-mission-control' 'telepathy-gabble') makedepends=('gnome-common' 'intltool' 'gtk-doc' 'gnome-doc-utils') groups=('gnome-extra') -archs=('i686') +archs=('i686' 'x86_64') options=('scriptlet') _F_gnome_iconcache="y" _F_gnome_desktop="y" From crazy at frugalware.org Fri Oct 10 02:28:09 2008 From: crazy at frugalware.org (crazy) Date: Fri Oct 10 02:28:11 2008 Subject: [Frugalware-git] frugalware-current: vlc-0.9.4-1-x86_64 Message-ID: <20081010002809.333B91190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=93092bbcfce022f506bdeb3f32cce2a982c78a70 commit 93092bbcfce022f506bdeb3f32cce2a982c78a70 Author: crazy <crazy@frugalware.org> Date: Fri Oct 10 02:22:05 2008 +0200 vlc-0.9.4-1-x86_64 * Version bump * all lib*1394 ( dv , ac* , raw* etc ) are disabled * because the new libs voroskoi bumped too changed the API * and so the plugins won't compile anymore diff --git a/source/xmultimedia-extra/vlc/FrugalBuild b/source/xmultimedia-extra/vlc/FrugalBuild index 3ce0452..4bc67a7 100644 --- a/source/xmultimedia-extra/vlc/FrugalBuild +++ b/source/xmultimedia-extra/vlc/FrugalBuild @@ -3,13 +3,13 @@ # Contributor: VMiklos <vmiklos@frugalware.org> pkgname=vlc -pkgver=0.9.2 +pkgver=0.9.4 pkgextraver= pkgrel=1 pkgdesc="The cross-platform media player and streaming server." url="http://www.videolan.org/vlc/" depends=('hal' 'e2fsprogs' 'libxpm' 'libxdmcp' 'libshout' 'avahi' 'libdvbpsi' 'libsmbclient' 'vcdimager' 'libdvdnav' \ - 'libavc1394' 'alsa-lib' 'libgcrypt' 'lua' 'fribidi' 'freetype2' 'libnotify' 'librsvg' 'ffmpeg>=20080427' 'mesa' \ + 'alsa-lib' 'libgcrypt' 'lua' 'fribidi' 'freetype2' 'libnotify' 'librsvg' 'ffmpeg>=20080427' 'mesa' \ 'libxvmc' 'aalib' 'libmad' 'libdca' 'mpeg2dec' 'twolame' 'sdlimage' 'libqtgui' 'taglib' 'libmusicbrainz' 'libid3tag' \ 'sysfsutils' 'libmatroska' 'libmpcdec' 'libmodplug' 'live') makedepends=('seamonkey' 'samba' 'cvs') @@ -18,7 +18,7 @@ groups=('xmultimedia-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/download-sources.html|grep -m1 'Latest VLC'|sed 's/.*(\(.*\)).*/\1/;s/$pkgextraver//'" source=(http://download.videolan.org/pub/videolan/vlc/$pkgver$pkgextraver/$pkgname-$pkgver$pkgextraver.tar.bz2) -sha1sums=('04b1fa46964bee98a4dc5b07f21d2980c1081f59') +sha1sums=('1325b29268bdcecfb5272433d1fde935171aefed') build() { @@ -38,9 +38,8 @@ build() --enable-httpd \ --enable-vlm \ --enable-notify \ - --enable-musicbrainz \ --disable-dc1394 \ - --enable-dv \ + --disable-dv \ --enable-dvdread \ --enable-dvdnav \ --enable-v4l \ From crazy at frugalware.org Fri Oct 10 02:32:14 2008 From: crazy at frugalware.org (crazy) Date: Fri Oct 10 02:32:16 2008 Subject: [Frugalware-git] frugalware-current: tzdata-2008g-1-x86_64 Message-ID: <20081010003214.D885C1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3aa7546de3feb7d2b258bf8230e94ddf56c67215 commit 3aa7546de3feb7d2b258bf8230e94ddf56c67215 Author: crazy <crazy@frugalware.org> Date: Fri Oct 10 02:30:42 2008 +0200 tzdata-2008g-1-x86_64 * Version bump diff --git a/source/base/tzdata/FrugalBuild b/source/base/tzdata/FrugalBuild index 1a9b6ba..047ffc8 100644 --- a/source/base/tzdata/FrugalBuild +++ b/source/base/tzdata/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy <crazy@frugalware.org> pkgname=tzdata -pkgver=2008f +pkgver=2008g pkgrel=1 pkgdesc="Sources for time zone and daylight saving time data" url="http://www.twinsun.com/tz/tz-link.htm" @@ -10,17 +10,17 @@ depends=('glibc>=2.8-3') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump -nolist ftp://elsie.nci.nih.gov/pub/|grep tzdata|sed 's/.*ta\(.*\).t.*/\1/'" -source=(ftp://elsie.nci.nih.gov/pub/tzcode${pkgver//f/e}.tar.gz \ +source=(ftp://elsie.nci.nih.gov/pub/tzcode${pkgver}.tar.gz \ ftp://elsie.nci.nih.gov/pub/${pkgname}${pkgver}.tar.gz \ Makefile.patch) -sha1sums=('bdd1896bacfefd2d1324702b4adc4d03d69e9816' \ - '1cff482054dfbe33a3ccf249223dc5c79b3cfe3e' \ +sha1sums=('37c9f21450078aca172edb0b6aefe76c6968fad7' \ + 'ebf9763c332a11c9c6bd867044023332cf496042' \ 'e8890681333949977ccff0b7a429ad25ed78dbcf') build() { cd "$Fsrcdir" - tar -xf tzcode${pkgver//f/e}.tar.gz || Fdie + tar -xf tzcode${pkgver}.tar.gz || Fdie tar -xf ${pkgname}${pkgver}.tar.gz || Fdie patch -p1 -i ../Makefile.patch || Fdie make || Fdie From crazy at frugalware.org Fri Oct 10 02:43:26 2008 From: crazy at frugalware.org (crazy) Date: Fri Oct 10 02:43:28 2008 Subject: [Frugalware-git] frugalware-current: hal-info-20081001-1-x86_64 Message-ID: <20081010004326.CA1F81190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0b8fc3f95c5ddfa363ca56101dc767d4a48bf97f commit 0b8fc3f95c5ddfa363ca56101dc767d4a48bf97f Author: crazy <crazy@frugalware.org> Date: Fri Oct 10 02:42:17 2008 +0200 hal-info-20081001-1-x86_64 * Version bump diff --git a/source/apps/hal-info/FrugalBuild b/source/apps/hal-info/FrugalBuild index 2ef7955..794407e 100644 --- a/source/apps/hal-info/FrugalBuild +++ b/source/apps/hal-info/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy <crazy@frugalware.org> pkgname=hal-info -pkgver=20080508 +pkgver=20081001 pkgrel=1 pkgdesc="hal-info contains device information for HAL." url="http://www.freedesktop.org/wiki/Software/hal" @@ -11,7 +11,7 @@ groups=('apps') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump 'http://hal.freedesktop.org/releases/?C=M;O=A'|grep 'hal-info-\(.*\).tar.gz'|Flasttar" source=(http://hal.freedesktop.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('a2b3dafb6fca8ec11948039424c79b0dfe7133ad') +sha1sums=('70505ca606d2aeadf0917e6778453362c51d6424') build() { From crazy at frugalware.org Fri Oct 10 02:45:30 2008 From: crazy at frugalware.org (crazy) Date: Fri Oct 10 02:45:31 2008 Subject: [Frugalware-git] frugalware-current: dbus-1.2.4-1-x86_64 Message-ID: <20081010004530.465661190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=17f85e12746d4076333e2d25b14d5310c7c46ec9 commit 17f85e12746d4076333e2d25b14d5310c7c46ec9 Author: crazy <crazy@frugalware.org> Date: Fri Oct 10 02:44:14 2008 +0200 dbus-1.2.4-1-x86_64 * Version bump diff --git a/source/apps/dbus/FrugalBuild b/source/apps/dbus/FrugalBuild index 0b8c6df..c9cd852 100644 --- a/source/apps/dbus/FrugalBuild +++ b/source/apps/dbus/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy <crazy@frugalware.org> pkgname=dbus -pkgver=1.2.3 +pkgver=1.2.4 pkgrel=1 pkgdesc="A message bus system" url="http://freedesktop.org/wiki/Software_2fdbus" @@ -14,7 +14,7 @@ archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://dbus.freedesktop.org/releases/dbus/|Flasttar" source=(http://dbus.freedesktop.org/releases/dbus/$pkgname-$pkgver.tar.gz \ rc.$pkgname dbus-1-launch dbus-1-launch.desktop) -sha1sums=('ceb8d496bc1a9c2dcdbe559515c01ec9c0cdcf81' \ +sha1sums=('913d796b79802b6ee6ca2b0ef59c670f3fd79774' \ 'b5b036bbdd1a3fbe97218ae57bdd565f85160cd9' \ '740af74eb43cadf1277346029577aadd3d10f2b5' \ 'da9efab479aa3a2a8fb365a89ed658646486c39f') From crazy at frugalware.org Fri Oct 10 02:54:42 2008 From: crazy at frugalware.org (crazy) Date: Fri Oct 10 02:54:43 2008 Subject: [Frugalware-git] frugalware-current: aria2-0.16.0-1-x86_64 Message-ID: <20081010005442.2A3661190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fade063426e7034fc89d6da1d5446b4e59e836b2 commit fade063426e7034fc89d6da1d5446b4e59e836b2 Author: crazy <crazy@frugalware.org> Date: Fri Oct 10 02:53:08 2008 +0200 aria2-0.16.0-1-x86_64 * Version bump * added patch to fix the build diff --git a/source/network-extra/aria2/FrugalBuild b/source/network-extra/aria2/FrugalBuild index 53f3e9e..7be39ce 100644 --- a/source/network-extra/aria2/FrugalBuild +++ b/source/network-extra/aria2/FrugalBuild @@ -3,7 +3,7 @@ pkgname=aria2 _F_archive_name="${pkgname}c" -pkgver=0.15.3 +pkgver=0.16.0 pkgrel=1 pkgdesc="aria2 is an utility for downloading files." depends=('openssl' 'libstdc++' 'cppunit' 'c-ares>=1.5.1') @@ -16,7 +16,9 @@ _F_sourceforge_dirname="$pkgname" _F_sourceforge_realname="$pkgname" _F_sourceforge_ext=".tar.bz2" Finclude sourceforge -sha1sums=('4548d9ae2e571d9bc8fc9de0e42f7d028a3dbdac') +source=($source compile-fix.patch) +sha1sums=('c2b2c3154b992cc1f3a8ebf56e48fc11ff3c47e0' \ + '8cabfbe8028b3d32d244ac05a0470edc1295b777') build() { diff --git a/source/network-extra/aria2/compile-fix.patch b/source/network-extra/aria2/compile-fix.patch new file mode 100644 index 0000000..5457690 --- /dev/null +++ b/source/network-extra/aria2/compile-fix.patch @@ -0,0 +1,32 @@ +Index: src/ActivePeerConnectionCommand.h +=================================================================== +--- src/ActivePeerConnectionCommand.h (revision 770) ++++ src/ActivePeerConnectionCommand.h (revision 772) +@@ -55,7 +55,7 @@ + Time checkPoint; + unsigned int _thresholdSpeed; // UNIT: byte/sec + unsigned int _maxUploadSpeedLimit; +- size_t _numNewConnection; // the number of the connection to establish. ++ unsigned int _numNewConnection; // the number of the connection to establish. + public: + ActivePeerConnectionCommand(int cuid, + RequestGroup* requestGroup, +Index: src/ActivePeerConnectionCommand.cc +=================================================================== +--- src/ActivePeerConnectionCommand.cc (revision 770) ++++ src/ActivePeerConnectionCommand.cc (revision 772) +@@ -89,11 +89,11 @@ + (!pieceStorage->downloadFinished() && + (tstat.getDownloadSpeed() < _thresholdSpeed || + btRuntime->lessThanMinPeers()))) { +- size_t numConnection = pieceStorage->downloadFinished() ? ++ unsigned int numConnection = pieceStorage->downloadFinished() ? + std::min(_numNewConnection, + BtRuntime::MAX_PEERS-btRuntime->getConnections()) : + _numNewConnection; +- for(size_t numAdd = numConnection; ++ for(unsigned int numAdd = numConnection; + numAdd > 0 && peerStorage->isPeerAvailable(); --numAdd) { + PeerHandle peer = peerStorage->getUnusedPeer(); + connectToPeer(peer); + From crazy at frugalware.org Fri Oct 10 03:21:14 2008 From: crazy at frugalware.org (crazy) Date: Fri Oct 10 03:21:16 2008 Subject: [Frugalware-git] frugalware-current: glibc-2.8-8-x86_64 Message-ID: <20081010012114.455F01190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=079c7ec9f1799cac485647e8ca5cf4e2a4a983af commit 079c7ec9f1799cac485647e8ca5cf4e2a4a983af Author: crazy <crazy@frugalware.org> Date: Fri Oct 10 03:10:22 2008 +0200 glibc-2.8-8-x86_64 * up to 20081006 snapshot diff --git a/source/base/glibc/FrugalBuild b/source/base/glibc/FrugalBuild index c4aef04..1eebcb4 100644 --- a/source/base/glibc/FrugalBuild +++ b/source/base/glibc/FrugalBuild @@ -4,8 +4,8 @@ pkgname=glibc pkgver=2.8 -pkgrel=7 -glibcsnap="20080929" +pkgrel=8 +glibcsnap="20081006" pkgdesc="GNU C Library" url="http://www.gnu.org/software/libc/libc.html" depends=() @@ -23,7 +23,7 @@ source=(ftp://sources.redhat.com/pub/glibc/snapshots/$pkgname-$pkgver-$glibcsnap nptl-powerpc.diff) ## this up2date is wrong but we get at least notified when an new snapshot is uploaded up2date="lynx -dump ftp://sources.redhat.com/pub/glibc/snapshots|grep $pkgname-$pkgver|Flasttarbz2|sed 's/-/_/'" -sha1sums=('9f2ad5f67bd484d390b33593ce4b613da8c260bd' \ +sha1sums=('84f242aa426657ab639401478dde0b4991dfb27b' \ '8735a5d35ae5f3b3771c1dc75d1221de6cda2d1e') build() From vmiklos at frugalware.org Fri Oct 10 09:11:54 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 10 09:11:56 2008 Subject: [Frugalware-git] bouleetbilgnome224: gnome-screensaver-2.24.0-1-x86_64 Message-ID: <20081010071154.9CB431190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=0e60ea9163ecb42f8d2930740a34f6dfd5ea537d commit 0e60ea9163ecb42f8d2930740a34f6dfd5ea537d Author: Miklos Vajna <vmiklos@frugalware.org> Date: Fri Oct 10 09:11:43 2008 +0200 gnome-screensaver-2.24.0-1-x86_64 - depends() fix diff --git a/source/gnome/gnome-screensaver/FrugalBuild b/source/gnome/gnome-screensaver/FrugalBuild index 951a3b3..9eb2389 100644 --- a/source/gnome/gnome-screensaver/FrugalBuild +++ b/source/gnome/gnome-screensaver/FrugalBuild @@ -7,7 +7,7 @@ pkgrel=1 pkgdesc="GNOME screen saver and locker" url="http://live.gnome.org/GnomeScreensaver" depends=('libgnomeui>=2.24.0' 'dbus-glib>=0.71' 'gnome-menus>=2.24.0' 'gdm>=2.20.5' 'libgnomekbd>=2.24.0' \ - 'libxscrnsaver' 'shadow' 'xscreensaver-data' 'libbonobo' 'gnome-vfs>=2.24.0') + 'libxscrnsaver' 'shadow' 'xscreensaver-data' 'libbonobo' 'gnome-vfs>=2.24.0' 'gnome-desktop>=2.24.0') makedepends=('intltool' 'scrnsaverproto') groups=('gnome' 'gnome-minimal') archs=('x86_64' 'i686' 'ppc') From vmiklos at frugalware.org Fri Oct 10 09:34:55 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 10 09:34:56 2008 Subject: [Frugalware-git] bmf: openoffice.org-3.0ooo300_m9-3-i686 Message-ID: <20081010073455.ACE151190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=8d0a91730a4bac818c3b40b1c78f2cdee9c2bcd7 commit 8d0a91730a4bac818c3b40b1c78f2cdee9c2bcd7 Author: Miklos Vajna <vmiklos@frugalware.org> Date: Fri Oct 10 09:30:18 2008 +0200 openoffice.org-3.0ooo300_m9-3-i686 - add an install scriptlet to make the dicts work again out of the box diff --git a/source/xapps/openoffice.org/FrugalBuild b/source/xapps/openoffice.org/FrugalBuild index 8865f6d..65156ce 100644 --- a/source/xapps/openoffice.org/FrugalBuild +++ b/source/xapps/openoffice.org/FrugalBuild @@ -20,20 +20,20 @@ else dir=`echo $tree|tr [a-z] [A-Z]` milestone=9 pkgver=$upstream${tree}_m$milestone - pkgrel=2 + pkgrel=3 snapshot=r14231 fi pkgdesc="OpenOffice.org, a full office productivity suite." url="http://www.openoffice.org/" _F_gnome_desktop="y" Finclude gnome-scriptlet mono java -unset install +install=openoffice.org.install depends=('libxml2' 'libart_lgpl' 'libsndfile' 'libgcj-awt>=4.1.1-6' 'nas' 'fontconfig' 'libpng' 'imagemagick' \ 'flex' 'neon>=0.26.1' 'bison' 'zip' 'unzip' 'expat' 'cups' 'desktop-file-utils' 'perl-archive-zip' \ 'unixodbc' 'libxaw' 'libxslt' 'startup-notification' 'libwpd>=0.8.13' 'poppler') # this is here as gstreamer is only a makedepend rodepends=('flac' 'dejavu-ttf') -makedepends=('curl' 'intltool' 'tcsh' 'pam-headers' 'apache-ant' 'gcc-gcj' 'kdelibs>=3.5.5' \ +makedepends=(${makedepends[@]} 'curl' 'intltool' 'tcsh' 'pam-headers' 'apache-ant' 'kdelibs>=3.5.5' \ 'evolution-data-server-ldap' 'boost' 'icu' 'hunspell' 'imake' 'gccmakedep' 'xalan-j' \ 'patch>=2.5.9' 'openclipart' 'xorg-server' 'gstreamer' 'gst-plugins-base' 'gnome-vfs' \ 'libbonobo' 'procps' 'openldap' 'mono' 'gperf' 'xulrunner' \ @@ -162,14 +162,12 @@ build() { # Permission fixes find $Fdestdir/usr/lib/openoffice.org/program -name "*.so" ! -perm 755 -exec chmod 755 {} \; + Fsed /bin/mktemp mktemp $Fdestdir/usr/lib/openoffice.org/program/unopkg # Enable the mozilla plugin Fmkdir /usr/lib/mozilla/plugins Fln /usr/lib/openoffice.org/program/libnpsoplugin.so /usr/lib/mozilla/plugins/ - # Remove some dicts, our separate package is more recent - Frm usr/lib/openoffice.org/basis3.0/share/dict/ooo/*hu_HU* - # Split out the i18n stuff for i in "${ooosubpkgs[@]}" do diff --git a/source/xapps/openoffice.org/openoffice.org.install b/source/xapps/openoffice.org/openoffice.org.install new file mode 100644 index 0000000..7e3da69 --- /dev/null +++ b/source/xapps/openoffice.org/openoffice.org.install @@ -0,0 +1,29 @@ +post_install() +{ + for i in /usr/lib/openoffice.org/share/extension/install/*.oxt + do + unopkg add --shared $i 2>/dev/null + done +} + +pre_upgrade() +{ + pre_remove +} + +post_upgrade() +{ + post_install +} + +pre_remove() +{ + for i in $(unopkg list --shared|grep ^Identifier|sed 's/Identifier: //') + do + unopkg remove --shared $i + done +} + +op=$1 +shift +$op $* From vmiklos at frugalware.org Fri Oct 10 09:34:57 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 10 09:34:59 2008 Subject: [Frugalware-git] frugalware-current: libdvdcss-1.2.9-2-ppc Message-ID: <20081010073457.D81B611901AD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8eebeaebcfa32ac48815aa9e738cdc5cfe3b2778 commit 8eebeaebcfa32ac48815aa9e738cdc5cfe3b2778 Author: Miklos Vajna <vmiklos@frugalware.org> Date: Fri Oct 10 09:34:23 2008 +0200 libdvdcss-1.2.9-2-ppc added ppc to archs() diff --git a/source/lib/libdvdcss/FrugalBuild b/source/lib/libdvdcss/FrugalBuild index 59068c7..480c273 100644 --- a/source/lib/libdvdcss/FrugalBuild +++ b/source/lib/libdvdcss/FrugalBuild @@ -9,7 +9,7 @@ pkgdesc="libdvdcss is a cross-platform library for transparent DVD device access url="http://www.videolan.org/libdvdcss/" license=('GPL2') groups=('lib') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') depends=('glibc') up2date="lynx -dump http://download.videolan.org/pub/libdvdcss/|grep libdvdcss|sort -n -r|head -n1|sed 's/.*ss//;s/\///g'" source=(http://freshmeat.net/redir/libdvdcss/16066/url_tgz/$pkgname-$pkgver.tar.gz) From vmiklos at frugalware.org Fri Oct 10 09:46:16 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 10 09:46:17 2008 Subject: [Frugalware-git] frugalware-current: libdvdread-0.9.7-2-ppc Message-ID: <20081010074616.4DD2F1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0ea92f3a4a6e72e419f8a08c858a11e7f5020e23 commit 0ea92f3a4a6e72e419f8a08c858a11e7f5020e23 Author: Miklos Vajna <vmiklos@frugalware.org> Date: Fri Oct 10 09:46:03 2008 +0200 libdvdread-0.9.7-2-ppc added ppc to archs() diff --git a/source/lib/libdvdread/FrugalBuild b/source/lib/libdvdread/FrugalBuild index 4e90729..9e33e47 100644 --- a/source/lib/libdvdread/FrugalBuild +++ b/source/lib/libdvdread/FrugalBuild @@ -8,7 +8,7 @@ pkgrel=2 pkgdesc="libdvdread provides a simple foundation for reading DVD video disks" url="http://www.dtek.chalmers.se/groups/dvd/downloads.shtml" groups=('lib') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') depends=('libdvdcss') up2date="lynx -dump 'http://www.dtek.chalmers.se/groups/dvd/dist/?C=M;O=D'|grep dist/libdvdread-[0-9\.]*.tar.gz|sed -ne 's/.*d-\(.*\)\.t.*/\1/;1 p'" source=(http://www.dtek.chalmers.se/groups/dvd/dist/$pkgname-$pkgver.tar.gz \ From vmiklos at frugalware.org Fri Oct 10 09:52:24 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 10 09:52:26 2008 Subject: [Frugalware-git] frugalware-current: darcs-2.1.0-1-i686 Message-ID: <20081010075224.C90711190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f709783c81200d73fec9eb03d7de03c193e9f8a8 commit f709783c81200d73fec9eb03d7de03c193e9f8a8 Author: Miklos Vajna <vmiklos@frugalware.org> Date: Fri Oct 10 09:52:07 2008 +0200 darcs-2.1.0-1-i686 - version bump diff --git a/source/devel-extra/darcs/FrugalBuild b/source/devel-extra/darcs/FrugalBuild index 379441c..9b8fa30 100644 --- a/source/devel-extra/darcs/FrugalBuild +++ b/source/devel-extra/darcs/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Miklos Vajna <vmiklos@frugalware.org> pkgname=darcs -pkgver=2.0.2 -pkgrel=2 +pkgver=2.1.0 +pkgrel=1 pkgdesc="David's Advanced Revision Control System" url="http://darcs.net" depends=('gmp' 'curl>=7.19.0' 'readline') @@ -13,7 +13,7 @@ makedepends=('ghc>=6.6.1-2' 'latex2html' 'git') up2date="lynx -dump $url|grep Stable|sed 's/.*(\(.*\)).*/\1/'" source=(http://darcs.net/$pkgname-$pkgver.tar.gz \ README.Frugalware) -sha1sums=('75a186b906ac8bbc1144c5124c215e4c57c06222' \ +sha1sums=('738a063e67b90f5f831b7164969f285692250cee' \ '6f6443a7530355f0f5cc0524f87a7ca46c6992ca') options=('scriptlet') @@ -23,6 +23,7 @@ build() # gcc 3.3 doesn't support -march=k8 export CFLAGS="-O2 -pipe" fi + export CFLAGS="${CFLAGS/-mtune=generic}" Fconf --enable-git --with-git-core=/usr/lib \ --with-git-includes=-I/usr/include/git make all || Fdie From vmiklos at frugalware.org Fri Oct 10 09:54:23 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 10 09:54:24 2008 Subject: [Frugalware-git] bouleetbilgnome224: gnome-subtitles-0.8-2-x86_64 Message-ID: <20081010075423.A9C6411901A1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=03ab806ad09c9fa90b10f3f8569f127f1effef2f commit 03ab806ad09c9fa90b10f3f8569f127f1effef2f Author: Miklos Vajna <vmiklos@frugalware.org> Date: Fri Oct 10 09:54:18 2008 +0200 gnome-subtitles-0.8-2-x86_64 added x86_64 to archs() diff --git a/source/gnome-extra/gnome-subtitles/FrugalBuild b/source/gnome-extra/gnome-subtitles/FrugalBuild index 4d230a8..5e01b0c 100644 --- a/source/gnome-extra/gnome-subtitles/FrugalBuild +++ b/source/gnome-extra/gnome-subtitles/FrugalBuild @@ -10,7 +10,7 @@ depends=('mono' 'gnome-sharp' 'gstreamer' 'gst-plugins-base' \ 'gtkspell' 'enchant' 'sublib' 'gnome-desktop-sharp>=2.24.0-1') makedepends=('gnome-doc-utils' 'perl-xml-parser') groups=('gnome-extra') -archs=('i686') +archs=('i686' 'x86_64') options=('scriptlet') _F_gnome_desktop="y" _F_gnome_schemas=('/etc/gconf/schemas/gnome-subtitles.schemas') From vmiklos at frugalware.org Fri Oct 10 09:54:25 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 10 09:54:29 2008 Subject: [Frugalware-git] frugalware-current: tcsh-6.16.00-1-i686 Message-ID: <20081010075425.1DAF911901A1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=671d8c6a23c1589b6f3053c98265e693c1f791e4 commit 671d8c6a23c1589b6f3053c98265e693c1f791e4 Author: Miklos Vajna <vmiklos@frugalware.org> Date: Fri Oct 10 09:54:21 2008 +0200 tcsh-6.16.00-1-i686 - version bump diff --git a/source/base/tcsh/FrugalBuild b/source/base/tcsh/FrugalBuild index 50f53e3..8f0e20a 100644 --- a/source/base/tcsh/FrugalBuild +++ b/source/base/tcsh/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Miklos Vajna <vmiklos@frugalware.org> pkgname=tcsh -pkgver=6.15.00 -pkgrel=3 +pkgver=6.16.00 +pkgrel=1 pkgdesc="Enhanced version of the Berkeley C shell" url="http://www.tcsh.org/Welcome" depends=('ncurses>=5.6-4') @@ -13,7 +13,7 @@ backup=(etc/csh.login) up2date="lynx -dump ftp://ftp.astron.com/pub/tcsh/|Flasttar" source=(ftp://ftp.astron.com/pub/tcsh/tcsh-$pkgver.tar.gz csh.login) install=$pkgname.install -sha1sums=('d24f7bf27e80222a6293b6629c14db547f0b7387' \ +sha1sums=('3d3536bbb9201abdf39b8b364b95e0a218970a5c' \ '13e38077726a497a762cc3a84e3d09f3ab8f7a49') build() From boobaa at frugalware.org Fri Oct 10 10:15:49 2008 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Oct 10 10:15:52 2008 Subject: [Frugalware-git] frugalware-current: drupal6-devel-6.x_1.12-1-i686 Message-ID: <20081010081549.B97B61190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=aac6269a2cd8f6e50b1ab0b0b4b409646818809e commit aac6269a2cd8f6e50b1ab0b0b4b409646818809e Author: CSÉCSY László <boobaa@frugalware.org> Date: Fri Oct 10 10:15:10 2008 +0200 drupal6-devel-6.x_1.12-1-i686 version bump diff --git a/source/network-extra/drupal6-devel/FrugalBuild b/source/network-extra/drupal6-devel/FrugalBuild index 6b7b8b4..f83c2f3 100644 --- a/source/network-extra/drupal6-devel/FrugalBuild +++ b/source/network-extra/drupal6-devel/FrugalBuild @@ -3,8 +3,8 @@ _F_drupal_module=devel _F_drupal_ver=6.x -pkgver=6.x_1.11 +pkgver=6.x_1.12 pkgrel=1 pkgdesc="A suite of modules for both Drupal module and theme developers" Finclude drupal -sha1sums=('9ea2a51b696425d6b8e5d22cdb534922fd2b52ad') +sha1sums=('0eb6260af0605d4131e426c3ae64c4d438bdc29c') From boobaa at frugalware.org Fri Oct 10 10:18:15 2008 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Oct 10 10:18:17 2008 Subject: [Frugalware-git] frugalware-current: drupal6-demo-6.x_1.1-1-i686 Message-ID: <20081010081815.774401190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2afb5b1126375304485317518df162d021db4f36 commit 2afb5b1126375304485317518df162d021db4f36 Author: CSÉCSY László <boobaa@frugalware.org> Date: Fri Oct 10 10:18:00 2008 +0200 drupal6-demo-6.x_1.1-1-i686 new package / initial import diff --git a/source/network-extra/drupal6-demo/FrugalBuild b/source/network-extra/drupal6-demo/FrugalBuild new file mode 100644 index 0000000..97bc91a --- /dev/null +++ b/source/network-extra/drupal6-demo/FrugalBuild @@ -0,0 +1,10 @@ +# Compiling Time: 0 SBU +# Maintainer: CSÉCSY László <boobaa@frugalware.org> + +_F_drupal_module=demo +_F_drupal_ver=6.x +pkgver=6.x_1.1 +pkgrel=1 +pkgdesc="Allows you to take snapshots of your Drupal site" +Finclude drupal +sha1sums=('feb701f8eb0007ae76ee7819a55ac2d02edccd14') From vmiklos at frugalware.org Fri Oct 10 12:22:32 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 10 12:22:34 2008 Subject: [Frugalware-git] bouleetbilgnome224: goobox-2.0.0-1-x86_64 Message-ID: <20081010102232.6BE831190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=0077353007e37361cade3446747de48c29a4886b commit 0077353007e37361cade3446747de48c29a4886b Author: Miklos Vajna <vmiklos@frugalware.org> Date: Fri Oct 10 12:22:08 2008 +0200 goobox-2.0.0-1-x86_64 added x86_64 to archs() diff --git a/source/gnome-extra/goobox/FrugalBuild b/source/gnome-extra/goobox/FrugalBuild index 691af13..2774cba 100644 --- a/source/gnome-extra/goobox/FrugalBuild +++ b/source/gnome-extra/goobox/FrugalBuild @@ -18,7 +18,7 @@ _F_gnome_desktop="y" _F_gnome_schemas=('/etc/gconf/schemas/goobox.schemas') Finclude gnome gnome-scriptlet groups=('gnome-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('560dcf04143ddac00f5bc63e710b5a07a1f64ec3') # optimization OK From janny at frugalware.org Fri Oct 10 12:24:01 2008 From: janny at frugalware.org (Janos Kovacs) Date: Fri Oct 10 12:24:04 2008 Subject: [Frugalware-git] frugalware-current: perl-file-find-closures-1.09-1-i686 Message-ID: <20081010102401.9B6821190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d01a11df32f9b852171ea3663daa7f889b8096c1 commit d01a11df32f9b852171ea3663daa7f889b8096c1 Author: Janos Kovacs <janny@frugalware.org> Date: Fri Oct 10 12:23:23 2008 +0200 perl-file-find-closures-1.09-1-i686 * version bump diff --git a/source/devel-extra/perl-file-find-closures/FrugalBuild b/source/devel-extra/perl-file-find-closures/FrugalBuild index 0232b51..d1999cd 100644 --- a/source/devel-extra/perl-file-find-closures/FrugalBuild +++ b/source/devel-extra/perl-file-find-closures/FrugalBuild @@ -3,8 +3,8 @@ _F_perl_name=File-Find-Closures _F_perl_author=B/BD/BDFOY -pkgver=1.08 +pkgver=1.09 pkgdesc="functions you can use with File::Find" Finclude perl -sha1sums=('5f193b2a5de3f072c1f09aa5fac69e4eaf0bdfd9') +sha1sums=('3d8eee3e068e079ca0a50f3bd7f49ed14942410a') archs=(${archs[@]} 'x86_64') From vmiklos at frugalware.org Fri Oct 10 13:29:42 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 10 13:29:44 2008 Subject: [Frugalware-git] frugalware-current: libsidplay-1.36.59-3-i686 Message-ID: <20081010112942.9D7A11190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8023caa9b77eed2ffa02e383109954194f7a8913 commit 8023caa9b77eed2ffa02e383109954194f7a8913 Author: Miklos Vajna <vmiklos@frugalware.org> Date: Fri Oct 10 13:29:12 2008 +0200 libsidplay-1.36.59-3-i686 - rebuild with gcc-4.3 diff --git a/source/lib/libsidplay/FrugalBuild b/source/lib/libsidplay/FrugalBuild index bb21ea2..daf2009 100644 --- a/source/lib/libsidplay/FrugalBuild +++ b/source/lib/libsidplay/FrugalBuild @@ -3,14 +3,16 @@ pkgname=libsidplay pkgver=1.36.59 -pkgrel=2 +pkgrel=3 pkgdesc="A library for playing SID music files." url="http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/linux.html" depends=('libstdc++') groups=('lib') archs=('i686' 'x86_64') up2date="Flasttar http://critical.ch/distfiles/" -source=(http://critical.ch/distfiles/$pkgname-$pkgver.tgz) -sha1sums=('66056b55dc96b9ae1aab542f0260d1e6db158e51') +source=(http://critical.ch/distfiles/$pkgname-$pkgver.tgz \ + ios-bin.patch) +sha1sums=('66056b55dc96b9ae1aab542f0260d1e6db158e51' \ + '3b28d4182b62b8c9facd17bb72df4faafcd98fc8') # optimization OK diff --git a/source/lib/libsidplay/ios-bin.patch b/source/lib/libsidplay/ios-bin.patch new file mode 100644 index 0000000..5beef46 --- /dev/null +++ b/source/lib/libsidplay/ios-bin.patch @@ -0,0 +1,40 @@ +diff --git a/src/sidtune.cpp b/src/sidtune.cpp +index 4d1d33b..6fbae80 100644 +--- a/src/sidtune.cpp ++++ b/src/sidtune.cpp +@@ -306,11 +306,7 @@ udword sidTune::loadFile(const char* fileName, ubyte** bufferRef) + return 0; + } + // Open binary input file stream at end of file. +-#if defined(SID_HAVE_IOS_BIN) +- ifstream myIn( fileName, ios::in|ios::bin|ios::ate ); +-#else + ifstream myIn( fileName, ios::in|ios::binary|ios::ate ); +-#endif + // As a replacement for !is_open(), bad() and the NOT-operator + // don't seem to work on all systems. + #if defined(SID_DONT_HAVE_IS_OPEN) +@@ -972,11 +968,7 @@ bool sidTune::saveC64dataFile( const char* fileName, bool overWriteFlag ) + } + // Open binary output file stream. + else +-#if defined(SID_HAVE_IOS_BIN) +- fMyOut.open( fileName, ios::out|ios::bin|ios::trunc ); +-#else + fMyOut.open( fileName, ios::out|ios::binary|ios::trunc ); +-#endif + if ( !fMyOut ) + { + info.statusString = text_cantCreateFile; +@@ -1061,11 +1053,7 @@ bool sidTune::savePSIDfile( const char* fileName, bool overWriteFlag ) + } + // Open binary output file stream. + else +-#if defined(SID_HAVE_IOS_BIN) +- fMyOut.open( fileName, ios::out|ios::bin|ios::trunc ); +-#else + fMyOut.open( fileName, ios::out|ios::binary|ios::trunc ); +-#endif + if ( !fMyOut ) + { + info.statusString = text_cantCreateFile; From vmiklos at frugalware.org Fri Oct 10 13:32:45 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 10 13:32:47 2008 Subject: [Frugalware-git] frugalware-current: libsidplay-1.36.59-3-ppc Message-ID: <20081010113245.97B191190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=05793d5e553398a361115aaa6d46691bba2b4865 commit 05793d5e553398a361115aaa6d46691bba2b4865 Author: Miklos Vajna <vmiklos@frugalware.org> Date: Fri Oct 10 13:32:32 2008 +0200 libsidplay-1.36.59-3-ppc added ppc to archs() diff --git a/source/lib/libsidplay/FrugalBuild b/source/lib/libsidplay/FrugalBuild index daf2009..32ad2e4 100644 --- a/source/lib/libsidplay/FrugalBuild +++ b/source/lib/libsidplay/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="A library for playing SID music files." url="http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/linux.html" depends=('libstdc++') groups=('lib') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') up2date="Flasttar http://critical.ch/distfiles/" source=(http://critical.ch/distfiles/$pkgname-$pkgver.tgz \ ios-bin.patch) From vmiklos at frugalware.org Fri Oct 10 14:05:21 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 10 14:05:22 2008 Subject: [Frugalware-git] frugalware-current: gst-plugins-ugly-0.10.8-2-ppc Message-ID: <20081010120521.330451190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=15a17dae511ddabc6705a011e8e99d2604b0dcfa commit 15a17dae511ddabc6705a011e8e99d2604b0dcfa Author: Miklos Vajna <vmiklos@frugalware.org> Date: Fri Oct 10 14:05:02 2008 +0200 gst-plugins-ugly-0.10.8-2-ppc added ppc to archs() diff --git a/source/xmultimedia/gst-plugins-ugly/FrugalBuild b/source/xmultimedia/gst-plugins-ugly/FrugalBuild index c8f0b0f..04d53ac 100644 --- a/source/xmultimedia/gst-plugins-ugly/FrugalBuild +++ b/source/xmultimedia/gst-plugins-ugly/FrugalBuild @@ -10,7 +10,7 @@ url="http://gstreamer.freedesktop.org/" depends=('gst-plugins-base>=0.10.20' 'gstreamer>=0.10.20') makedepends=('gtk-doc' 'pyxml' 'a52dec' 'liboil>=0.3.14' 'lame' 'libmad' 'libdvdread' 'libid3tag' 'mpeg2dec' 'libsidplay') groups=('xmultimedia') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') options=('scriptlet') up2date="lynx -dump $url/src/$pkgname/|grep '.tar.bz2$'|sort -n -r|head -n 1|sed 's/.*-\(.*\).t.*/\1/'" source=($url/src/$pkgname/$pkgname-$pkgver.tar.bz2) @@ -22,7 +22,7 @@ subdescs=('GStreamer a52dec plugin (Ugly).' 'GStreamer lame plugin (Ugly).' 'G subdepends=("a52dec liboil>=0.3.14 $pkgname=$pkgver" "lame $pkgname=$pkgver" "libmad libid3tag $pkgname=$pkgver" \ "libdvdread $pkgname=$pkgver" "mpeg2dec $pkgname=$pkgver" "libsidplay $pkgname=$pkgver" '') subgroups=('xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'docs-extra') -subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64') +subarchs=('i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc') build() { From vmiklos at frugalware.org Fri Oct 10 14:29:33 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 10 14:29:34 2008 Subject: [Frugalware-git] frugalware-current: gst-ffmpeg-0.10.4-2-ppc Message-ID: <20081010122933.C3BAF1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=54d2a3ce3dd57c0551b0493b5e390014d143c70b commit 54d2a3ce3dd57c0551b0493b5e390014d143c70b Author: Miklos Vajna <vmiklos@frugalware.org> Date: Fri Oct 10 14:29:01 2008 +0200 gst-ffmpeg-0.10.4-2-ppc added ppc to archs() diff --git a/source/xmultimedia/gst-ffmpeg/FrugalBuild b/source/xmultimedia/gst-ffmpeg/FrugalBuild index 0c303b3..5282c8f 100644 --- a/source/xmultimedia/gst-ffmpeg/FrugalBuild +++ b/source/xmultimedia/gst-ffmpeg/FrugalBuild @@ -9,7 +9,7 @@ url="http://www.gstreamer.net" depends=('gst-plugins-base>=0.10.20' 'gst-plugins-base-oil>=0.10.20' 'libstdc++') makedepends=('sdl' 'freetype2') groups=('xmultimedia') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://gstreamer.freedesktop.org/src/gst-ffmpeg/|sort -r -n|grep -m1 '.tar.bz2$'|sed 's/.*-\(.*\).tar.bz2/\1/'" source=(http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$pkgver.tar.bz2 configure.patch) sha1sums=('41977e74aed48154df2d831c652eef1bd42caf19' \ From vmiklos at frugalware.org Fri Oct 10 14:50:37 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 10 14:50:39 2008 Subject: [Frugalware-git] frugalware-current: swfdec-0.8.0-1-i686 Message-ID: <20081010125037.A97A11190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9d54983bf18f7a8c6ea84bb9e23229af04a3c75d commit 9d54983bf18f7a8c6ea84bb9e23229af04a3c75d Author: Miklos Vajna <vmiklos@frugalware.org> Date: Fri Oct 10 14:50:01 2008 +0200 swfdec-0.8.0-1-i686 - version bump diff --git a/source/xlib/swfdec/FrugalBuild b/source/xlib/swfdec/FrugalBuild index a82aba3..c5c4b45 100644 --- a/source/xlib/swfdec/FrugalBuild +++ b/source/xlib/swfdec/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Priyank Gosalia <priyankmg@gmail.com> pkgname=swfdec -pkgver=0.6.6 -pkgrel=3 +pkgver=0.8.0 +pkgrel=1 pkgdesc="Swfdec is a decoder/renderer library for Macromedia Flash animations." url="http://swfdec.freedesktop.org/" license="LGPL" @@ -12,10 +12,9 @@ depends=('libmad' 'gtk+2>=2.12.9' 'liboil' 'ffmpeg>=20080427' 'alsa-lib' 'faad2' options=('scriptlet') groups=('xlib') archs=('i686' 'x86_64' 'ppc') -up2date="lynx -dump http://swfdec.freedesktop.org/|grep -om1 'swfdec-\(.*\).tar.gz$'|Flasttar" -source=($url/download/$pkgname/0.6/$pkgname-$pkgver.tar.gz ffmpeg_includes.diff) +up2date="Flasttar http://swfdec.freedesktop.org/" +source=($url/download/$pkgname/0.8/$pkgname-$pkgver.tar.gz) Fconfopts="${Fconfopts[@]} --enable-gnome-vfs=no --enable-libsoup --enable-ffmpeg" -sha1sums=('aae2ef1330321dc75653c9fb393c9d186c8317a0' \ - '4695b901ab57a6f727c45a1418722ccab7ef1a5b') +sha1sums=('7a72b5d32cd276e25f55b3e62e71e80a7c7ed859') # optimization OK diff --git a/source/xlib/swfdec/ffmpeg_includes.diff b/source/xlib/swfdec/ffmpeg_includes.diff deleted file mode 100644 index 3a4bd38..0000000 --- a/source/xlib/swfdec/ffmpeg_includes.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff -aur swfdec-0.6.6/swfdec/swfdec_codec_ffmpeg.c fw_swfdec-0.6.6/swfdec/swfdec_codec_ffmpeg.c ---- swfdec-0.6.6/swfdec/swfdec_codec_ffmpeg.c 2008-04-10 16:20:41.000000000 +0200 -+++ fw_swfdec-0.6.6/swfdec/swfdec_codec_ffmpeg.c 2008-04-29 00:02:51.000000000 +0200 -@@ -21,8 +21,8 @@ - #include "config.h" - #endif - #include <string.h> --#include <avcodec.h> --#include <swscale.h> -+#include <libavcodec/avcodec.h> -+#include <libswscale/swscale.h> - - #include "swfdec_codec_audio.h" - #include "swfdec_codec_video.h" diff --git a/source/xlib/swfdec/git_unsigned_fix-0.4.4.patch b/source/xlib/swfdec/git_unsigned_fix-0.4.4.patch deleted file mode 100644 index 94c1089..0000000 --- a/source/xlib/swfdec/git_unsigned_fix-0.4.4.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/libswfdec/swfdec_bits.c b/libswfdec/swfdec_bits.c -index b74846e..c8a5062 100644 ---- a/libswfdec/swfdec_bits.c -+++ b/libswfdec/swfdec_bits.c -@@ -587,7 +587,7 @@ swfdec_bits_get_gradient (SwfdecBits * b - - n_gradients = swfdec_bits_get_u8 (bits); - grad = g_malloc (sizeof (SwfdecGradient) + -- sizeof (SwfdecGradientEntry) * (n_gradients - 1)); -+ sizeof (SwfdecGradientEntry) * (MAX (n_gradients, 1) - 1)); - for (i = 0; i < n_gradients && swfdec_bits_left (bits); i++) { - grad->array[i].ratio = swfdec_bits_get_u8 (bits); - grad->array[i].color = swfdec_bits_get_color (bits); From vmiklos at frugalware.org Fri Oct 10 14:58:39 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 10 14:58:42 2008 Subject: [Frugalware-git] frugalware-current: swfdec-mozilla-0.8.0-1-i686 Message-ID: <20081010125839.D51931190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cbf43e55988b65e3cb7c8e9a2a2c151966a902ef commit cbf43e55988b65e3cb7c8e9a2a2c151966a902ef Author: Miklos Vajna <vmiklos@frugalware.org> Date: Fri Oct 10 14:58:32 2008 +0200 swfdec-mozilla-0.8.0-1-i686 - version bump diff --git a/source/xlib-extra/swfdec-mozilla/FrugalBuild b/source/xlib-extra/swfdec-mozilla/FrugalBuild index 7472627..0658ef0 100644 --- a/source/xlib-extra/swfdec-mozilla/FrugalBuild +++ b/source/xlib-extra/swfdec-mozilla/FrugalBuild @@ -2,17 +2,17 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=swfdec-mozilla -pkgver=0.6.0 -pkgrel=4 +pkgver=0.8.0 +pkgrel=1 pkgdesc="Mozilla plugin that uses the Swfdec library for playing SWF files in a browser capable of loading NS-Plugins" url="http://swfdec.freedesktop.org/" license="LGPL" -depends=('swfdec=0.6.6-3' 'firefox') +depends=('swfdec=0.8.0' 'firefox') options=('scriptlet') groups=('xlib-extra') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://swfdec.freedesktop.org/|Flasttar" -source=($url/download/$pkgname/0.6/$pkgname-$pkgver.tar.gz) -sha1sums=('7edefcf1577c1029163623688d1dfc12c00e304e') +source=($url/download/$pkgname/0.8/$pkgname-$pkgver.tar.gz) +sha1sums=('a330ca74daa536870c2b6395309792e06af652d6') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:18 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:25:20 2008 Subject: [Frugalware-git] frugalware-current: gnome-common-2.24.0-1-i686 Message-ID: <20081010132518.9C64E1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4af2376257f4ceb5f585379be59c669436726db0 commit 4af2376257f4ceb5f585379be59c669436726db0 Author: bouleetbil <bouleetbil@frogdev.info> Date: Sat Sep 27 16:14:59 2008 +0200 gnome-common-2.24.0-1-i686 *version bump diff --git a/source/gnome-extra/gnome-common/FrugalBuild b/source/gnome-extra/gnome-common/FrugalBuild index 7b55ae2..83625b9 100644 --- a/source/gnome-extra/gnome-common/FrugalBuild +++ b/source/gnome-extra/gnome-common/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: AlexExtreme <alex@alex-smith.me.uk> pkgname=gnome-common -pkgver=2.20.0 -pkgrel=3 +pkgver=2.24.0 +pkgrel=1 pkgdesc="Common macros for GNOME" url="http://www.gnome.org/" depends=('glibc') @@ -18,5 +18,5 @@ build() { Fexe /etc/profile.d/gnome.sh } -sha1sums=('8fc9eeacdf6b77d8e6d1735979bbc3d678f49d95' \ +sha1sums=('5d1c903037fe7c86957c067f067343ee635eaf0f' \ 'fb0a0d87d507a20c32ec2af9d0f2bda57f28ffaa') From bouleetbil at frogdev.info Fri Oct 10 15:25:18 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:25:22 2008 Subject: [Frugalware-git] frugalware-current: glib2-2.18.1-1-i686 Message-ID: <20081010132518.AE56E11901A1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5cc9cffd1ba67c3afd963a2f701fd6f85556fafc commit 5cc9cffd1ba67c3afd963a2f701fd6f85556fafc Author: bouleetbil <bouleetbil@frogdev.info> Date: Sat Sep 27 16:49:31 2008 +0200 glib2-2.18.1-1-i686 *version bump *delete useless patch diff --git a/source/base/glib2/FrugalBuild b/source/base/glib2/FrugalBuild index cd6ec41..e79d9ad 100644 --- a/source/base/glib2/FrugalBuild +++ b/source/base/glib2/FrugalBuild @@ -4,11 +4,11 @@ USE_DOC=${USE_DOC:-"y"} pkgname=glib2 -pkgver=2.16.5 +pkgver=2.18.1 pkgrel=1 pkgdesc="Common C routines used by GTK+2 and other libraries" url="http://www.gtk.org/" -depends=('glibc>=2.8-3') +depends=('glibc>=2.8-6') makedepends=('libgcrypt>=1.4.1-2') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') @@ -16,13 +16,11 @@ options=('scriptlet') _F_gnome_name="glib" _F_gnome_devel="n" Finclude gnome -source=($source fix-docs-build.patch) _F_cd_path="glib-$pkgver" ## DON'T remove nor change the debug level or it breaks again .. -sha1sums=('9f5921bd46ccdf4ad80084cf424b8516f2dddd19' \ - 'cdb40320dc0fedd7ea37ec253b02e1b2222b3fff') +sha1sums=('d34a30cfccc8322dfe4198d26cf6bfc0210f141b') if Fuse $USE_DOC; then - makedepends=("${makedepends[@]}" 'gtk-doc>=1.8-2') + makedepends=("${makedepends[@]}" 'gtk-doc>=1.9') Fconfopts="$Fconfopts --enable-gtk-doc" subpkgs=("$pkgname-docs") subdescs=("Glib2 Documentation") diff --git a/source/base/glib2/fix-docs-build.patch b/source/base/glib2/fix-docs-build.patch deleted file mode 100644 index 7ad9188..0000000 --- a/source/base/glib2/fix-docs-build.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- gtk-doc.make.orig 2008-07-20 07:23:05.000000000 +0400 -+++ gtk-doc.make 2008-07-20 14:08:00.000000000 +0400 -@@ -107,7 +107,7 @@ - @-chmod -R u+w $(srcdir) - rm -rf $(srcdir)/html - mkdir $(srcdir)/html -- cd $(srcdir)/html && gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS) -+ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS) - test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo 'gtk-doc: Fixing cross-references' - cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) ---- docs/reference/gobject/Makefile.in.orig 2008-07-20 07:01:57.000000000 +0400 -+++ docs/reference/gobject/Makefile.in 2008-07-20 14:11:53.000000000 +0400 -@@ -697,7 +697,7 @@ - @-chmod -R u+w $(srcdir) - rm -rf $(srcdir)/html - mkdir $(srcdir)/html -- cd $(srcdir)/html && gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS) -+ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS) - test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo 'gtk-doc: Fixing cross-references' - cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) ---- docs/reference/glib/Makefile.in.orig 2008-07-20 07:01:57.000000000 +0400 -+++ docs/reference/glib/Makefile.in 2008-07-20 14:11:30.000000000 +0400 -@@ -713,7 +713,7 @@ - @-chmod -R u+w $(srcdir) - rm -rf $(srcdir)/html - mkdir $(srcdir)/html -- cd $(srcdir)/html && gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS) -+ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS) - test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo 'gtk-doc: Fixing cross-references' - cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) ---- docs/reference/gio/Makefile.in.orig 2008-07-20 07:01:57.000000000 +0400 -+++ docs/reference/gio/Makefile.in 2008-07-20 14:11:11.000000000 +0400 -@@ -687,7 +687,7 @@ - @-chmod -R u+w $(srcdir) - rm -rf $(srcdir)/html - mkdir $(srcdir)/html -- cd $(srcdir)/html && gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS) -+ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS) - test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo 'gtk-doc: Fixing cross-references' - cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - From bouleetbil at frogdev.info Fri Oct 10 15:25:18 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:25:56 2008 Subject: [Frugalware-git] frugalware-current: gtk+2-2.14.3-1-i686 Message-ID: <20081010132518.E446511901AD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=34c40c2c35613c6d072b0c14808d57b0c6e83f3e commit 34c40c2c35613c6d072b0c14808d57b0c6e83f3e Author: bouleetbil <bouleetbil@frogdev.info> Date: Sat Sep 27 19:06:24 2008 +0200 gtk+2-2.14.3-1-i686 *version bump *added jasper depends diff --git a/source/xlib/gtk+2/FrugalBuild b/source/xlib/gtk+2/FrugalBuild index 5635dc4..42c1359 100644 --- a/source/xlib/gtk+2/FrugalBuild +++ b/source/xlib/gtk+2/FrugalBuild @@ -3,12 +3,12 @@ pkgname=gtk+2 _F_gnome_name=gtk+ -pkgver=2.12.11 +pkgver=2.14.3 pkgrel=1 pkgdesc="The GTK+ Toolkit (2.x series)" depends=('libtiff' 'atk>=1.22.0' 'libxi' 'libxinerama' 'fontconfig' 'libjpeg' \ - 'pango>=1.20.4' 'cairo>=1.6.4' 'libxcursor' 'libxrandr' 'libsm' 'glib2>=2.16.3' \ - 'libcups' 'libx11' 'libtiff' 'libpng') + 'pango>=1.20.4' 'cairo>=1.6.4' 'libxcursor' 'libxrandr' 'libsm' 'glib2>=2.18.1' \ + 'libcups' 'libx11' 'libtiff' 'libpng' 'jasper') rodepends=('gnome-icon-theme') groups=('xlib') makedepends=('gtk-doc' 'cups' 'inputproto') @@ -41,7 +41,7 @@ build() { Fsplit $pkgname-docs usr/share/gtk-doc } -sha1sums=('c3e3b9f9f5dd46e88a8433dbb60c54d99a8e526b' \ +sha1sums=('d50056be33d82265deb433dfb72c3e46f20820c0' \ '7db980e782a5b04d27bffb55e3dc0190ad22e118' \ '783920d179ba0755ccab9186b6bff9f293828a96') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:18 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:25:59 2008 Subject: [Frugalware-git] frugalware-current: glibmm-2.18.0-1-i686 Message-ID: <20081010132518.F23BD11901AE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a257c545cb761c6888b145bf2b8f3b0306229526 commit a257c545cb761c6888b145bf2b8f3b0306229526 Author: bouleetbil <bouleetbil@frogdev.info> Date: Sat Sep 27 20:33:05 2008 +0200 glibmm-2.18.0-1-i686 *version bump diff --git a/source/lib/glibmm/FrugalBuild b/source/lib/glibmm/FrugalBuild index 24da528..92b250f 100644 --- a/source/lib/glibmm/FrugalBuild +++ b/source/lib/glibmm/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=glibmm -pkgver=2.16.4 +pkgver=2.18.0 pkgrel=1 pkgdesc="C++ interface for glib2" url="http://www.gnome.org/" -depends=('libsigc++2' 'glib2>=2.16.3') +depends=('libsigc++2' 'glib2>=2.18.1') groups=('lib') archs=('i686' 'x86_64' 'ppc') Finclude gnome -sha1sums=('5f6790bdafd4963219d5a60a8617c9ca89c98ef5') +sha1sums=('65f8c2401cfb6059f368ee8220f5f6101164465a') subpkgs=("$pkgname-docs") subdescs=("Glibmm Documentation") From bouleetbil at frogdev.info Fri Oct 10 15:25:18 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:02 2008 Subject: [Frugalware-git] frugalware-current: orbit2-2.14.16-1-i686 Message-ID: <20081010132518.D005F11901A5@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=86a9073e914385244c861e209b0ce4336e1b82a1 commit 86a9073e914385244c861e209b0ce4336e1b82a1 Author: bouleetbil <bouleetbil@frogdev.info> Date: Sat Sep 27 17:02:00 2008 +0200 orbit2-2.14.16-1-i686 *version bump diff --git a/source/gnome/orbit2/FrugalBuild b/source/gnome/orbit2/FrugalBuild index 3531078..913d372 100644 --- a/source/gnome/orbit2/FrugalBuild +++ b/source/gnome/orbit2/FrugalBuild @@ -3,12 +3,12 @@ pkgname=orbit2 _F_gnome_name=ORBit2 -pkgver=2.14.12 -pkgrel=2 +pkgver=2.14.16 +pkgrel=1 pkgdesc="A high-performance CORBA Object Request Broker" url="http://www.gnome.org/" -depends=('libidl>=0.8.10-2' 'glib2>=2.16.3' 'popt' 'openssl') -makedepends=('gtk-doc>=1.9' 'gnome-common>=2.12.0') +depends=('libidl>=0.8.10-2' 'glib2>=2.18.1' 'popt' 'openssl') +makedepends=('gtk-doc>=1.9' 'gnome-common>=2.24.0') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') Finclude gnome @@ -17,6 +17,6 @@ _F_cd_path="ORBit2-$pkgver" Fconfopts="$Fconfopts --enable-gtk-doc" unset MAKEFLAGS export CFLAGS="$CFLAGS -fno-strict-aliasing" -sha1sums=('0ae64c5e458c5cadab5af0e22d69ffea25f9f3fb') +sha1sums=('d366a92f8ce1989caf21cc6884f90cbcad42ea59') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:18 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:04 2008 Subject: [Frugalware-git] frugalware-current: libbonobo-2.24.0-1-i686 Message-ID: <20081010132518.DB06C11901AB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c7ac93c8e22d69c0a96d69eeef1e02eb3af60e30 commit c7ac93c8e22d69c0a96d69eeef1e02eb3af60e30 Author: bouleetbil <bouleetbil@frogdev.info> Date: Sat Sep 27 17:13:12 2008 +0200 libbonobo-2.24.0-1-i686 *version bump *added dbus-glib depends diff --git a/source/gnome/libbonobo/FrugalBuild b/source/gnome/libbonobo/FrugalBuild index 5ffbbf7..7fb90fe 100644 --- a/source/gnome/libbonobo/FrugalBuild +++ b/source/gnome/libbonobo/FrugalBuild @@ -2,18 +2,18 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=libbonobo -pkgver=2.22.0 +pkgver=2.24.0 pkgrel=1 pkgdesc="GNOME CORBA framework" url="http://www.gnome.org/" -depends=('orbit2>=2.14.12' 'libxml2' 'perl') +depends=('orbit2>=2.14.16' 'libxml2' 'perl' 'dbus-glib') makedepends=('intltool' 'gtk-doc>=1.9' 'popt' 'sgml-common') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') install=$pkgname.install Finclude gnome source=(${source[@]} libbonobo-search-path-fix.patch) -sha1sums=('517e8f1ca24cea4ce77cdb1d7485c61da3096be2' \ +sha1sums=('bd5f9e1eda3107fed86baad8a3501fa8d12b9b51' \ 'f716a5b855c71edba7e1d77096ee8cc45b85c108') Fconfopts="$Fconfopts --enable-gtk-doc" From bouleetbil at frogdev.info Fri Oct 10 15:25:19 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:07 2008 Subject: [Frugalware-git] frugalware-current: pixman-0.12.0-1-i686 Message-ID: <20081010132519.1D31D11901B1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=583266fb5f93be0002a24ceeb8486a5836c9dc68 commit 583266fb5f93be0002a24ceeb8486a5836c9dc68 Author: bouleetbil <bouleetbil@frogdev.info> Date: Sat Sep 27 21:42:02 2008 +0200 pixman-0.12.0-1-i686 *version bump diff --git a/source/x11/pixman/FrugalBuild b/source/x11/pixman/FrugalBuild index 3868435..e47e2bc 100644 --- a/source/x11/pixman/FrugalBuild +++ b/source/x11/pixman/FrugalBuild @@ -3,7 +3,7 @@ pkgname=pixman _F_xorg_name=pixman -pkgver=0.10.0 +pkgver=0.12.0 pkgrel=1 pkgdesc="X.Org pixman library" url="http://xorg.freedesktop.org" @@ -12,6 +12,6 @@ archs=('i686' 'x86_64' 'ppc') depends=('glibc') makedepends=('pkgconfig' 'xproto>=7.0.11') Finclude xorg +sha1sums=('0c57c6c7e21e2545257068f52517c460e6e51ae4') -sha1sums=('9262e945281877c42d484098de664dcf1a68d857') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:19 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:12 2008 Subject: [Frugalware-git] frugalware-current: pango-1.22.0-1-i686 Message-ID: <20081010132519.0852711901AF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ad5b5b69a590f60317a3beae18170a1943b61b5b commit ad5b5b69a590f60317a3beae18170a1943b61b5b Author: bouleetbil <bouleetbil@frogdev.info> Date: Sat Sep 27 21:09:15 2008 +0200 pango-1.22.0-1-i686 *version bump diff --git a/source/xlib/pango/FrugalBuild b/source/xlib/pango/FrugalBuild index 189f8db..6256573 100644 --- a/source/xlib/pango/FrugalBuild +++ b/source/xlib/pango/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=pango -pkgver=1.20.5 +pkgver=1.22.0 pkgrel=1 pkgdesc="A library for layout and rendering of text" url="http://www.gtk.org/" @@ -12,6 +12,6 @@ makedepends=('gtk-doc' 'perl') archs=('i686' 'x86_64' 'ppc') Finclude gnome Fconfopts="$Fconfopts --enable-gtk-doc --enable-debug=minimum" -sha1sums=('745469b2168df0bbb86eb4a849e8f2230ed11197') +sha1sums=('76d57e8706032319c99f5d93da77ed7e6e3eb460') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:19 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:14 2008 Subject: [Frugalware-git] frugalware-current: pango-1.22.0-1-i686 Message-ID: <20081010132519.3A5111190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e00b9df9beda34b5fea6033f6644ec1d1955678b commit e00b9df9beda34b5fea6033f6644ec1d1955678b Author: bouleetbil <bouleetbil@frogdev.info> Date: Sat Sep 27 22:00:42 2008 +0200 pango-1.22.0-1-i686 *rebuild with cairo 1.8.0 diff --git a/source/xlib/pango/FrugalBuild b/source/xlib/pango/FrugalBuild index 6256573..7704fc3 100644 --- a/source/xlib/pango/FrugalBuild +++ b/source/xlib/pango/FrugalBuild @@ -6,7 +6,7 @@ pkgver=1.22.0 pkgrel=1 pkgdesc="A library for layout and rendering of text" url="http://www.gtk.org/" -depends=('cairo>=1.6.4' 'glib2>=2.16.3' 'libxft') +depends=('cairo>=1.8.0' 'glib2>=2.16.3' 'libxft') groups=('xlib') makedepends=('gtk-doc' 'perl') archs=('i686' 'x86_64' 'ppc') From bouleetbil at frogdev.info Fri Oct 10 15:25:19 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:16 2008 Subject: [Frugalware-git] frugalware-current: cairo-1.8.0-1-i686 Message-ID: <20081010132519.27FE311901B9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cdb21dc89b1c7608de59199242dbf648d46f2e39 commit cdb21dc89b1c7608de59199242dbf648d46f2e39 Author: bouleetbil <bouleetbil@frogdev.info> Date: Sat Sep 27 21:50:24 2008 +0200 cairo-1.8.0-1-i686 *version bump diff --git a/source/xlib/cairo/FrugalBuild b/source/xlib/cairo/FrugalBuild index e7cde20..9635948 100644 --- a/source/xlib/cairo/FrugalBuild +++ b/source/xlib/cairo/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=cairo -pkgver=1.6.4 +pkgver=1.8.0 pkgrel=1 pkgdesc="A vector graphics library with cross-device output support" url="http://cairographics.org" -depends=('glitz' 'libxrender>=0.9.4' 'fontconfig' 'libpng' 'libxcb>=1.1' 'libx11>=1.1.3-2' 'xcb-util>=0.2' 'pixman>=0.10.0') +depends=('glitz' 'libxrender>=0.9.4' 'fontconfig' 'libpng' 'libxcb>=1.1' 'libx11>=1.1.3-2' 'xcb-util>=0.2' 'pixman>=0.12.0') if [ "$CARCH" != "ppc" ]; then - makedepends=('gtk-doc>=1.9' 'poppler-glib' 'librsvg>=2.20.0') + makedepends=('gtk-doc>=1.9' 'poppler-glib' 'librsvg>=2.22.0') else makedepends=('gtk-doc>=1.9') fi @@ -18,5 +18,5 @@ up2date="lynx -dump 'http://cairographics.org/releases/?C=D;O=A'|grep -m1 '/LATE source=($url/releases/$pkgname-$pkgver.tar.gz) options=('scriptlet') Fconfopts="$Fconfopts --enable-glitz --enable-gtk-doc --enable-pdf --enable-ps --enable-xcb" -sha1sums=('9d990fe39a125ceb07221623c237cd7015855d5c') +sha1sums=('8a689ca47c24216f37bb8cabae21ff08a7f47899') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:19 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:18 2008 Subject: [Frugalware-git] frugalware-current: pangomm-2.14.0-1-i686 Message-ID: <20081010132519.4B63611901A1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=056a1a077b41266448efc9f58658b6e54e09cea8 commit 056a1a077b41266448efc9f58658b6e54e09cea8 Author: bouleetbil <bouleetbil@frogdev.info> Date: Sat Sep 27 22:07:43 2008 +0200 pangomm-2.14.0-1-i686 *new package diff --git a/source/xlib-extra/pangomm/FrugalBuild b/source/xlib-extra/pangomm/FrugalBuild new file mode 100644 index 0000000..42b4d80 --- /dev/null +++ b/source/xlib-extra/pangomm/FrugalBuild @@ -0,0 +1,16 @@ +# Compiling time: 0.18 SBU +# Maintainer: bouleetbil <bouleetbil@frogdev.info> + +pkgname=pangomm +pkgver=2.14.0 +pkgrel=1 +pkgdesc="Pangomm is a C++ wrapper for the pango library." +url="http://www.gtk.org/" +depends=('pango>=1.22.0' 'glibmm' 'cairomm') +groups=('xlib-extra') +#makedepends=('gtk-doc' 'perl') +archs=('i686' 'x86_64') +Finclude gnome +sha1sums=('da6acdc8b4dc404d6c5bde648ac7d0eb4620c1b1') + +# optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:19 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:19 2008 Subject: [Frugalware-git] frugalware-current: gtkmm-2.14.1-1-i686 Message-ID: <20081010132519.5A4E911901BD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0e0c8123fe3fc3fd233d68f7116c52d6b0820c04 commit 0e0c8123fe3fc3fd233d68f7116c52d6b0820c04 Author: bouleetbil <bouleetbil@frogdev.info> Date: Sat Sep 27 22:26:26 2008 +0200 gtkmm-2.14.1-1-i686 *version bump *added pangomm depend diff --git a/source/xlib/gtkmm/FrugalBuild b/source/xlib/gtkmm/FrugalBuild index 75b75dc..9d73328 100644 --- a/source/xlib/gtkmm/FrugalBuild +++ b/source/xlib/gtkmm/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=gtkmm -pkgver=2.12.7 +pkgver=2.14.1 pkgrel=1 pkgdesc="C++ interface for GTK+2" -depends=('glibmm>=2.16.0' 'gtk+2>=2.12.9-2' 'cairomm>=1.6.0') +depends=('glibmm>=2.18.0' 'gtk+2>=2.14.3' 'cairomm>=1.6.0' 'pangomm>=2.14.0') groups=('xlib') archs=('i686' 'x86_64' 'ppc') Finclude gnome Fconfopts="$Fconfopts --disable-examples --disable-demos" -sha1sums=('ee7211c99e860c4b22091e81e6d1676d12fbb23c') +sha1sums=('a50bda6fef19abcc51b31a9e31858f52940c3943') export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" From bouleetbil at frogdev.info Fri Oct 10 15:25:19 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:21 2008 Subject: [Frugalware-git] frugalware-current: gconf-2.24.0-1-i686 Message-ID: <20081010132519.670AE11901C5@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2ec3f328b2db29b8876a1a184eb09e3786382929 commit 2ec3f328b2db29b8876a1a184eb09e3786382929 Author: bouleetbil <bouleetbil@frogdev.info> Date: Sat Sep 27 22:54:51 2008 +0200 gconf-2.24.0-1-i686 *version bump *added dbus-glib to depends *delete useless patch added in this release diff --git a/source/gnome/gconf/FrugalBuild b/source/gnome/gconf/FrugalBuild index 6f31991..1947a15 100644 --- a/source/gnome/gconf/FrugalBuild +++ b/source/gnome/gconf/FrugalBuild @@ -3,19 +3,18 @@ pkgname=gconf _F_gnome_name=GConf -pkgver=2.22.0 +pkgver=2.24.0 pkgrel=1 pkgdesc="A configuration database system for GNOME" url="http://www.gnome.org/" -depends=('orbit2>=2.14.12' 'gtk+2>=2.12.9' 'libxml2') -makedepends=('indent' 'gtk-doc>=1.9' 'openldap' 'perl-xml-parser') +depends=('orbit2>=2.14.16' 'gtk+2>=2.14.3' 'libxml2' 'dbus-glib') +makedepends=('indent' 'gtk-doc>=1.9' 'openldap' 'perl-xml-parser' 'intltool') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') Finclude gnome -source=(${source[@]} gconf-2.16.0-reload.patch gconf-2.22.0-automagic-ldap.patch) -sha1sums=('2a9ca649ef58394e425a030dc99b863b499a8a56' \ - 'c51bd437b495af6b25aff143a45c0b93a4afc236' \ - 'd2865965e13622bb5139ada69de8707486a8a744') +source=(${source[@]} gconf-2.16.0-reload.patch) +sha1sums=('e93ff2609c0278075acabdf609f42aa406e20c8e' \ + 'c51bd437b495af6b25aff143a45c0b93a4afc236') subpkgs=('gconf-ldap') subdescs=('Gconf LDAP support modules') @@ -25,7 +24,7 @@ subarchs=('i686 x86_64 ppc') build() { Fcd GConf-$pkgver - Fpatchall + Fpatch gconf-2.16.0-reload.patch Fmake --enable-gtk-doc --enable-debug=no Fmakeinstall Fsplit gconf-ldap /etc/gconf/2/evoldap.conf From bouleetbil at frogdev.info Fri Oct 10 15:25:19 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:22 2008 Subject: [Frugalware-git] frugalware-current: gvfs-1.0.1-1-i686 Message-ID: <20081010132519.7630A11901D1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5e4ed6dbe01791482d0b6ca9e5dd74e55f8501f8 commit 5e4ed6dbe01791482d0b6ca9e5dd74e55f8501f8 Author: bouleetbil <bouleetbil@frogdev.info> Date: Sat Sep 27 23:04:29 2008 +0200 gvfs-1.0.1-1-i686 *version bump diff --git a/source/gnome/gvfs/FrugalBuild b/source/gnome/gvfs/FrugalBuild index 8299dbd..be5a7a9 100644 --- a/source/gnome/gvfs/FrugalBuild +++ b/source/gnome/gvfs/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=gvfs -pkgver=0.2.5 +pkgver=1.0.1 pkgrel=1 pkgdesc="gvfs is a userspace virtual filesystem designed to work with the i/o abstractions of gio." url="http://www.gnome.org/" @@ -11,6 +11,6 @@ makedepends=('intltool' 'gnome-doc-utils' 'samba' 'fuse' 'libsoup' 'gconf') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') Finclude gnome -sha1sums=('b92b27792fe711319f9f0bba678dc9c074cb5b97') +sha1sums=('691f543a294899e582c912c2ad500e67966dfd6f') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:19 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:23 2008 Subject: [Frugalware-git] frugalware-current: gnome-vfs-2.24.0-1-i686 Message-ID: <20081010132519.933B111901DA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=06c6bcdc29732e041b3ae982eed4d5a5f672fc7a commit 06c6bcdc29732e041b3ae982eed4d5a5f672fc7a Author: bouleetbil <bouleetbil@frogdev.info> Date: Sat Sep 27 23:17:04 2008 +0200 gnome-vfs-2.24.0-1-i686 *version bump diff --git a/source/gnome/gnome-vfs/FrugalBuild b/source/gnome/gnome-vfs/FrugalBuild index 5426099..de47ec6 100644 --- a/source/gnome/gnome-vfs/FrugalBuild +++ b/source/gnome/gnome-vfs/FrugalBuild @@ -3,11 +3,11 @@ # Contributor: AlexExtreme <alex@alex-smith.me.uk> pkgname=gnome-vfs -pkgver=2.22.0 -pkgrel=4 +pkgver=2.24.0 +pkgrel=1 pkgdesc="GNOME Virtual File System" url="http://www.gnome.org/" -depends=('gconf>=2.22.0' 'bzip2' 'hal>=0.5.8.1' 'dbus-glib>=0.74-2' 'gnome-mime-data' 'gamin>=0.1.9-2' \ +depends=('gconf>=2.24.0' 'bzip2' 'hal>=0.5.8.1' 'dbus-glib>=0.74-2' 'gnome-mime-data' 'gamin>=0.1.9-2' \ 'avahi-glib>=0.6.17' 'xfsprogs-acl' 'heimdal>=1.2.1' 'db>=4.7.25' 'pmount') makedepends=('intltool' 'gtk-doc>=1.9' 'samba') rodepends=('gnome-mount>=0.6') @@ -25,7 +25,7 @@ source=(${source[@]} 00-default-browser.patch \ resolve_fstab_symlinks.patch \ gnome-vfs-2.8.2-schema_about_for_upstream.patch \ gnome-vfs-2.9.90-modules-conf.patch) -sha1sums=('a58fb0654bb2c434372ee313a591ecfa8195fe18' \ +sha1sums=('d836594f9053e2b49cfbaa8f5fab24a5d2c271bd' \ 'c83d61988a083c3906b0ce806bb41beb7b628af2' \ '6570dfb9cb50c8f4ca03a7bcf6c4cf8b0e523214' \ 'e94438c68532a1c36a7b5f0c305ab065695d626a' \ From bouleetbil at frogdev.info Fri Oct 10 15:25:19 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:25 2008 Subject: [Frugalware-git] frugalware-current: libgnome-2.24.1-1-i686 Message-ID: <20081010132519.A19F411901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=660b3cde180b090a20503cb3ee3174ed166e67ec commit 660b3cde180b090a20503cb3ee3174ed166e67ec Author: bouleetbil <bouleetbil@frogdev.info> Date: Sat Sep 27 23:35:05 2008 +0200 libgnome-2.24.1-1-i686 *version bump diff --git a/source/gnome/libgnome/FrugalBuild b/source/gnome/libgnome/FrugalBuild index 2cd6923..11aaf88 100644 --- a/source/gnome/libgnome/FrugalBuild +++ b/source/gnome/libgnome/FrugalBuild @@ -2,34 +2,35 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=libgnome -pkgver=2.22.0 +pkgver=2.24.1 pkgrel=1 pkgdesc="Common libraries for GNOME" url="http://www.gnome.org/" -depends=('esd' 'gnome-vfs>=2.22.0' 'gtk+2-engines>=2.14.1' 'libbonobo>=2.22.0' 'gnome-frugalware>=0.7.2' 'dbus-x11') +depends=('esd' 'gnome-vfs>=2.24.0' 'gtk+2-engines>=2.14.3' 'libbonobo>=2.24.0' 'gnome-frugalware>=0.7.2' 'dbus-x11') makedepends=('intltool' 'gtk-doc') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') -_F_gnome_schemas=('/etc/gconf/schemas/desktop_gnome_accessibility_keyboard.schemas' - '/etc/gconf/schemas/desktop_gnome_accessibility_startup.schemas' - '/etc/gconf/schemas/desktop_gnome_applications_at_mobility.schemas' - '/etc/gconf/schemas/desktop_gnome_applications_at_visual.schemas' - '/etc/gconf/schemas/desktop_gnome_applications_browser.schemas' - '/etc/gconf/schemas/desktop_gnome_applications_help_viewer.schemas' - '/etc/gconf/schemas/desktop_gnome_applications_terminal.schemas' - '/etc/gconf/schemas/desktop_gnome_applications_window_manager.schemas' - '/etc/gconf/schemas/desktop_gnome_background.schemas' - '/etc/gconf/schemas/desktop_gnome_file_views.schemas' - '/etc/gconf/schemas/desktop_gnome_interface.schemas' - '/etc/gconf/schemas/desktop_gnome_lockdown.schemas' - '/etc/gconf/schemas/desktop_gnome_peripherals_keyboard.schemas' - '/etc/gconf/schemas/desktop_gnome_peripherals_mouse.schemas' - '/etc/gconf/schemas/desktop_gnome_sound.schemas' - '/etc/gconf/schemas/desktop_gnome_thumbnailers.schemas' - '/etc/gconf/schemas/desktop_gnome_typing_break.schemas') +_F_gnome_schemas=('/etc/gconf/schemas/desktop_gnome_typing_break.schemas' + '/etc/gconf/schemas/desktop_gnome_thumbnailers.schemas' \ + '/etc/gconf/schemas/desktop_gnome_thumbnail_cache.schemas' \ + '/etc/gconf/schemas/desktop_gnome_sound.schemas' \ + '/etc/gconf/schemas/desktop_gnome_peripherals_mouse.schemas' \ + '/etc/gconf/schemas/desktop_gnome_peripherals_keyboard.schemas' \ + '/etc/gconf/schemas/desktop_gnome_lockdown.schemas' \ + '/etc/gconf/schemas/desktop_gnome_interface.schemas' \ + '/etc/gconf/schemas/desktop_gnome_file_views.schemas' \ + '/etc/gconf/schemas/desktop_gnome_background.schemas' \ + '/etc/gconf/schemas/desktop_gnome_applications_window_manager.schemas' \ + '/etc/gconf/schemas/desktop_gnome_applications_terminal.schemas' \ + '/etc/gconf/schemas/desktop_gnome_applications_office.schemas' \ + '/etc/gconf/schemas/desktop_gnome_applications_browser.schemas' \ + '/etc/gconf/schemas/desktop_gnome_applications_at_visual.schemas' \ + '/etc/gconf/schemas/desktop_gnome_applications_at_mobility.schemas' \ + '/etc/gconf/schemas/desktop_gnome_accessibility_startup.schemas' \ + '/etc/gconf/schemas/desktop_gnome_accessibility_keyboard.schemas') Finclude gnome gnome-scriptlet source=(${source[@]} $pkgname-$pkgver-frugalware_defaults.patch) -sha1sums=('2d263acdd313d37d1018356c74e9d1cc7a9c2e0d' \ +sha1sums=('f9d1d922569cb8f8a44834f5eadc42ac21d184e1' \ '264b9f315e4bf25adac105f94aecb6c58e713c30') Fconfopts="$Fconfopts --disable-gtk-doc" export CFLAGS="$CFLAGS -fno-strict-aliasing" From bouleetbil at frogdev.info Fri Oct 10 15:25:19 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:26 2008 Subject: [Frugalware-git] frugalware-current: gtk+2-2.14.3-1-i686 Message-ID: <20081010132519.B7EDA11901AB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=89e50a086a5a95cb3b2ae0c51d70007ffe91df3f commit 89e50a086a5a95cb3b2ae0c51d70007ffe91df3f Author: bouleetbil <bouleetbil@frogdev.info> Date: Sun Sep 28 21:00:56 2008 +0200 gtk+2-2.14.3-1-i686 *rebuild with pango-1.22.0 cairo-1.8.0 *delete files provided by gail diff --git a/source/xlib/gtk+2/FrugalBuild b/source/xlib/gtk+2/FrugalBuild index 42c1359..997ccbb 100644 --- a/source/xlib/gtk+2/FrugalBuild +++ b/source/xlib/gtk+2/FrugalBuild @@ -7,7 +7,7 @@ pkgver=2.14.3 pkgrel=1 pkgdesc="The GTK+ Toolkit (2.x series)" depends=('libtiff' 'atk>=1.22.0' 'libxi' 'libxinerama' 'fontconfig' 'libjpeg' \ - 'pango>=1.20.4' 'cairo>=1.6.4' 'libxcursor' 'libxrandr' 'libsm' 'glib2>=2.18.1' \ + 'pango>=1.22.0' 'cairo>=1.8.0' 'libxcursor' 'libxrandr' 'libsm' 'glib2>=2.18.1' \ 'libcups' 'libx11' 'libtiff' 'libpng' 'jasper') rodepends=('gnome-icon-theme') groups=('xlib') @@ -36,6 +36,13 @@ build() { --with-libpng \ --disable-dependency-tracking \ --with-x + #delete files provide by gail + Frm usr/include/gail-* + Frm usr/lib/gtk-2.0/modules/libferret* + Frm usr/lib/gtk-2.0/modules/libgail* + Frm usr/lib/libgailutil* + Frm usr/lib/pkgconfig/gail.pc + Fmkdir /etc/gtk-2.0 echo 'gtk-fallback-icon-theme = "gnome"' > $Fdestdir/etc/gtk-2.0/gtkrc || Fdie Fsplit $pkgname-docs usr/share/gtk-doc From bouleetbil at frogdev.info Fri Oct 10 15:25:19 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:28 2008 Subject: [Frugalware-git] frugalware-current: libgnome-2.24.1-1-i686 Message-ID: <20081010132519.A7B0511901F5@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6d755bbecfa95479ae1a14e5546c6dd95d853040 commit 6d755bbecfa95479ae1a14e5546c6dd95d853040 Author: bouleetbil <bouleetbil@frogdev.info> Date: Sat Sep 27 23:37:41 2008 +0200 libgnome-2.24.1-1-i686 *added forget patch diff --git a/source/gnome/libgnome/libgnome-2.24.1-frugalware_defaults.patch b/source/gnome/libgnome/libgnome-2.24.1-frugalware_defaults.patch new file mode 100644 index 0000000..1414e02 --- /dev/null +++ b/source/gnome/libgnome/libgnome-2.24.1-frugalware_defaults.patch @@ -0,0 +1,102 @@ +diff -Naur libgnome-2.22.0.orig/schemas/desktop_gnome_applications_browser.schemas.in libgnome-2.22.0/schemas/desktop_gnome_applications_browser.schemas.in +--- libgnome-2.22.0.orig/schemas/desktop_gnome_applications_browser.schemas.in 2008-04-09 11:37:46.000000000 +0200 ++++ libgnome-2.22.0/schemas/desktop_gnome_applications_browser.schemas.in 2008-04-09 11:37:53.000000000 +0200 +@@ -6,7 +6,7 @@ + <applyto>/desktop/gnome/applications/browser/exec</applyto> + <owner>gnome</owner> + <type>string</type> +- <default>mozilla</default> ++ <default>firefox</default> + <locale name="C"> + <short>Default browser</short> + <long>Default browser for all URLs.</long> +diff -Naur libgnome-2.22.0.orig/schemas/desktop_gnome_background.schemas.in.in libgnome-2.22.0/schemas/desktop_gnome_background.schemas.in.in +--- libgnome-2.22.0.orig/schemas/desktop_gnome_background.schemas.in.in 2008-04-09 11:37:46.000000000 +0200 ++++ libgnome-2.22.0/schemas/desktop_gnome_background.schemas.in.in 2008-04-09 11:37:53.000000000 +0200 +@@ -16,7 +16,7 @@ + <applyto>/desktop/gnome/background/picture_options</applyto> + <owner>gnome</owner> + <type>string</type> +- <default>zoom</default> ++ <default>stretched</default> + <locale name="C"> + <short>Picture Options</short> + <long>Determines how the image set by wallpaper_filename is +@@ -29,7 +29,7 @@ + <applyto>/desktop/gnome/background/picture_filename</applyto> + <owner>gnome</owner> + <type>string</type> +- <default>@datadir@/pixmaps/backgrounds/gnome/background-default.jpg</default> ++ <default>@datadir@/pixmaps/backgrounds/gnome/frugalware/frugalware.png</default> + <locale name="C"> + <short>Picture Filename</short> + <long>File to use for the background image.</long> +diff -Naur libgnome-2.22.0.orig/schemas/desktop_gnome_interface.schemas.in.in libgnome-2.22.0/schemas/desktop_gnome_interface.schemas.in.in +--- libgnome-2.22.0.orig/schemas/desktop_gnome_interface.schemas.in.in 2008-04-09 11:37:46.000000000 +0200 ++++ libgnome-2.22.0/schemas/desktop_gnome_interface.schemas.in.in 2008-04-09 11:37:53.000000000 +0200 +@@ -6,7 +6,7 @@ + <applyto>/desktop/gnome/interface/accessibility</applyto> + <owner>gnome</owner> + <type>bool</type> +- <default>@A11Y_ENABLED@</default> ++ <default>false</default> + <locale name="C"> + <short>Enable Accessibility</short> + <long>Whether Applications should have accessibility support.</long> +@@ -132,7 +132,7 @@ + <applyto>/desktop/gnome/interface/icon_theme</applyto> + <owner>gnome</owner> + <type>string</type> +- <default>gnome</default> ++ <default>Mist</default> + <locale name="C"> + <short>Icon Theme</short> + <long>Icon theme to use for the panel, nautilus etc.</long> +@@ -143,7 +143,7 @@ + <applyto>/desktop/gnome/interface/gtk_theme</applyto> + <owner>gnome</owner> + <type>string</type> +- <default>Clearlooks</default> ++ <default>Frugalware</default> + <locale name="C"> + <short>Gtk+ Theme</short> + <long>Basename of the default theme used by gtk+.</long> +@@ -165,7 +165,7 @@ + <applyto>/desktop/gnome/interface/font_name</applyto> + <owner>gnome</owner> + <type>string</type> +- <default>Sans 10</default> ++ <default>DejaVu Sans 13</default> + <locale name="C"> + <short>Default font</short> + <long>Name of the default font used by gtk+.</long> +@@ -209,7 +209,7 @@ + <key>/schemas/desktop/gnome/interface/document_font_name</key> + <owner>gnome</owner> + <type>string</type> +- <default>Sans 10</default> ++ <default>DejaVu Sans 13</default> + <locale name="C"> + <short>Document font</short> + <long>Name of the default font used for reading documents.</long> +@@ -220,7 +220,7 @@ + <key>/schemas/desktop/gnome/interface/monospace_font_name</key> + <owner>gnome</owner> + <type>string</type> +- <default>Monospace 10</default> ++ <default>Monospace 13</default> + <locale name="C"> + <short>Monospace font</short> + <long>Name of a monospaced (fixed-width) font for use +diff -Naur libgnome-2.22.0.orig/schemas/desktop_gnome_sound.schemas.in libgnome-2.22.0/schemas/desktop_gnome_sound.schemas.in +--- libgnome-2.22.0.orig/schemas/desktop_gnome_sound.schemas.in 2008-04-09 11:37:46.000000000 +0200 ++++ libgnome-2.22.0/schemas/desktop_gnome_sound.schemas.in 2008-04-09 11:37:53.000000000 +0200 +@@ -29,7 +29,7 @@ + <applyto>/desktop/gnome/sound/enable_esd</applyto> + <owner>gnome</owner> + <type>bool</type> +- <default>false</default> ++ <default>true</default> + <locale name="C"> + <short>Enable ESD</short> + <long>Enable sound server startup.</long> From bouleetbil at frogdev.info Fri Oct 10 15:25:19 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:29 2008 Subject: [Frugalware-git] frugalware-current: libbonoboui-2.24.0-1-i686 Message-ID: <20081010132519.C2CB711901F6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5229955399083c46954c7e10867899d409444e2a commit 5229955399083c46954c7e10867899d409444e2a Author: bouleetbil <bouleetbil@frogdev.info> Date: Sun Sep 28 21:14:43 2008 +0200 libbonoboui-2.24.0-1-i686 *version bump diff --git a/source/gnome/libbonoboui/FrugalBuild b/source/gnome/libbonoboui/FrugalBuild index df59dde..085ee66 100644 --- a/source/gnome/libbonoboui/FrugalBuild +++ b/source/gnome/libbonoboui/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=libbonoboui -pkgver=2.22.0 +pkgver=2.24.0 pkgrel=1 pkgdesc="User Interface part of libbonobo" url="http://www.gnome.org/" -depends=('libgnomecanvas>=2.20.1.1-2' 'libgnome>=2.22.0') +depends=('libgnomecanvas>=2.20.1.1-2' 'libgnome>=2.24.1') makedepends=('intltool' 'gtk-doc') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') Finclude gnome Fconfopts="$Fconfopts --disable-gtk-doc" -sha1sums=('48fcf81966b839b328ab63bae4ee128246eb0a63') +sha1sums=('6df7805b08a17d37cb0025a63afc697d7d547eea') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:19 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:30 2008 Subject: [Frugalware-git] frugalware-current: gnome-icon-theme-2.24.0-1-i686 Message-ID: <20081010132519.CD4A611901F7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eddaf513900c0466d815c33ffbe025518eab9a1a commit eddaf513900c0466d815c33ffbe025518eab9a1a Author: bouleetbil <bouleetbil@frogdev.info> Date: Sun Sep 28 21:24:43 2008 +0200 gnome-icon-theme-2.24.0-1-i686 *version bump diff --git a/source/gnome/gnome-icon-theme/FrugalBuild b/source/gnome/gnome-icon-theme/FrugalBuild index 46b7d7d..c357f6e 100644 --- a/source/gnome/gnome-icon-theme/FrugalBuild +++ b/source/gnome/gnome-icon-theme/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=gnome-icon-theme -pkgver=2.22.0 +pkgver=2.24.0 pkgrel=1 pkgdesc="Default icon theme for GNOME" url="http://www.gnome.org/" depends=('hicolor-icon-theme') -makedepends=('perl-xml-parser' 'icon-naming-utils>=0.8.2') +makedepends=('perl-xml-parser' 'icon-naming-utils>=0.8.2' 'intltool') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') Finclude gnome -sha1sums=('d492b459d7b0a34e2303cba663536b9026dddeb4') +sha1sums=('4f4df55d7f91890456f11ba645903fecbcdaff51') From bouleetbil at frogdev.info Fri Oct 10 15:25:19 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:32 2008 Subject: [Frugalware-git] frugalware-current: gnome-keyring-2.24.0-1-i686 Message-ID: <20081010132519.D75C011901F8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e133cbaa6783aaf2357707aa9e08bf1fae66be9d commit e133cbaa6783aaf2357707aa9e08bf1fae66be9d Author: bouleetbil <bouleetbil@frogdev.info> Date: Sun Sep 28 21:36:50 2008 +0200 gnome-keyring-2.24.0-1-i686 *version bump diff --git a/source/gnome/gnome-keyring/FrugalBuild b/source/gnome/gnome-keyring/FrugalBuild index a1975e4..e6fade6 100644 --- a/source/gnome/gnome-keyring/FrugalBuild +++ b/source/gnome/gnome-keyring/FrugalBuild @@ -2,17 +2,17 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=gnome-keyring -pkgver=2.22.3 +pkgver=2.24.0 pkgrel=1 pkgdesc="Password and keyring managing daemon for GNOME" url="http://www.gnome.org/" -depends=('gtk+2>=2.12.11' 'dbus-glib>=0.76-1' 'hal' 'libtasn1>=1.4' 'gconf') +depends=('gtk+2>=2.14.3' 'dbus-glib>=0.76-1' 'hal' 'libtasn1>=1.4' 'gconf') makedepends=('intltool' 'gtk-doc>=1.9') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') _F_gnome_schemas=('/etc/gconf/schemas/gnome-keyring.schemas') Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --enable-gtk-doc" -sha1sums=('0f52095590a684920cc683d1985ac66263702114') +sha1sums=('8ee43c1f5de544997cddf29f83a5419e667c5eb6') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:19 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:33 2008 Subject: [Frugalware-git] frugalware-current: libgnomeui-2.24.0-1-i686 Message-ID: <20081010132519.E42C211901A5@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9d3c07f209a5b9a2c44f2d84b880351157caf86a commit 9d3c07f209a5b9a2c44f2d84b880351157caf86a Author: bouleetbil <bouleetbil@frogdev.info> Date: Sun Sep 28 22:04:01 2008 +0200 libgnomeui-2.24.0-1-i686 *version bump diff --git a/source/gnome/libgnomeui/FrugalBuild b/source/gnome/libgnomeui/FrugalBuild index d5ae4ea..bae3ec0 100644 --- a/source/gnome/libgnomeui/FrugalBuild +++ b/source/gnome/libgnomeui/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=libgnomeui -pkgver=2.22.1 +pkgver=2.24.0 pkgrel=1 pkgdesc="User Interface library for GNOME" url="http://www.gnome.org/" -depends=('libbonoboui>=2.22.0' 'gnome-keyring>=2.22.0' 'gtk+2>=2.12.9' 'libbonobo>=2.22.0') -makedepends=('gtk-doc>=1.9' 'perl-xml-parser') +depends=('libbonoboui>=2.24.0' 'gnome-keyring>=2.24.0' 'gtk+2>=2.14.3' 'libbonobo>=2.24.0') +makedepends=('gtk-doc>=1.9' 'perl-xml-parser' 'intltool') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') Finclude gnome Fconfopts="$Fconfopts --enable-gtk-doc" -sha1sums=('fedbc56ac42d32e97310220469a8d6c52c3732cc') +sha1sums=('9cd1b8ea7bf5df385ca30585a2911e4151b6190a') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:19 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:34 2008 Subject: [Frugalware-git] frugalware-current: gtk+2-engines-2.16.0-1-i686 Message-ID: <20081010132519.EE2B711901F9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d84d2e6d0775ba7ae940711967c611e4be0632f9 commit d84d2e6d0775ba7ae940711967c611e4be0632f9 Author: bouleetbil <bouleetbil@frogdev.info> Date: Sun Sep 28 22:24:43 2008 +0200 gtk+2-engines-2.16.0-1-i686 *version bump diff --git a/source/xlib/gtk+2-engines/FrugalBuild b/source/xlib/gtk+2-engines/FrugalBuild index 1246508..222712d 100644 --- a/source/xlib/gtk+2-engines/FrugalBuild +++ b/source/xlib/gtk+2-engines/FrugalBuild @@ -3,11 +3,11 @@ pkgname=gtk+2-engines _F_gnome_name=gtk-engines -pkgver=2.14.3 +pkgver=2.16.0 pkgrel=1 pkgdesc="Theme engines for GTK+2" url="http://www.gnome.org/" -depends=('gtk+2>=2.12.9') +depends=('gtk+2>=2.14.3') makedepends=('perl-xml-parser' 'gnome-common>=2.20.0' 'intltool') groups=('xlib') archs=('i686' 'x86_64' 'ppc') @@ -16,6 +16,6 @@ provides=('gtk+2-engines-clearlooks' 'gtk+2-engines-industrial') Finclude gnome _F_cd_path="gtk-engines-$pkgver" Fconfopts="$Fconfopts --enable-animation" -sha1sums=('90675357337b4786534bc55219d9ca1ebf50497b') +sha1sums=('7b58197a4b918f9ab9a7b16c650deb22812df583') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:20 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:36 2008 Subject: [Frugalware-git] frugalware-current: gnome-themes-2.24.0-1-i686 Message-ID: <20081010132520.09C9711901FA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3251c1c61b1c4cb9a2fd3acd99dc81ac4a8055e3 commit 3251c1c61b1c4cb9a2fd3acd99dc81ac4a8055e3 Author: bouleetbil <bouleetbil@frogdev.info> Date: Sun Sep 28 22:29:43 2008 +0200 gnome-themes-2.24.0-1-i686 *version bump diff --git a/source/gnome/gnome-themes/FrugalBuild b/source/gnome/gnome-themes/FrugalBuild index 76bd260..b7288c7 100644 --- a/source/gnome/gnome-themes/FrugalBuild +++ b/source/gnome/gnome-themes/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=gnome-themes -pkgver=2.22.2 +pkgver=2.24.0 pkgrel=1 pkgdesc="Default themes for GNOME" url="http://www.gnome.org/" -depends=('gtk+2-engines>=2.14.1') +depends=('gtk+2-engines>=2.16.0') makedepends=('perl-xml-parser' 'icon-naming-utils') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') Finclude gnome -sha1sums=('ec386aea350cd22d1a5769a8ca011f59660d9ff6') +sha1sums=('167eae900b151b05880a2b81b2422473c905445f') From bouleetbil at frogdev.info Fri Oct 10 15:25:20 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:37 2008 Subject: [Frugalware-git] frugalware-current: libwnck-2.24.0-1-i686 Message-ID: <20081010132520.1AE6C1190211@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bacec9821866d285e487119b28f9fce6823387db commit bacec9821866d285e487119b28f9fce6823387db Author: bouleetbil <bouleetbil@frogdev.info> Date: Sun Sep 28 22:50:28 2008 +0200 libwnck-2.24.0-1-i686 *version bump diff --git a/source/xlib/libwnck/FrugalBuild b/source/xlib/libwnck/FrugalBuild index a3dbcfe..c37536b 100644 --- a/source/xlib/libwnck/FrugalBuild +++ b/source/xlib/libwnck/FrugalBuild @@ -2,17 +2,17 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=libwnck -pkgver=2.22.3 +pkgver=2.24.0 pkgrel=1 pkgdesc="Window Navigator Construction Kit" url="http://www.gnome.org/" -depends=('gtk+2>=2.12.9' 'libsm' 'libxres' 'startup-notification>=0.9') +depends=('gtk+2>=2.14.3' 'libsm' 'libxres' 'startup-notification>=0.9') groups=('xlib') -makedepends=('gtk-doc' 'perl-xml-parser') +makedepends=('gtk-doc' 'perl-xml-parser' 'intltool') archs=('i686' 'x86_64' 'ppc') Finclude gnome Fconfopts="$Fconfopts --enable-gtk-doc" -sha1sums=('57d97639287dee0d62492418b10cd2ad5b17f5b3') +sha1sums=('6d3faea515769bd2b23cbf5dae3cf22f8648e6fa') export CFLAGS="$CFLAGS -fno-strict-aliasing" # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:20 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:37 2008 Subject: [Frugalware-git] frugalware-current: gnome-desktop-2.24.0-1-i686 Message-ID: <20081010132520.102A11190210@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4b32a4dcda834ea1b169136c63932997d73762f7 commit 4b32a4dcda834ea1b169136c63932997d73762f7 Author: bouleetbil <bouleetbil@frogdev.info> Date: Sun Sep 28 22:40:33 2008 +0200 gnome-desktop-2.24.0-1-i686 *version bump diff --git a/source/gnome/gnome-desktop/FrugalBuild b/source/gnome/gnome-desktop/FrugalBuild index a64818e..9e33639 100644 --- a/source/gnome/gnome-desktop/FrugalBuild +++ b/source/gnome/gnome-desktop/FrugalBuild @@ -2,17 +2,17 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=gnome-desktop -pkgver=2.22.3 +pkgver=2.24.0 pkgrel=1 pkgdesc="The GNOME Desktop" url="http://www.gnome.org/" -depends=('libgnomeui>=2.22.1' 'startup-notification' 'rarian>=0.8.0' 'libbonobo>=2.22.0') +depends=('libgnomeui>=2.24.0' 'startup-notification' 'rarian>=0.8.0' 'libbonobo>=2.24.0') makedepends=('intltool' 'gnome-doc-utils>=0.12.2') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') _F_gnome_scrollkeeper="y" Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --with-gnome-distributor=Frugalware" -sha1sums=('89d7938a73735e6e2d1309f36d5a4be47eb41cca') +sha1sums=('8f345c1f10acad782290070fc30005fb10c72bfc') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:20 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:39 2008 Subject: [Frugalware-git] frugalware-current: libsoup-2.24.0.1-1-i686 Message-ID: <20081010132520.2564511901AD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=102c94fa581298d0aa687cbf3ac9d795e848db70 commit 102c94fa581298d0aa687cbf3ac9d795e848db70 Author: bouleetbil <bouleetbil@frogdev.info> Date: Sun Sep 28 22:57:37 2008 +0200 libsoup-2.24.0.1-1-i686 *version bump diff --git a/source/lib/libsoup/FrugalBuild b/source/lib/libsoup/FrugalBuild index e15a98e..90111db 100644 --- a/source/lib/libsoup/FrugalBuild +++ b/source/lib/libsoup/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=libsoup -pkgver=2.4.1 +pkgver=2.24.0.1 pkgrel=1 pkgdesc="An HTTP library implementation in C" url="http://www.gnome.org/" -depends=('glib2>=2.16.3' 'gnutls>=2.2' 'libxml2' 'libgcrypt>=1.4') +depends=('glib2>=2.18.1' 'gnutls>=2.2' 'libxml2' 'libgcrypt>=1.4') groups=('lib') archs=('i686' 'x86_64' 'ppc') Finclude gnome -sha1sums=('a63a1124abffa1a335642c78ce87a606162361dc') +sha1sums=('0bed343749c02d0ba5bcfaa20d095fa57f7de37f') Fconfopts="$Fconfopts --enable-ssl --enable-libgpg-error" # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:20 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:40 2008 Subject: [Frugalware-git] frugalware-current: evolution-data-server-2.24.0-1-i686 Message-ID: <20081010132520.2F92C1190212@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4795872affd3ffa542eba6f5b1ed5b10417bec1f commit 4795872affd3ffa542eba6f5b1ed5b10417bec1f Author: bouleetbil <bouleetbil@frogdev.info> Date: Sun Sep 28 23:21:55 2008 +0200 evolution-data-server-2.24.0-1-i686 *version bump diff --git a/source/gnome/evolution-data-server/FrugalBuild b/source/gnome/evolution-data-server/FrugalBuild index f0140a9..2f261aa 100644 --- a/source/gnome/evolution-data-server/FrugalBuild +++ b/source/gnome/evolution-data-server/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=evolution-data-server -pkgver=2.22.2 -pkgrel=5 +pkgver=2.24.0 +pkgrel=1 pkgdesc="Evolution Data Server provides a central location for addressbook and calendar in the GNOME Desktop" -depends=('nss>=3.12' 'libsoup>=2.4.1' 'libgnomeui>=2.22.1' 'heimdal>=1.2.1' 'gnome-keyring>=2.22.1' \ +depends=('nss>=3.12' 'libsoup>=2.24.0.1' 'libgnomeui>=2.24.0' 'heimdal>=1.2.1' 'gnome-keyring>=2.24.0' \ 'db>=4.7.25') makedepends=('intltool' 'gtk-doc>=1.9' 'openldap>=2.3.24') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') Finclude gnome -sha1sums=('d3fc33802fec51a16b017abb7516f4ed79311dfa') +sha1sums=('bf068de94f1d6d4a1aec3800f709d02ba7fcfeac') subpkgs=('evolution-data-server-ldap' "$pkgname-docs") subdescs=('Evolution Data Server LDAP extensions.' "Evolution Data Server Documentation") From bouleetbil at frogdev.info Fri Oct 10 15:25:20 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:41 2008 Subject: [Frugalware-git] frugalware-current: libgweather-2.24.0-1-i686 Message-ID: <20081010132520.45A8F1190213@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c7eccb6400d592c0b55bbb7840335e8339b221fd commit c7eccb6400d592c0b55bbb7840335e8339b221fd Author: bouleetbil <bouleetbil@frogdev.info> Date: Mon Sep 29 21:08:22 2008 +0200 libgweather-2.24.0-1-i686 *version bump diff --git a/source/gnome/libgweather/FrugalBuild b/source/gnome/libgweather/FrugalBuild index 6cba0d1..917912d 100644 --- a/source/gnome/libgweather/FrugalBuild +++ b/source/gnome/libgweather/FrugalBuild @@ -2,17 +2,17 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=libgweather -pkgver=2.22.3 +pkgver=2.24.0 pkgrel=1 pkgdesc="libgweather is a library to access weather information from online services for numerous locations." url="http://www.gnome.org/" -depends=('gconf' 'gnome-vfs') -makedepends=('perl-xml-parser') +depends=('gconf' 'gnome-vfs' 'libsoup>=2.24.0') +makedepends=('perl-xml-parser' 'intltool') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') _F_gnome_schemas=('/etc/gconf/schemas/gweather.schemas') Finclude gnome gnome-scriptlet -sha1sums=('d0f10e3378f7c882265ef656db1c978ead064250') +sha1sums=('b7e0b47f4875fae5d6afb4abaad08d2b08f31970') unset MAKEFLAGS # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:20 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:43 2008 Subject: [Frugalware-git] frugalware-current: gnome-menus-2.24.0-1-i686 Message-ID: <20081010132520.3A58E11901AE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b059cf9e311f202c276175577dc407fcd1ca024c commit b059cf9e311f202c276175577dc407fcd1ca024c Author: bouleetbil <bouleetbil@frogdev.info> Date: Mon Sep 29 20:48:51 2008 +0200 gnome-menus-2.24.0-1-i686 *version bump diff --git a/source/gnome/gnome-menus/FrugalBuild b/source/gnome/gnome-menus/FrugalBuild index f6806fa..36195de 100644 --- a/source/gnome/gnome-menus/FrugalBuild +++ b/source/gnome/gnome-menus/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=gnome-menus -pkgver=2.22.2 +pkgver=2.24.0 pkgrel=1 pkgdesc="GNOME menus and menu editor" depends=('gamin>=0.1.9-3' 'pygtk>=2.12.1-2') @@ -14,7 +14,7 @@ Finclude gnome Fsysconfdir="/etc/gnome" Fconfopts="$Fconfopts --enable-python --enable-debug=no --enable-inotify" source=(${source[@]} $pkgname-2.18.0-categorize-prefs-menu.patch) -sha1sums=('48d2557cd33265a760e43402b4f87faf6a8990db' \ - 'a6b1f615f6f831c9a950ce89a635d3795572e2cf') +sha1sums=('29c55f48a576216489ce139aa9c1bedf43394de1' \ + 'fa6cec3a8d11a35e0436b54038193f8e4c3b143f') # optimization OK diff --git a/source/gnome/gnome-menus/gnome-menus-2.18.0-categorize-prefs-menu.patch b/source/gnome/gnome-menus/gnome-menus-2.18.0-categorize-prefs-menu.patch index c8ef917..e4b0d85 100644 --- a/source/gnome/gnome-menus/gnome-menus-2.18.0-categorize-prefs-menu.patch +++ b/source/gnome/gnome-menus/gnome-menus-2.18.0-categorize-prefs-menu.patch @@ -9,12 +9,10 @@ diff -Naur gnome-menus-2.20.0.orig/desktop-directories/Hardware.directory.in gno +Icon=system Type=Directory Encoding=UTF-8 -diff -Naur gnome-menus-2.20.0.orig/layout/preferences.menu gnome-menus-2.20.0/layout/preferences.menu ---- gnome-menus-2.20.0.orig/layout/preferences.menu 2007-09-22 00:28:45.000000000 +0200 -+++ gnome-menus-2.20.0/layout/preferences.menu 2007-09-22 00:37:01.000000000 +0200 -00000 +0200 -@@ -12,30 +12,106 @@ - <!-- Read in overrides and child menus from preferences-merged/ --> +--- gnome-menus-2.24.0old/layout/applications.menu 2008-09-22 23:10:56.000000000 +0200 ++++ gnome-menus-2.24.0/layout/applications.menu 2008-09-29 20:40:30.000000000 +0200 +@@ -18,6 +18,16 @@ + <!-- Read in overrides and child menus from applications-merged/ --> <DefaultMergeDirs/> + <!-- Sort the control center categories --> @@ -27,54 +25,13 @@ diff -Naur gnome-menus-2.20.0.orig/layout/preferences.menu gnome-menus-2.20.0/la + <Merge type="all" /> + </Layout> + - <!-- Stuff in the toplevel --> - <Include> - <And> - <Category>Settings</Category> - <Not> - <Or> -+ <Category>X-GNOME-PersonalSettings</Category> -+ <Category>DesktopSettings</Category> -+ <Category>X-GNOME-NetworkSettings</Category> -+ <Category>HardwareSettings</Category> -+ <Category>X-GNOME-SystemSettings</Category> - <Category>System</Category> -- <Category>Accessibility</Category> - <Filename>gnomecc.desktop</Filename> - </Or> - </Not> - </And> - </Include> - -- <!-- Accessibility --> -+ <!-- Personal Submenu --> -+ <Menu> -+ <Name>Personal</Name> -+ <Directory>Personal.directory</Directory> -+ <Include> -+ <And> -+ <Category>Settings</Category> -+ <Category>X-GNOME-PersonalSettings</Category> -+ </And> -+ </Include> -+ </Menu> <!-- End Personal --> -+ -+ <!-- Look and Feel submenu --> + <!-- Accessories submenu --> <Menu> -- <Name>Universal Access</Name> -- <Directory>Settings-Accessibility.directory</Directory> -+ <Name>Look and Feel</Name> -+ <Directory>LookAndFeel.directory</Directory> - <Include> - <And> - <Category>Settings</Category> -- <Category>Accessibility</Category> -+ <Category>DesktopSettings</Category> - </And> + <Name>Accessories</Name> +@@ -137,6 +147,55 @@ </Include> -- </Menu> -+ </Menu> <!-- End Look and Feel --> -+ + </Menu> <!-- End System Tools --> + + <!-- Internet and Network submenu --> + <Menu> + <Name>Internet and Network</Name> @@ -124,6 +81,8 @@ diff -Naur gnome-menus-2.20.0.orig/layout/preferences.menu gnome-menus-2.20.0/la + </Include> + </Menu> <!-- End System --> + - - </Menu> <!-- End Prefs --> + <!-- Other --> + <Menu> + <Name>Other</Name> + From bouleetbil at frogdev.info Fri Oct 10 15:25:20 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:44 2008 Subject: [Frugalware-git] frugalware-current: metacity-2.24.0-1-i686 Message-ID: <20081010132520.6AEC9119021A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=df6bac20903ae2c560d1ef17036f45e9837fd625 commit df6bac20903ae2c560d1ef17036f45e9837fd625 Author: bouleetbil <bouleetbil@frogdev.info> Date: Mon Sep 29 22:01:27 2008 +0200 metacity-2.24.0-1-i686 *version bump diff --git a/source/gnome/metacity/FrugalBuild b/source/gnome/metacity/FrugalBuild index 2d9ad4a..900239f 100644 --- a/source/gnome/metacity/FrugalBuild +++ b/source/gnome/metacity/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=metacity -pkgver=2.22.0 +pkgver=2.24.0 pkgrel=1 pkgdesc="A window manager for GNOME" url="http://www.gnome.org/" -depends=('startup-notification' 'gconf>=2.22.0' 'gnome-themes>=2.22.0' 'libcm' 'gnome-frugalware>=0.7.2') +depends=('startup-notification' 'gconf>=2.24.0' 'gnome-themes>=2.24.0' 'libcm' 'gnome-frugalware>=0.7.2') makedepends=('intltool') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') @@ -14,7 +14,7 @@ _F_gnome_schemas=('/etc/gconf/schemas/metacity.schemas') Finclude gnome gnome-scriptlet source=(${source[@]} $pkgname-2.20.0-frugalware_defaults.patch) Fconfopts="$Fconfopts --enable-compositor" -sha1sums=('18e7761152d033b31b13a455be459d986f55a8ba' \ - '1009c0437d52b300b90f505efe77a620f0bc30e6') +sha1sums=('0b2e37e372498e26a6926fbb68e96556c6db6497' \ + '1d3929afd1bff03b2bde12c1de1f926cbace683b') # optimization OK diff --git a/source/gnome/metacity/metacity-2.20.0-frugalware_defaults.patch b/source/gnome/metacity/metacity-2.20.0-frugalware_defaults.patch index bd287b0..cb08c17 100644 --- a/source/gnome/metacity/metacity-2.20.0-frugalware_defaults.patch +++ b/source/gnome/metacity/metacity-2.20.0-frugalware_defaults.patch @@ -40,10 +40,9 @@ diff -urN metacity-2.20.0.orig/src/metacity.schemas.in metacity-2.20.0/src/metac <locale name="C"> <short>Window title font</short> <long> -diff -urN metacity-2.20.0.orig/src/prefs.c metacity-2.20.0/src/prefs.c ---- metacity-2.20.0.orig/src/core/prefs.c 2007-10-04 22:28:50.000000000 +0100 -+++ metacity-2.20.0/src/core/prefs.c 2007-10-04 22:29:46.000000000 +0100 -@@ -519,8 +519,8 @@ +--- metacity-2.24.0old/src/core/prefs.c 2008-08-18 14:29:06.000000000 +0200 ++++ metacity-2.24.0/src/core/prefs.c 2008-09-29 21:54:35.000000000 +0200 +@@ -1038,8 +1038,8 @@ * elsewhere that will do everything possible to fallback to an existing theme * if the one here does not exist. */ @@ -54,12 +53,13 @@ diff -urN metacity-2.20.0.orig/src/prefs.c metacity-2.20.0/src/prefs.c init_button_layout(); #endif /* HAVE_GCONF */ -@@ -1191,7 +1191,7 @@ - if (current_theme == NULL) - { - /* Fallback crackrock */ -- current_theme = g_strdup ("Atlanta"); -+ current_theme = g_strdup ("Inverted"); - changed = TRUE; - } - +@@ -1365,7 +1365,7 @@ + { + /* Fallback crackrock */ + if (string_value == NULL) +- current_theme = g_strdup ("Atlanta"); ++ current_theme = g_strdup ("Inverted"); + else + current_theme = g_strdup (string_value); + } + From bouleetbil at frogdev.info Fri Oct 10 15:25:20 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:45 2008 Subject: [Frugalware-git] frugalware-current: gnome-panel-2.24.0-1-i686 Message-ID: <20081010132520.4FED71190214@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cd56a2db2b23ac01e25296dda7977459f054a6cc commit cd56a2db2b23ac01e25296dda7977459f054a6cc Author: bouleetbil <bouleetbil@frogdev.info> Date: Mon Sep 29 21:42:29 2008 +0200 gnome-panel-2.24.0-1-i686 *version bump diff --git a/source/gnome/gnome-panel/FrugalBuild b/source/gnome/gnome-panel/FrugalBuild index 284587c..5a81bab 100644 --- a/source/gnome/gnome-panel/FrugalBuild +++ b/source/gnome/gnome-panel/FrugalBuild @@ -2,31 +2,31 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=gnome-panel -pkgver=2.22.2 +pkgver=2.24.0 pkgrel=1 pkgdesc="GNOME panel and core applets" rodepends=('alacarte>=0.11.1.1') -depends=('gnome-desktop>=2.22.2' 'gnome-menus>=2.22.2' 'libwnck>=2.22.1' \ - 'gnome-vfs>=2.22.0' 'evolution-data-server>=2.22.2' \ - 'rarian>=0.8.0' 'dbus-glib>=0.71' 'avahi-glib>=0.6.17' 'librsvg>=2.22.0' 'libgweather>=2.22.2') +depends=('gnome-desktop>=2.24.0' 'gnome-menus>=2.24.0' 'libwnck>=2.24.0' \ + 'gnome-vfs>=2.24.0' 'evolution-data-server>=2.24.0' \ + 'rarian>=0.8.0' 'dbus-glib>=0.71' 'avahi-glib>=0.6.17' 'librsvg>=2.22.2' 'libgweather>=2.24.0') makedepends=('intltool' 'gtk-doc>=1.9' 'gnome-doc-utils>=0.12.0') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') -_F_gnome_schemas=('/etc/gconf/schemas/clock.schemas' - '/etc/gconf/schemas/fish.schemas' - '/etc/gconf/schemas/panel-compatibility.schemas' - '/etc/gconf/schemas/panel-general.schemas' - '/etc/gconf/schemas/panel-global.schemas' - '/etc/gconf/schemas/panel-object.schemas' - '/etc/gconf/schemas/panel-toplevel.schemas' - '/etc/gconf/schemas/window-list.schemas' - '/etc/gconf/schemas/workspace-switcher.schemas') +_F_gnome_schemas=('/etc/gconf/schemas/workspace-switcher.schemas' \ + '/etc/gconf/schemas/window-list.schemas' \ + '/etc/gconf/schemas/panel-toplevel.schemas' \ + '/etc/gconf/schemas/panel-object.schemas' \ + '/etc/gconf/schemas/panel-global.schemas' \ + '/etc/gconf/schemas/panel-general.schemas' \ + '/etc/gconf/schemas/panel-compatibility.schemas' \ + '/etc/gconf/schemas/fish.schemas' \ + '/etc/gconf/schemas/clock.schemas') _F_gnome_entries=('/etc/gconf/schemas/panel-default-setup.entries') _F_gnome_scrollkeeper="y" _F_gnome_iconcache="y" _F_gnome_desktop="y" Finclude gnome gnome-scriptlet -sha1sums=('73752c3ce6224886c2381b0b13111253008bc6f7') +sha1sums=('d820b09e0a83e41814f6ddf8045023d814589d9d') build() { Fcd From bouleetbil at frogdev.info Fri Oct 10 15:25:20 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:46 2008 Subject: [Frugalware-git] frugalware-current: libgnomekbd-2.24.0-1-i686 Message-ID: <20081010132520.8C844119021C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7cebf2d5277402d32d3afe93e234db0ceaf99ee0 commit 7cebf2d5277402d32d3afe93e234db0ceaf99ee0 Author: bouleetbil <bouleetbil@frogdev.info> Date: Mon Sep 29 22:14:02 2008 +0200 libgnomekbd-2.24.0-1-i686 *version bump diff --git a/source/gnome/libgnomekbd/FrugalBuild b/source/gnome/libgnomekbd/FrugalBuild index fcffb70..531c500 100644 --- a/source/gnome/libgnomekbd/FrugalBuild +++ b/source/gnome/libgnomekbd/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: AlexExtreme <alex@alex-smith.me.uk> pkgname=libgnomekbd -pkgver=2.22.0 +pkgver=2.24.0 pkgrel=1 pkgdesc="Keyboard library for GNOME" url="http://www.gnome.org/" -depends=('dbus-glib>=0.74' 'gconf>=2.22.0' 'gtk+2>=2.12.9' 'libglade' 'libgnome>=2.22.0' 'libgnomeui>=2.22.0' 'libxklavier>=3.5') +depends=('dbus-glib>=0.74' 'gconf>=2.24.0' 'gtk+2>=2.14.3' 'libglade' 'libgnome>=2.24.0' 'libgnomeui>=2.24.0' 'libxklavier>=3.5') makedepends=('intltool' 'perl-xml-parser') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') _F_gnome_schemas=('/etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas') Finclude gnome gnome-scriptlet -sha1sums=('62a11b227d4bcbc3df64fbdfc7e075e9366140da') +sha1sums=('3e81ade6050930a9d1e3443b89981cf36821032a') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:20 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:47 2008 Subject: [Frugalware-git] frugalware-current: eel-2.24.0-1-i686 Message-ID: <20081010132520.E864411901AF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5a3d556ad61eb8d73bcbfe2a8834b088ced0022f commit 5a3d556ad61eb8d73bcbfe2a8834b088ced0022f Author: bouleetbil <bouleetbil@frogdev.info> Date: Mon Sep 29 22:23:17 2008 +0200 eel-2.24.0-1-i686 *version bump diff --git a/source/gnome/eel/FrugalBuild b/source/gnome/eel/FrugalBuild index 845f851..56a7c31 100644 --- a/source/gnome/eel/FrugalBuild +++ b/source/gnome/eel/FrugalBuild @@ -2,14 +2,14 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=eel -pkgver=2.22.2 +pkgver=2.24.0 pkgrel=1 pkgdesc="Eazel Extensions Library is a collection of widgets and extensions for GNOME" -depends=('gail>=1.22.1' 'gnome-menus>=2.22.2' 'gnome-desktop>=2.22.2') +depends=('gail>=1.22.1' 'gnome-menus>=2.24.0' 'gnome-desktop>=2.24.0') makedepends=('perl-xml-parser') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') Finclude gnome -sha1sums=('503af67ee6fe89491cc9214e1d726fa34cb355b4') +sha1sums=('4ddfe2c0b768ccac765c6522d7d44c4f782ec143') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:21 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:48 2008 Subject: [Frugalware-git] frugalware-current: gnome-settings-daemon-2.24.0-1-i686 Message-ID: <20081010132521.9BAFE119021D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2537722678ccd10d983327834365182aae881290 commit 2537722678ccd10d983327834365182aae881290 Author: bouleetbil <bouleetbil@frogdev.info> Date: Mon Sep 29 22:42:26 2008 +0200 gnome-settings-daemon-2.24.0-1-i686 *version bump diff --git a/source/gnome/gnome-settings-daemon/FrugalBuild b/source/gnome/gnome-settings-daemon/FrugalBuild index f88c7a6..f2c8121 100644 --- a/source/gnome/gnome-settings-daemon/FrugalBuild +++ b/source/gnome/gnome-settings-daemon/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=gnome-settings-daemon -pkgver=2.22.2.1 +pkgver=2.24.0 pkgrel=1 pkgdesc="Utility library for accessing gnome-settings-daemon over DBUS" depends=('libgnomekbd' 'esd' 'gst-plugins-base' 'libgnomeui' 'libxxf86misc' 'gnome-desktop' 'gconf' 'alsa-lib') @@ -15,9 +15,10 @@ _F_gnome_schemas=('/etc/gconf/schemas/gnome-settings-daemon.schemas' '/etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas') _F_gnome_entries=('/etc/gconf/schemas/panel-default-setup.entries') _F_gnome_scrollkeeper="y" +_F_gnome_iconcache="y" Finclude gnome gnome-scriptlet source=(${source[@]} default_dpi.patch) -sha1sums=('0424486b6e53ab0d2dd676c375d02e35341b3a20' \ +sha1sums=('7d95a7550c465c9a64e4bda64331c92069958bfd' \ 'eb601b6406db7700c12d6b144eacbbdc7c4a780e') Fconfopts="$Fconfopts --enable-gstreamer" From bouleetbil at frogdev.info Fri Oct 10 15:25:22 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:50 2008 Subject: [Frugalware-git] frugalware-current: nautilus-2.24.0-1-i686 Message-ID: <20081010132522.0FAA911901B9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=73c72fe8f5ad502db786023145b640c32757c780 commit 73c72fe8f5ad502db786023145b640c32757c780 Author: bouleetbil <bouleetbil@frogdev.info> Date: Mon Sep 29 22:56:05 2008 +0200 nautilus-2.24.0-1-i686 *version bump diff --git a/source/gnome/nautilus/FrugalBuild b/source/gnome/nautilus/FrugalBuild index f64c2b5..d401079 100644 --- a/source/gnome/nautilus/FrugalBuild +++ b/source/gnome/nautilus/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=nautilus -pkgver=2.22.5.1 +pkgver=2.24.0 pkgrel=1 pkgdesc="A file manager for GNOME" url="http://www.gnome.org/" -depends=('eel>=2.22.2' 'librsvg>=2.22.2' 'libexif' 'eject' 'desktop-file-utils' 'libgnome>=2.22.0' 'gnome-vfs>=2.22.0' \ +depends=('eel>=2.24.0' 'librsvg>=2.22.2' 'libexif' 'eject' 'desktop-file-utils' 'libgnome>=2.24.0' 'gnome-vfs>=2.24.0' \ 'exempi' 'gvfs') # Seems exempi needs as depend! makedepends=('intltool') @@ -20,7 +20,7 @@ Finclude gnome gnome-scriptlet source=(${source[@]} $pkgname-2.16.0-frugalware_defaults.patch) Fconfopts="$Fconfopts --disable-tracker --disable-beagle" -sha1sums=('81c1d875779f5d95ad7bf7dc18ab8a8244abb429' \ +sha1sums=('3ffb3958b113070f3b12a9390e58ee9421e4da01' \ 'f328b08f6c92e2d2c5efb28fc6999d8f7ea60c5a') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:22 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:51 2008 Subject: [Frugalware-git] frugalware-current: libcanberra-0.9-1-i686 Message-ID: <20081010132522.A395E119021B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0078eb3725dc81621cbd088155b736856818454e commit 0078eb3725dc81621cbd088155b736856818454e Author: bouleetbil <bouleetbil@frogdev.info> Date: Mon Sep 29 23:58:47 2008 +0200 libcanberra-0.9-1-i686 *new package diff --git a/source/multimedia/libcanberra/FrugalBuild b/source/multimedia/libcanberra/FrugalBuild new file mode 100644 index 0000000..15ef530 --- /dev/null +++ b/source/multimedia/libcanberra/FrugalBuild @@ -0,0 +1,34 @@ +# Compiling Time: 0.19 SBU +# Maintainer: bouleetbil <bouleetbil@frogdev.info> + +pkgname=libcanberra +pkgver=0.9 +pkgrel=1 +pkgdesc="libcanberra is an implementation of the XDG Sound Theme and Name Specifications." +url="http://0pointer.de/lennart/projects/$pkgname/" +depends=('libvorbis') +makedepends=('alsa-lib' 'gstreamer' 'gtk+2') +groups=('multimedia') +archs=('i686' 'x86_64') +up2date="lynx -dump -source $url | Flasttar" +source=($url/$pkgname-$pkgver.tar.gz) +sha1sums=('42b87af1ee770378dbfd8bfeb3c11a6e4f513dab') + +subpkgs=("libcanberra-alsa" "libcanberra-gst" "libcanberra-gtk") +subdepends=("$pkgname-alsa alsa-lib" "$pkgname-gst gstreamer" "$pkgname-gtk gtk+2") +subdescs=('Alsa libcanberra' 'gstreamer libcanberra' 'GTK+2 libcanberra') +subgroups=('multimedia-extra' 'xmultimedia-extra' 'xmultimedia-extra') +subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64') +build(){ + Fbuild + Fsplit $pkgname-gtk usr/lib/pkgconfig/libcanberra-gtk.pc + Fsplit $pkgname-gtk usr/include/canberra-gtk.h + Fsplit $pkgname-gtk usr/lib/gtk-2.0 + Fsplit $pkgname-alsa usr/lib/libcanberra/libcanberra-alsa* + Fsplit $pkgname-gst usr/lib/libcanberra/libcanberra-gstreamer* + Fsplit $pkgname-gtk usr/lib/libcanberra-gtk* + Fsplit $pkgname-gtk usr/share/gtk-doc + Fmv usr/share/doc/$pkgname usr/share/doc/$pkgname-$pkgver +} + +# optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:22 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:52 2008 Subject: [Frugalware-git] frugalware-current: libcanberra-0.9-1-i686 Message-ID: <20081010132522.CB62A119021E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=312efa8beaf3a73a9569130654950459f31ae326 commit 312efa8beaf3a73a9569130654950459f31ae326 Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Sep 30 07:35:36 2008 +0200 libcanberra-0.9-1-i686 *fixe subdepends diff --git a/source/multimedia/libcanberra/FrugalBuild b/source/multimedia/libcanberra/FrugalBuild index 15ef530..2c64590 100644 --- a/source/multimedia/libcanberra/FrugalBuild +++ b/source/multimedia/libcanberra/FrugalBuild @@ -15,7 +15,7 @@ source=($url/$pkgname-$pkgver.tar.gz) sha1sums=('42b87af1ee770378dbfd8bfeb3c11a6e4f513dab') subpkgs=("libcanberra-alsa" "libcanberra-gst" "libcanberra-gtk") -subdepends=("$pkgname-alsa alsa-lib" "$pkgname-gst gstreamer" "$pkgname-gtk gtk+2") +subdepends=("libcanberra alsa-lib" "libcanberra gstreamer" "libcanberra gtk+2") subdescs=('Alsa libcanberra' 'gstreamer libcanberra' 'GTK+2 libcanberra') subgroups=('multimedia-extra' 'xmultimedia-extra' 'xmultimedia-extra') subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64') From bouleetbil at frogdev.info Fri Oct 10 15:25:23 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:53 2008 Subject: [Frugalware-git] frugalware-current: gnome-control-center-2.24.0.1-1-i686 Message-ID: <20081010132523.065D111901BD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ccfae8b14a59be8078f6d34e9c254ad4988f2464 commit ccfae8b14a59be8078f6d34e9c254ad4988f2464 Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Sep 30 08:11:49 2008 +0200 gnome-control-center-2.24.0.1-1-i686 *version bump diff --git a/source/gnome/gnome-control-center/FrugalBuild b/source/gnome/gnome-control-center/FrugalBuild index d18bf66..63d137e 100644 --- a/source/gnome/gnome-control-center/FrugalBuild +++ b/source/gnome/gnome-control-center/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=gnome-control-center -pkgver=2.22.2.1 -pkgrel=4 +pkgver=2.24.0.1 +pkgrel=1 pkgdesc="GNOME Control Center" -depends=('gnome-desktop>=2.22.2' 'gnome-menus>=2.22.2' 'metacity>=2.22.0' 'libgnomekbd>=2.22.0' \ - 'nautilus>=2.22.3' 'gst-plugins-base>=0.10.19-2' 'desktop-file-utils' \ - 'evolution-data-server>=2.22.2' 'libxxf86misc' 'libxscrnsaver' 'xrdb' \ - 'gnome-vfs>=2.22.0' 'gnome-panel>=2.22.2' 'heimdal>=1.2.1' 'db>=4.7.25' \ - 'gnome-settings-daemon') -makedepends=('intltool' 'gnome-doc-utils>=0.12.2' 'gnome-common>=2.20.0') +depends=('gnome-desktop>=2.24.0' 'gnome-menus>=2.24.0' 'metacity>=2.24.0' 'libgnomekbd>=2.24.0' \ + 'nautilus>=2.24.0' 'gst-plugins-base>=0.10.19-2' 'desktop-file-utils' \ + 'evolution-data-server>=2.24.0' 'libxxf86misc' 'libxscrnsaver' 'xrdb' \ + 'gnome-vfs>=2.24.0' 'gnome-panel>=2.24.0' 'heimdal>=1.2.1' 'db>=4.7.25' \ + 'gnome-settings-daemon' 'libcanberra-gtk' 'libcanberra-alsa' 'libcanberra-gst') +makedepends=('intltool' 'gnome-doc-utils>=0.12.2' 'gnome-common>=2.24.0') rodepends=('gst-plugins-base-alsa>=0.10.19-2' 'gst-plugins-base-gnomevfs>=0.10.19-2') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') @@ -24,7 +24,7 @@ _F_gnome_iconcache="y" options=('scriptlet') Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --enable-gstreamer --disable-schemas-install --enable-aboutme" -sha1sums=('686151d59b99fb311481ba365b0dd3fd3680cac6') +sha1sums=('daf737c762d53ef984a55fc5008e6a4e85b88294') build() { export CFLAGS="$CFLAGS -fno-strict-aliasing" From bouleetbil at frogdev.info Fri Oct 10 15:25:23 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:55 2008 Subject: [Frugalware-git] frugalware-current: gnome-session-2.24.0-1-i686 Message-ID: <20081010132523.36FFE1190220@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=57684977f384f049d339613198c94c6503e5e070 commit 57684977f384f049d339613198c94c6503e5e070 Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Sep 30 09:32:39 2008 +0200 gnome-session-2.24.0-1-i686 *version bump *added new splash *disable some patchs diff --git a/source/gnome/gnome-session/FrugalBuild b/source/gnome/gnome-session/FrugalBuild index ce0ce57..790be27 100644 --- a/source/gnome/gnome-session/FrugalBuild +++ b/source/gnome/gnome-session/FrugalBuild @@ -4,11 +4,11 @@ # kill_g_debug.patch should be disabled for stable releases of gnome pkgname=gnome-session -pkgver=2.22.3 +pkgver=2.24.0 pkgrel=1 pkgdesc="GNOME session manager" -depends=('libgnomeui>=2.22.1' 'gnome-desktop>=2.22.3' \ - 'dbus-glib>=0.76' 'gnome-control-center>=2.22.1' 'gnome-vfs>=2.22.0' 'libnotify' 'gnome-keyring>=2.22.3') +depends=('libgnomeui>=2.24.0' 'gnome-desktop>=2.24.0' \ + 'dbus-glib>=0.76' 'gnome-control-center>=2.24.0.1' 'gnome-vfs>=2.24.0' 'libnotify' 'gnome-keyring>=2.24.0') makedepends=('intltool') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') @@ -16,18 +16,19 @@ _F_gnome_schemas=('/etc/gconf/schemas/gnome-session.schemas') _F_gnome_iconcache="y" _F_gnome_desktop="y" Finclude gnome gnome-scriptlet +#TODO : move gnome_splash.png to real dir artwork frugalware if this splash is accept source=(${source[@]} 02-splash-disappear.patch \ - $pkgname http://ftp.frugalware.org/pub/other/artwork/gnome-theme/GNOME-Splash-0.7.png \ + $pkgname http://ftp.frugalware.org/pub/other/people/bouleetbil/artwork/gnome_splash.png \ 09_splash_hide.patch 19_gnome-wm-tweaking.patch) -sha1sums=('817e007009e6e43cd2f1980e6d90546e7117cc9d' \ +sha1sums=('5a4b329db62ae3518029982ae86fb1b138500c3e' \ 'd45d51203dc7ad290b12bc70281d59844a79be75' \ '047ac00bb24d52986aac94e232b4b40fa122f582' \ - 'c6a9e03d9622b9d1b81ae4bedda950bea25de962' \ + 'd6c30173ddf4524b49a593bc3b8cf0f278cab5a0' \ '97585abf9d468e532422af3daceb42b61d832a13' \ 'a69fefc4ee7f11ee1be13f61a4f7c711f3390c80') build() { - Fpatchall + #Fpatchall Fmake --disable-schemas-install Fmakeinstall GCONF_DISABLE_SCHEMA_INSTALL=1 Fbuild_gnome_scriptlet @@ -38,7 +39,7 @@ build() { Frm usr/share/pixmaps/splash/gnome-splash.png # Frugalware Splash screen - Ffile GNOME-Splash-0.7.png /usr/share/pixmaps/splash/gnome-splash.png + Ffile gnome_splash.png /usr/share/pixmaps/splash/gnome-splash.png } # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:23 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:56 2008 Subject: [Frugalware-git] frugalware-current: vte-0.17.4-1-i686 Message-ID: <20081010132523.47A7F119024D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5759868f87be88122c2e14b3771725dd8331ffa5 commit 5759868f87be88122c2e14b3771725dd8331ffa5 Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Sep 30 11:55:07 2008 +0200 vte-0.17.4-1-i686 *version bump *added _F_gnome_devel="y" vte don't use the gnome version diff --git a/source/gnome/vte/FrugalBuild b/source/gnome/vte/FrugalBuild index fe36c41..4218e44 100644 --- a/source/gnome/vte/FrugalBuild +++ b/source/gnome/vte/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=vte -pkgver=0.16.13 +pkgver=0.17.4 pkgrel=1 pkgdesc="Virtual Terminal Emulator" url="http://www.gnome.org/" -depends=('gtk+2>=2.12.9') +depends=('gtk+2>=2.14.3') if [ "$CARCH" != "ppc" ]; then makedepends=('pygtk>=2.12.0' 'gtk-doc>=1.9' 'perl-xml-parser') else @@ -14,8 +14,9 @@ else fi groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') +_F_gnome_devel="y" Finclude gnome -sha1sums=('5dc98cf5e2a5c96236ae8daa1bd53017e89adb71') +sha1sums=('fe4a3ec476c97d0f385249ee60edb12887b69575') Fconfopts="$Fconfopts --enable-gtk-doc" subpkgs=('vte-python') From bouleetbil at frogdev.info Fri Oct 10 15:25:23 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:57 2008 Subject: [Frugalware-git] frugalware-current: gnome-terminal-2.24.0-1-i686 Message-ID: <20081010132523.5F8401190397@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=739c59c318ab7df72d10df30dd1a7be7cbe2be47 commit 739c59c318ab7df72d10df30dd1a7be7cbe2be47 Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Sep 30 12:05:55 2008 +0200 gnome-terminal-2.24.0-1-i686 *version bump diff --git a/source/gnome/gnome-terminal/00-gnome-terminal-2.12.0-prompt.patch b/source/gnome/gnome-terminal/00-gnome-terminal-2.12.0-prompt.patch index 7451e69..1835ddc 100644 --- a/source/gnome/gnome-terminal/00-gnome-terminal-2.12.0-prompt.patch +++ b/source/gnome/gnome-terminal/00-gnome-terminal-2.12.0-prompt.patch @@ -1,12 +1,12 @@ -diff -Naur gnome-terminal-2.10.0.orig/src/gnome-terminal.schemas.in gnome-terminal-2.10.0/src/gnome-terminal.schemas.in ---- gnome-terminal-2.10.0.orig/src/gnome-terminal.schemas.in 2004-08-17 16:41:35.000000000 +0200 -+++ gnome-terminal-2.10.0/src/gnome-terminal.schemas.in 2005-07-28 19:17:36.000000000 +0200 -@@ -341,7 +341,7 @@ - <applyto>/apps/gnome-terminal/profiles/Default/login_shell</applyto> +--- gnome-terminal-2.24.0old/src/gnome-terminal.schemas.in 2008-06-17 22:28:21.000000000 +0200 ++++ gnome-terminal-2.24.0/src/gnome-terminal.schemas.in 2008-09-30 09:41:51.000000000 +0200 +@@ -60,7 +60,7 @@ + <applyto>/apps/gnome-terminal/global/use_menu_accelerators</applyto> <owner>gnome-terminal</owner> <type>bool</type> -- <default>false</default> -+ <default>true</default> +- <default>true</default> ++ <default>false</default> <locale name="C"> - <short>Whether to launch the command in the terminal as a login shell</short> + <short>Whether the standard GTK shortcut for menubar access is enabled</short> <long> + diff --git a/source/gnome/gnome-terminal/FrugalBuild b/source/gnome/gnome-terminal/FrugalBuild index 4114f3a..55ebd86 100644 --- a/source/gnome/gnome-terminal/FrugalBuild +++ b/source/gnome/gnome-terminal/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=gnome-terminal -pkgver=2.22.3 +pkgver=2.24.0 pkgrel=1 pkgdesc="GNOME terminal emulator" url="http://www.gnome.org/" -depends=('libgnomeui>=2.22.1' 'startup-notification' 'vte>=0.16.13' 'rarian' 'gnome-vfs>=2.22.0' \ +depends=('libgnomeui>=2.24.0' 'startup-notification' 'vte>=0.17.4' 'rarian' 'gnome-vfs>=2.24.0' \ 'avahi-glib>=0.6.23' 'dbus-glib>=0.76') makedepends=('intltool' 'gnome-doc-utils>=0.12.2') groups=('gnome' 'gnome-minimal') @@ -14,10 +14,8 @@ archs=('i686' 'x86_64' 'ppc') _F_gnome_scrollkeeper="y" _F_gnome_schemas=('/etc/gconf/schemas/gnome-terminal.schemas') Finclude gnome gnome-scriptlet -source=(${source[@]} 00-$pkgname-2.12.0-prompt.patch \ - 01-$pkgname-2.12.0-bindings.patch) -sha1sums=('8aaf556134884d3f7430e7966ff2c87df5843e3e' \ - 'e368d21c96edac918a1a7cd22c0e65d803f5784f' \ - '0146084932430786185eaacafc06852a87cfe632') +source=(${source[@]} 00-$pkgname-2.12.0-prompt.patch) +sha1sums=('f1bdab62bfbcca26f0fcee02e962e5508196929c' \ + '4c81fb467dff18f0db3cda535a3549d233b9275a') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:23 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:58 2008 Subject: [Frugalware-git] frugalware-current: libgtop-2.24.0-1-i686 Message-ID: <20081010132523.76F9C11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6b79eef03878ec3aa05a6834b7a756feb691e2c2 commit 6b79eef03878ec3aa05a6834b7a756feb691e2c2 Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Sep 30 12:16:40 2008 +0200 libgtop-2.24.0-1-i686 *version bump diff --git a/source/xlib/libgtop/FrugalBuild b/source/xlib/libgtop/FrugalBuild index e9baef4..cd9623f 100644 --- a/source/xlib/libgtop/FrugalBuild +++ b/source/xlib/libgtop/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=libgtop -pkgver=2.22.3 -pkgrel=2 +pkgver=2.24.0 +pkgrel=1 pkgdesc="A library that read information about processes and the running system" url="http://www.gnome.org/" -depends=('glib2>=2.16.3' 'popt' 'texinfo' 'libxau') +depends=('glib2>=2.18.1' 'popt' 'texinfo' 'libxau') makedepends=('libxt' 'perl-xml-parser' 'gtk-doc' 'intltool') groups=('xlib') archs=('i686' 'x86_64' 'ppc') Finclude gnome texinfo Fconfopts="$Fconfopts --enable-debug=no --enable-fatal-warnings=no" -sha1sums=('cc172b78f11c19cb4ba7ed3b55a34283f6f63d50') +sha1sums=('934b9a83f8042dbbacdfb02cf85f4078d8b6fd14') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:23 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:26:59 2008 Subject: [Frugalware-git] frugalware-current: gucharmap-2.24.0-1-i686 Message-ID: <20081010132523.A0A5411904CE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=459e541956d87e9ea923aeccafaa0aabc31871d7 commit 459e541956d87e9ea923aeccafaa0aabc31871d7 Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Sep 30 12:37:03 2008 +0200 gucharmap-2.24.0-1-i686 *version bump diff --git a/source/gnome/gucharmap/FrugalBuild b/source/gnome/gucharmap/FrugalBuild index 057faeb..31180d1 100644 --- a/source/gnome/gucharmap/FrugalBuild +++ b/source/gnome/gucharmap/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=gucharmap -pkgver=2.22.3 +pkgver=2.24.0 pkgrel=1 pkgdesc="A featureful Unicode character map for GNOME" url="http://www.gnome.org/" -depends=('libgnomeui>=2.22.1' 'rarian') +depends=('libgnomeui>=2.24.0' 'rarian') makedepends=('intltool' 'gnome-doc-utils>=0.12.2') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') @@ -14,6 +14,6 @@ _F_gnome_scrollkeeper="y" _F_gnome_iconcache="y" _F_gnome_desktop="y" Finclude gnome gnome-scriptlet -sha1sums=('b4d46d813596e2c77612c374267a63a3a45ca040') +sha1sums=('6a741f1bbe95dc9caf21a380a27be9258b471d6e') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:23 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:27:01 2008 Subject: [Frugalware-git] frugalware-current: libsoup-2.24.0.1-2-i686 Message-ID: <20081010132523.AFE5F11904D3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=81d610d305b9b1e84739fe2f01679a6a41c73cb0 commit 81d610d305b9b1e84739fe2f01679a6a41c73cb0 Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Sep 30 13:12:34 2008 +0200 libsoup-2.24.0.1-2-i686 *rebuilt with gnutls>=2.4 diff --git a/source/lib/libsoup/FrugalBuild b/source/lib/libsoup/FrugalBuild index 90111db..07b919d 100644 --- a/source/lib/libsoup/FrugalBuild +++ b/source/lib/libsoup/FrugalBuild @@ -3,10 +3,10 @@ pkgname=libsoup pkgver=2.24.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="An HTTP library implementation in C" url="http://www.gnome.org/" -depends=('glib2>=2.18.1' 'gnutls>=2.2' 'libxml2' 'libgcrypt>=1.4') +depends=('glib2>=2.18.1' 'gnutls>=2.4' 'libxml2' 'libgcrypt>=1.4') groups=('lib') archs=('i686' 'x86_64' 'ppc') Finclude gnome From bouleetbil at frogdev.info Fri Oct 10 15:25:23 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:27:02 2008 Subject: [Frugalware-git] frugalware-current: evolution-data-server-2.24.0-2-i686 Message-ID: <20081010132523.CA95E1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b89d2a370cedbda8c1f0279203624c5b67fed9ef commit b89d2a370cedbda8c1f0279203624c5b67fed9ef Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Sep 30 18:42:20 2008 +0200 evolution-data-server-2.24.0-2-i686 *rebuild with libsoup>=2.24.0.1-2 diff --git a/source/gnome/evolution-data-server/FrugalBuild b/source/gnome/evolution-data-server/FrugalBuild index 2f261aa..a9d1a75 100644 --- a/source/gnome/evolution-data-server/FrugalBuild +++ b/source/gnome/evolution-data-server/FrugalBuild @@ -3,9 +3,9 @@ pkgname=evolution-data-server pkgver=2.24.0 -pkgrel=1 +pkgrel=2 pkgdesc="Evolution Data Server provides a central location for addressbook and calendar in the GNOME Desktop" -depends=('nss>=3.12' 'libsoup>=2.24.0.1' 'libgnomeui>=2.24.0' 'heimdal>=1.2.1' 'gnome-keyring>=2.24.0' \ +depends=('nss>=3.12' 'libsoup>=2.24.0.1-2' 'libgnomeui>=2.24.0' 'heimdal>=1.2.1' 'gnome-keyring>=2.24.0' \ 'db>=4.7.25') makedepends=('intltool' 'gtk-doc>=1.9' 'openldap>=2.3.24') groups=('gnome' 'gnome-minimal') From bouleetbil at frogdev.info Fri Oct 10 15:25:23 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:27:03 2008 Subject: [Frugalware-git] frugalware-current: gnome-applets-2.24.0.1-1-i686 Message-ID: <20081010132523.E066C11901A1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=84d6ee29a10a9d9ec2d603360e35f4562d3e20e7 commit 84d6ee29a10a9d9ec2d603360e35f4562d3e20e7 Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Sep 30 19:18:36 2008 +0200 gnome-applets-2.24.0.1-1-i686 *version bump diff --git a/source/gnome/gnome-applets/FrugalBuild b/source/gnome/gnome-applets/FrugalBuild index f6c75a3..1dd7bc5 100644 --- a/source/gnome/gnome-applets/FrugalBuild +++ b/source/gnome/gnome-applets/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=gnome-applets -pkgver=2.22.3 +pkgver=2.24.0.1 pkgrel=1 pkgdesc="Applets for use with the GNOME panel" url="http://www.gnome.org/" -depends=('gail' 'gnome-panel>=2.22.2' 'libgtop>=2.22.3' 'libxklavier>=3.6' 'libwnck>=2.22.3' \ - 'gucharmap>=2.22.3' 'gst-plugins-base>=0.10.20-1' 'libnotify' 'gnome-icon-theme' 'dbus-glib>=0.76-1' \ - 'libgnomekbd' 'gnome-settings-daemon' 'libgweather>=2.22.3') +depends=('gail' 'gnome-panel>=2.24.0' 'libgtop>=2.24.0' 'libxklavier>=3.6' 'libwnck>=2.24.0' \ + 'gucharmap>=2.24.0' 'gst-plugins-base>=0.10.20-1' 'libnotify' 'gnome-icon-theme' 'dbus-glib>=0.76-1' \ + 'libgnomekbd' 'gnome-settings-daemon' 'libgweather>=2.24.0') rodepends=('notification-daemon') makedepends=('intltool' 'gnome-doc-utils') groups=('gnome' 'gnome-minimal') @@ -26,7 +26,7 @@ _F_gnome_iconcache="y" Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --enable-flags --enable-ipv6 --with-gstreamer=0.10 --enable-stickynotes" source=(${source[@]} mixer_applet_powersave.patch README.Frugalware) -sha1sums=('6b8ec95330fff2069854c9bcca662542b8da0168' \ +sha1sums=('eda6719b05acb33c2b7ccdfd9f9e82031be036e8' \ '52f3ae4811dee6bd263fdec8f464f5221355d368' \ 'c0774a7e94736eeb18aee8cba06bb52fc8a9f144') @@ -35,7 +35,7 @@ build() { Fcd # Fixup for DTD 4.3 stuff, because we dont have that and docs generation fails for this Fsed "SUBDIRS = help" "" charpick/Makefile.* - Fsed "SUBDIRS = help" "" accessx-status/Makefile.* + Fsed "SUBDIRS = help" "" accessx-status/docs/Makefile.* Fmake unset MAKEFLAGS Fmakeinstall From bouleetbil at frogdev.info Fri Oct 10 15:25:23 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:27:04 2008 Subject: [Frugalware-git] frugalware-current: yelp-2.24.0-1-i686 Message-ID: <20081010132523.EEBC611901C5@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e776293e9624a8b44c0530997fee3e35bf943ba6 commit e776293e9624a8b44c0530997fee3e35bf943ba6 Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Sep 30 20:34:39 2008 +0200 yelp-2.24.0-1-i686 *version bump diff --git a/source/gnome/yelp/FrugalBuild b/source/gnome/yelp/FrugalBuild index 35fb245..a54d916 100644 --- a/source/gnome/yelp/FrugalBuild +++ b/source/gnome/yelp/FrugalBuild @@ -2,20 +2,20 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=yelp -pkgver=2.22.1 +pkgver=2.24.0 pkgrel=1 pkgdesc="The default help browser for GNOME" url="http://www.gnome.org/" -depends=('libgnomeui>=2.22.0' 'libxslt' 'xulrunner=1.8.1.3' \ - 'libxml2' 'gtk+2>=2.12.0' 'startup-notification' 'libbonobo>=2.22.0') +depends=('libgnomeui>=2.24.0' 'libxslt' 'xulrunner=1.8.1.3' \ + 'libxml2' 'gtk+2>=2.14.3' 'startup-notification' 'libbonobo>=2.24.0') makedepends=('intltool' 'gnome-doc-utils' \ - 'libgnomeprintui>=2.22.0' 'libglade' 'gnome-vfs>=2.22.0') + 'libgnomeprintui>=2.18.2' 'libglade' 'gnome-vfs>=2.24.0') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') _F_gnome_schemas=('/etc/gconf/schemas/yelp.schemas') Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --enable-man --enable-info --with-mozilla=xulrunner" unset MAKEFLAGS -sha1sums=('29586dd5415fc6470c43dbd68fdb491f91778231') +sha1sums=('18082b28de342c170978c8433a2ce544361598b2') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:24 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:27:05 2008 Subject: [Frugalware-git] frugalware-current: gnome-session-2.24.0-2-i686 Message-ID: <20081010132524.0BEFA11901D1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=af34139d15f149021d31a0e72e8a6e936bcfffd3 commit af34139d15f149021d31a0e72e8a6e936bcfffd3 Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Sep 30 20:56:07 2008 +0200 gnome-session-2.24.0-2-i686 *added new splash for devil505 :-) diff --git a/source/gnome/gnome-session/FrugalBuild b/source/gnome/gnome-session/FrugalBuild index 790be27..79eb231 100644 --- a/source/gnome/gnome-session/FrugalBuild +++ b/source/gnome/gnome-session/FrugalBuild @@ -5,7 +5,7 @@ pkgname=gnome-session pkgver=2.24.0 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME session manager" depends=('libgnomeui>=2.24.0' 'gnome-desktop>=2.24.0' \ 'dbus-glib>=0.76' 'gnome-control-center>=2.24.0.1' 'gnome-vfs>=2.24.0' 'libnotify' 'gnome-keyring>=2.24.0') @@ -16,14 +16,13 @@ _F_gnome_schemas=('/etc/gconf/schemas/gnome-session.schemas') _F_gnome_iconcache="y" _F_gnome_desktop="y" Finclude gnome gnome-scriptlet -#TODO : move gnome_splash.png to real dir artwork frugalware if this splash is accept source=(${source[@]} 02-splash-disappear.patch \ - $pkgname http://ftp.frugalware.org/pub/other/people/bouleetbil/artwork/gnome_splash.png \ + $pkgname http://ftp.frugalware.org/pub/other/artwork/gnome-theme/GNOME-Splash-1.0.png \ 09_splash_hide.patch 19_gnome-wm-tweaking.patch) sha1sums=('5a4b329db62ae3518029982ae86fb1b138500c3e' \ 'd45d51203dc7ad290b12bc70281d59844a79be75' \ '047ac00bb24d52986aac94e232b4b40fa122f582' \ - 'd6c30173ddf4524b49a593bc3b8cf0f278cab5a0' \ + '222c9a2fd01872acc2fb69c17e9771cde2e1e5a2' \ '97585abf9d468e532422af3daceb42b61d832a13' \ 'a69fefc4ee7f11ee1be13f61a4f7c711f3390c80') @@ -39,7 +38,7 @@ build() { Frm usr/share/pixmaps/splash/gnome-splash.png # Frugalware Splash screen - Ffile gnome_splash.png /usr/share/pixmaps/splash/gnome-splash.png + Ffile GNOME-Splash-1.0.png /usr/share/pixmaps/splash/gnome-splash.png } # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:24 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:27:06 2008 Subject: [Frugalware-git] frugalware-current: gtksourceview-2.4.0-1-i686 Message-ID: <20081010132524.1AFD11190219@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e8d3faf0b7473a379ccc54f94d813cec3d14fb93 commit e8d3faf0b7473a379ccc54f94d813cec3d14fb93 Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Sep 30 21:04:57 2008 +0200 gtksourceview-2.4.0-1-i686 *version bump diff --git a/source/gnome/gtksourceview/FrugalBuild b/source/gnome/gtksourceview/FrugalBuild index 123a000..04da77d 100644 --- a/source/gnome/gtksourceview/FrugalBuild +++ b/source/gnome/gtksourceview/FrugalBuild @@ -2,10 +2,10 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=gtksourceview -pkgver=2.2.1 +pkgver=2.4.0 pkgrel=1 pkgdesc="A text widget adding syntax highlighting and more to GNOME" -depends=('libgnomeprintui>=2.18.1' 'gtk+2>=2.12.9' 'gnome-vfs>=2.22.0') +depends=('libgnomeprintui>=2.18.1' 'gtk+2>=2.14.3' 'gnome-vfs>=2.24.0') makedepends=('intltool' 'gtk-doc') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') @@ -16,5 +16,5 @@ build() { Frm usr/share/gtksourceview-2.0/language-specs/boo.lang } -sha1sums=('457ea2ab8add927ab55e105892c21a440b18603f') +sha1sums=('b31d6fdfce430e780dbe4453a7217b6511ae6ef2') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:24 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:27:06 2008 Subject: [Frugalware-git] frugalware-current: pyorbit-2.24.0-1-i686 Message-ID: <20081010132524.2D2E411904E0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a307131591476b0606dc8002dfa97dbaae13b24f commit a307131591476b0606dc8002dfa97dbaae13b24f Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Sep 30 21:15:25 2008 +0200 pyorbit-2.24.0-1-i686 *version bump diff --git a/source/gnome/pyorbit/FrugalBuild b/source/gnome/pyorbit/FrugalBuild index 063fd97..473af82 100644 --- a/source/gnome/pyorbit/FrugalBuild +++ b/source/gnome/pyorbit/FrugalBuild @@ -2,14 +2,14 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=pyorbit -pkgver=2.14.3 -pkgrel=3 +pkgver=2.24.0 +pkgrel=1 pkgdesc="Python bindings for ORBit2" url="http://www.daa.com.au/~james/pygtk/" depends=('python' 'orbit2') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') Finclude gnome -sha1sums=('b0863aba35beddaf44722b0d7a3d1f65081e424a') +sha1sums=('f9877ce9672ed3c3d001b86924f1b6514a79efc9') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:24 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:27:07 2008 Subject: [Frugalware-git] frugalware-current: totem-pl-parser-2.24.0-1-i686 Message-ID: <20081010132524.515B811904E2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=393ab22a01c282cc5c85837a5813ce709fbad02a commit 393ab22a01c282cc5c85837a5813ce709fbad02a Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Sep 30 21:36:07 2008 +0200 totem-pl-parser-2.24.0-1-i686 diff --git a/source/gnome/totem-pl-parser/FrugalBuild b/source/gnome/totem-pl-parser/FrugalBuild index d17b5d8..1eb0ad7 100644 --- a/source/gnome/totem-pl-parser/FrugalBuild +++ b/source/gnome/totem-pl-parser/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=totem-pl-parser -pkgver=2.22.3 +pkgver=2.24.0 pkgrel=1 url="http://www.gnome.org/" pkgdesc="Simple GObject-based library to parse a host of playlist formats, as well as save those" @@ -11,6 +11,6 @@ makedepends=('intltool' 'gnome-doc-utils') groups=('gnome') archs=('i686' 'x86_64' 'ppc') Finclude gnome -sha1sums=('65ec8c18384cb40fcbb006c948c9d6fad961b124') +sha1sums=('3e7d21b92b78f6b542bbfe6c95aec2d56b6b57ac') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:24 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:27:08 2008 Subject: [Frugalware-git] frugalware-current: nautilus-cd-burner-2.24.0-1-i686 Message-ID: <20081010132524.3D01D11901DA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c844554d1d5b8066619f9d07823e980ab8fcca3f commit c844554d1d5b8066619f9d07823e980ab8fcca3f Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Sep 30 21:25:53 2008 +0200 nautilus-cd-burner-2.24.0-1-i686 *version bump diff --git a/source/gnome/nautilus-cd-burner/FrugalBuild b/source/gnome/nautilus-cd-burner/FrugalBuild index f74819d..ba51248 100644 --- a/source/gnome/nautilus-cd-burner/FrugalBuild +++ b/source/gnome/nautilus-cd-burner/FrugalBuild @@ -2,17 +2,17 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=nautilus-cd-burner -pkgver=2.22.1 +pkgver=2.24.0 pkgrel=1 pkgdesc="An easy to use CD/DVD burning package for Nautilus" url="http://www.gnome.org/" -depends=('nautilus>=2.22.0' 'cdrtools') +depends=('nautilus>=2.24.0' 'cdrtools') makedepends=('intltool') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') _F_gnome_schemas=('/etc/gconf/schemas/nautilus-cd-burner.schemas') _F_gnome_iconcache="y" Finclude gnome gnome-scriptlet -sha1sums=('005d431f723e5b0b4af66ae049e00f8b2bc28546') +sha1sums=('2acf746c995f19c382c9a7a55a545edcfc8dc29e') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:24 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:27:10 2008 Subject: [Frugalware-git] frugalware-current: gnome-media-2.24.0.1-1-i686 Message-ID: <20081010132524.84EAB11904E3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=18cbea440ff7539020e223bfc8db7419bf50296a commit 18cbea440ff7539020e223bfc8db7419bf50296a Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Sep 30 22:52:08 2008 +0200 gnome-media-2.24.0.1-1-i686 *version bump diff --git a/source/gnome/gnome-media/FrugalBuild b/source/gnome/gnome-media/FrugalBuild index 8e36510..82a5985 100644 --- a/source/gnome/gnome-media/FrugalBuild +++ b/source/gnome/gnome-media/FrugalBuild @@ -2,23 +2,23 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=gnome-media -pkgver=2.22.0 +pkgver=2.24.0.1 pkgrel=1 pkgdesc="GNOME media tools" url="http://www.gnome.org/" -depends=('gst-plugins-good>=0.10.4-2' 'gail>=1.22.0' 'nautilus-cd-burner>=2.22.0' 'rarian>=0.8.0' \ - 'gst-plugins-base-oil' 'gst-plugins-good-gconf' 'gnome-vfs>=2.22.0') +depends=('gst-plugins-good>=0.10.4-2' 'gail>=1.22.0' 'nautilus-cd-burner>=2.24.0' 'rarian>=0.8.0' \ + 'gst-plugins-base-oil' 'gst-plugins-good-gconf' 'gnome-vfs>=2.24.0') makedepends=('intltool' 'gnome-doc-utils') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') -_F_gnome_schemas=('/etc/gconf/schemas/CDDB-Slave2.schemas' - '/etc/gconf/schemas/gnome-audio-profiles.schemas' - '/etc/gconf/schemas/gnome-cd.schemas' - '/etc/gconf/schemas/gnome-volume-control.schemas') +_F_gnome_iconcache="y" +_F_gnome_schemas=('/etc/gconf/schemas/gnome-volume-control.schemas' + '/etc/gconf/schemas/gnome-sound-recorder.schemas' + '/etc/gconf/schemas/gnome-audio-profiles.schemas') _F_gnome_desktop="y" _F_gnome_scrollkeeper="y" Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --enable-ipv6" -sha1sums=('9dc92fbde0dda0ef2e7028bf2b80f190b8b6b016') +sha1sums=('2704b4cd13b7f776a358e517a5baf5d97455b85b') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:24 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:27:11 2008 Subject: [Frugalware-git] frugalware-current: totem-2.24.0-1-i686 Message-ID: <20081010132524.5F6EA11901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a15a8145b897ba35dad9d8e653b560c478179f13 commit a15a8145b897ba35dad9d8e653b560c478179f13 Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Sep 30 21:52:16 2008 +0200 totem-2.24.0-1-i686 *version bump diff --git a/source/gnome/totem/FrugalBuild b/source/gnome/totem/FrugalBuild index cba2e4f..ca4f6e2 100644 --- a/source/gnome/totem/FrugalBuild +++ b/source/gnome/totem/FrugalBuild @@ -3,14 +3,14 @@ # Contributor: AlexExtreme <alex@alex-smith.me.uk> pkgname=totem -pkgver=2.22.2 -pkgrel=5 +pkgver=2.24.0 +pkgrel=1 pkgdesc="Movie player for GNOME based on Xine" depends=('libxi' 'libxtst' 'fontconfig' 'libstdc++' 'libxxf86vm' 'dbus-glib>=0.71' \ 'libxrandr' 'atk>=1.20.0' 'libsm' 'libxinerama' 'libmusicbrainz' 'nss>=3.12' 'avahi-glib>=0.6.19' \ - 'cairo>=1.4.0' 'libxcursor' 'gnome-desktop>=2.22.0' 'iso-codes' 'xine-lib' 'gnome-vfs>=2.22.0' \ + 'cairo>=1.4.0' 'libxcursor' 'gnome-desktop>=2.24.0' 'iso-codes' 'xine-lib' 'gnome-vfs>=2.24.0' \ 'shared-mime-info>=0.22' 'totem-pl-parser' 'heimdal>=1.2.1' 'db>=4.7.25') -makedepends=('intltool' "xulrunner" 'pango' 'nautilus>=2.22.0' \ +makedepends=('intltool' "xulrunner" 'pango' 'nautilus>=2.24.0' \ 'gnome-doc-utils') groups=('gnome') archs=('i686' 'x86_64' 'ppc') @@ -22,11 +22,11 @@ _F_gnome_scrollkeeper="y" _F_gnome_iconcache="y" Finclude gnome gnome-scriptlet url="http://www.gnome.org/projects/totem/" -sha1sums=('c552809554bf341bbe2e6cafd453e019efc7cb44') +sha1sums=('687e3ab4a6fb3689071168a26d4988e23ec12e76') subpkgs=('totem-nsplugin' 'totem-nautilus') subdescs=('Totem plugin for Firefox' 'Totem plugin for Nautilus') -subdepends=("xulrunner>=1.8.1.3 firefox>=3.0 $pkgname=$pkgver" "nautilus>=2.20.0 $pkgname=$pkgver") +subdepends=("xulrunner>=1.8.1.3 firefox>=3.0 $pkgname=$pkgver" "nautilus>=2.24.0 $pkgname=$pkgver") subgroups=('gnome' 'gnome') subarchs=('x86_64 i686 ppc' 'x86_64 i686 ppc') From bouleetbil at frogdev.info Fri Oct 10 15:25:24 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:27:12 2008 Subject: [Frugalware-git] frugalware-current: bug-buddy-2.24.0-1-i686 Message-ID: <20081010132524.9FEB411904E4@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a38625f8727411be5f17c0e3319c4518f47bd69c commit a38625f8727411be5f17c0e3319c4518f47bd69c Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Sep 30 23:20:16 2008 +0200 bug-buddy-2.24.0-1-i686 *version bump diff --git a/source/gnome/bug-buddy/FrugalBuild b/source/gnome/bug-buddy/FrugalBuild index c47d129..b8f84bb 100644 --- a/source/gnome/bug-buddy/FrugalBuild +++ b/source/gnome/bug-buddy/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=bug-buddy -pkgver=2.22.0 -pkgrel=4 +pkgver=2.24.0 +pkgrel=1 pkgdesc="A bug reporting tool for GNOME" -depends=('gnome-desktop>=2.22.0' 'gnome-menus>=2.22.0' 'rarian>=0.8.0' 'desktop-file-utils' \ - 'libsoup>=2.2.104-2' 'libgtop>=2.20.0' 'evolution-data-server>=2.22.1' 'libelf' \ +depends=('gnome-desktop>=2.24.0' 'gnome-menus>=2.24.0' 'rarian>=0.8.0' 'desktop-file-utils' \ + 'libsoup>=2.24.0.1-2' 'libgtop>=2.24.0' 'evolution-data-server>=2.24.0' 'libelf' \ 'heimdal>=1.2.1' 'db>=4.7.25') makedepends=('intltool' 'gnome-doc-utils>=0.12.2') groups=('gnome' 'gnome-minimal') @@ -16,6 +16,6 @@ _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" _F_gnome_iconcache="y" Finclude gnome gnome-scriptlet -sha1sums=('1fd3bd2b0e6160d0e2d9dee93cd49a4c3fa2770e') +sha1sums=('07bcf23ed32a5dd18b92d8855a5e5434dc675e31') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:24 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:27:14 2008 Subject: [Frugalware-git] frugalware-current: gnome-python-desktop-2.24.0-1-i686 Message-ID: <20081010132524.CCDD311904E5@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cf017852e33cdac56517c7289b08721d43b379e2 commit cf017852e33cdac56517c7289b08721d43b379e2 Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Sep 30 23:33:04 2008 +0200 gnome-python-desktop-2.24.0-1-i686 *version bump diff --git a/source/gnome/gnome-python-desktop/FrugalBuild b/source/gnome/gnome-python-desktop/FrugalBuild index fd1e123..ae639a0 100644 --- a/source/gnome/gnome-python-desktop/FrugalBuild +++ b/source/gnome/gnome-python-desktop/FrugalBuild @@ -3,13 +3,13 @@ # Former Maintainer: AlexExtreme <alex@alex-smith.me.uk> pkgname=gnome-python-desktop -pkgver=2.22.0 -pkgrel=2 +pkgver=2.24.0 +pkgrel=1 pkgdesc="Python bindings for GNOME desktop" url="http://www.pygtk.org/" -depends=('gnome-python>=2.22.0') -makedepends=('metacity>=2.22.0' 'gnome-media>=2.22.0' 'gnome-panel>=2.22.0' 'gtksourceview1' 'totem>=2.22.0' \ - 'libgtop>=2.22.0' 'bug-buddy>=2.22.0') +depends=('gnome-python>=2.22.1') +makedepends=('metacity>=2.24.0' 'gnome-media>=2.24.0' 'gnome-panel>=2.24.0' 'gtksourceview1' 'totem>=2.24.0' \ + 'libgtop>=2.24.0' 'bug-buddy>=2.24.0') groups=('gnome') archs=('i686' 'x86_64' 'ppc') Finclude gnome python @@ -105,5 +105,5 @@ build() { # ...phew! } -sha1sums=('6f1a93aacfc256ca878f8f3636a0270580d2354b') +sha1sums=('a47f2c87c2bde724d46a6464f8ccbcbeb7743ef5') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:24 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:27:15 2008 Subject: [Frugalware-git] frugalware-current: gedit-2.24.0-1-i686 Message-ID: <20081010132524.F233911901AB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3cdeeaceda345d8da2bd97545b7c4aae53c2cc64 commit 3cdeeaceda345d8da2bd97545b7c4aae53c2cc64 Author: bouleetbil <bouleetbil@frogdev.info> Date: Wed Oct 1 08:27:21 2008 +0200 gedit-2.24.0-1-i686 *version bump diff --git a/source/gnome/gedit/FrugalBuild b/source/gnome/gedit/FrugalBuild index a9095b2..6e717d6 100644 --- a/source/gnome/gedit/FrugalBuild +++ b/source/gnome/gedit/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=gedit -pkgver=2.22.3 +pkgver=2.24.0 pkgrel=1 pkgdesc="A text editor for GNOME" url="http://www.gnome.org/" depends=('rarian' 'desktop-file-utils' 'python>=2.5' 'gtksourceview>=2.2.1' 'dbus-glib>=0.74' 'enchant' 'iso-codes' 'libgnomeui') -makedepends=('intltool' 'gnome-doc-utils>=0.8.0' 'gnome-python-desktop-gtksourceview>=2.22.0' 'pygtksourceview>=2.2.0' 'gtk-doc') +makedepends=('intltool' 'gnome-doc-utils>=0.8.0' 'gnome-python-desktop-gtksourceview>=2.24.0' 'pygtksourceview>=2.2.0' 'gtk-doc') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') _F_gnome_schemas=('/etc/gconf/schemas/gedit.schemas' \ @@ -15,11 +15,11 @@ _F_gnome_schemas=('/etc/gconf/schemas/gedit.schemas' \ _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" Finclude gnome gnome-scriptlet -sha1sums=('3582e532c6c18f1b49b92878540484693976307b') +sha1sums=('a024a0bd15872628c5045e1093cb079859834b80') subpkgs=("$pkgname-python") subdescs=('gedit python plugins') -subdepends=("$pkgname=$pkgver gnome-python-desktop-gtksourceview>=2.20.0 pygtksourceview") +subdepends=("$pkgname=$pkgver gnome-python-desktop-gtksourceview>=2.24.0 pygtksourceview") subgroups=('gnome') subarchs=('i686 x86_64 ppc') From bouleetbil at frogdev.info Fri Oct 10 15:25:25 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:27:16 2008 Subject: [Frugalware-git] frugalware-current: sound-theme-freedesktop-1-1-i686 Message-ID: <20081010132525.2CF7311901F5@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ade82fdeb54fc24537621caddd65d7a87ee5092a commit ade82fdeb54fc24537621caddd65d7a87ee5092a Author: bouleetbil <bouleetbil@frogdev.info> Date: Wed Oct 1 19:09:08 2008 +0200 sound-theme-freedesktop-1-1-i686 *new package diff --git a/source/lib-extra/sound-theme-freedesktop/FrugalBuild b/source/lib-extra/sound-theme-freedesktop/FrugalBuild new file mode 100644 index 0000000..f76c66b --- /dev/null +++ b/source/lib-extra/sound-theme-freedesktop/FrugalBuild @@ -0,0 +1,19 @@ +# Compiling Time: 0 SBU +# Maintainer: bouleetbil <bouleetbil@frogdev.info> + +pkgname=sound-theme-freedesktop +pkgver=1 +pkgrel=1 +url="http://0pointer.de/lennart/projects/libcanberra/" +pkgdesc="The default freedesktop.org sound theme following the XDG theming." +groups=('lib-extra') +archs=('i686' 'x86_64') +depends=() +source=(http://0pointer.de/public/sound-theme-freedesktop.tar.gz) +up2date=$pkgver +sha1sums=('4897a8c786316ef529dca20c2185ccd395807f12') + +build(){ + Fmkdir /usr/share/sounds + Fcp freedesktop /usr/share/sounds/ +} From bouleetbil at frogdev.info Fri Oct 10 15:25:25 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:27:18 2008 Subject: [Frugalware-git] frugalware-current: gnome-control-center-2.24.0.1-2-i686 Message-ID: <20081010132525.5FFEB11904E6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=55e83630c4cc39a4cfb4f9cc68e82de581ff9a45 commit 55e83630c4cc39a4cfb4f9cc68e82de581ff9a45 Author: bouleetbil <bouleetbil@frogdev.info> Date: Wed Oct 1 19:23:34 2008 +0200 gnome-control-center-2.24.0.1-2-i686 *enable system sound default diff --git a/source/gnome/gnome-control-center/FrugalBuild b/source/gnome/gnome-control-center/FrugalBuild index 63d137e..64701b5 100644 --- a/source/gnome/gnome-control-center/FrugalBuild +++ b/source/gnome/gnome-control-center/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gnome-control-center pkgver=2.24.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME Control Center" depends=('gnome-desktop>=2.24.0' 'gnome-menus>=2.24.0' 'metacity>=2.24.0' 'libgnomekbd>=2.24.0' \ 'nautilus>=2.24.0' 'gst-plugins-base>=0.10.19-2' 'desktop-file-utils' \ @@ -11,7 +11,7 @@ depends=('gnome-desktop>=2.24.0' 'gnome-menus>=2.24.0' 'metacity>=2.24.0' 'libgn 'gnome-vfs>=2.24.0' 'gnome-panel>=2.24.0' 'heimdal>=1.2.1' 'db>=4.7.25' \ 'gnome-settings-daemon' 'libcanberra-gtk' 'libcanberra-alsa' 'libcanberra-gst') makedepends=('intltool' 'gnome-doc-utils>=0.12.2' 'gnome-common>=2.24.0') -rodepends=('gst-plugins-base-alsa>=0.10.19-2' 'gst-plugins-base-gnomevfs>=0.10.19-2') +rodepends=('gst-plugins-base-alsa>=0.10.19-2' 'gst-plugins-base-gnomevfs>=0.10.19-2' 'sound-theme-freedesktop') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') _F_gnome_schemas=('/etc/gconf/schemas/fontilus.schemas' \ From bouleetbil at frogdev.info Fri Oct 10 15:25:25 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:27:19 2008 Subject: [Frugalware-git] frugalware-current: gnome-session-2.24.0-3-i686 Message-ID: <20081010132525.9360911901F6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=986629d81398944a99d139bfb81e4ac0d8c22f92 commit 986629d81398944a99d139bfb81e4ac0d8c22f92 Author: bouleetbil <bouleetbil@frogdev.info> Date: Wed Oct 1 20:13:42 2008 +0200 gnome-session-2.24.0-3-i686 *delete useless patch *enable splash by default diff --git a/source/gnome/gnome-session/02-splash-disappear.patch b/source/gnome/gnome-session/02-splash-disappear.patch deleted file mode 100644 index a4c737a..0000000 --- a/source/gnome/gnome-session/02-splash-disappear.patch +++ /dev/null @@ -1,14 +0,0 @@ -http://bugzilla.gnome.org/show_bug.cgi?id=116814 - -diff -Naur gnome-session-2.8.1.orig/gnome-session/manager.c gnome-session-2.8.1/gnome-session/manager.c ---- gnome-session-2.8.1.orig/gnome-session/manager.c 2004-10-01 12:13:23.000000000 +0200 -+++ gnome-session-2.8.1/gnome-session/manager.c 2005-01-20 20:03:24.000000000 +0100 -@@ -1362,8 +1362,6 @@ - if (pending_list) - { - Client* client = (Client*)pending_list->data; -- if (client->match_rule != MATCH_PROP) -- goto out; - } - - if (start_list) diff --git a/source/gnome/gnome-session/09_splash_hide.patch b/source/gnome/gnome-session/09_splash_hide.patch deleted file mode 100644 index c4d8592..0000000 --- a/source/gnome/gnome-session/09_splash_hide.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -PruN gnome-session-2.8.1.orig/gnome-session/manager.c gnome-session-2.8.1/gnome-session/manager.c ---- gnome-session-2.8.1.orig/gnome-session/manager.c 2004-10-01 12:13:23.000000000 +0200 -+++ gnome-session-2.8.1/gnome-session/manager.c 2004-11-23 15:20:28.000000000 +0100 -@@ -1381,6 +1381,7 @@ - runlevel = client->priority; - } - if (pending_list) -+ splash_hide (); - goto out; - } - save_state = MANAGER_IDLE; -diff -PruN gnome-session-2.8.1.orig/gnome-session/splash-widget.c gnome-session-2.8.1/gnome-session/splash-widget.c ---- gnome-session-2.8.1.orig/gnome-session/splash-widget.c 2004-09-24 18:35:38.000000000 +0200 -+++ gnome-session-2.8.1/gnome-session/splash-widget.c 2004-11-23 15:19:57.000000000 +0100 -@@ -605,3 +605,10 @@ - } - } - -+void -+splash_hide (void) -+{ -+ if (global_splash) { -+ gtk_widget_hide (GTK_WIDGET (global_splash)); -+ } -+} -diff -PruN gnome-session-2.8.1.orig/gnome-session/splash-widget.h gnome-session-2.8.1/gnome-session/splash-widget.h ---- gnome-session-2.8.1.orig/gnome-session/splash-widget.h 2003-02-13 23:29:57.000000000 +0100 -+++ gnome-session-2.8.1/gnome-session/splash-widget.h 2004-11-23 15:18:45.000000000 +0100 -@@ -79,5 +79,6 @@ - void splash_start (void); - void splash_update (const gchar *text); - void splash_stop (void); -+void splash_hide (void); - - #endif /* SPLASH_WIDGET_H */ diff --git a/source/gnome/gnome-session/12_shaped_splash.patch b/source/gnome/gnome-session/12_shaped_splash.patch deleted file mode 100644 index 2316e91..0000000 --- a/source/gnome/gnome-session/12_shaped_splash.patch +++ /dev/null @@ -1,104 +0,0 @@ ---- gnome-session-2.12.0/gnome-session/splash-widget.h.shaped 2005-08-08 03:35:13.000000000 -0400 -+++ gnome-session-2.12.0/gnome-session/splash-widget.h 2006-01-12 02:19:59.000000000 -0500 -@@ -36,7 +36,6 @@ - GnomeIconTheme *icon_theme; - - GdkPixbuf *background; -- GdkPixmap *bg_pixmap; - GList *icons; - PangoLayout *layout; - PangoAttribute *font_size_attr; - ---- gnome-session-2.12.0/gnome-session/splash-widget.c.shaped 2006-01-12 02:19:59.000000000 -0500 -+++ gnome-session-2.12.0/gnome-session/splash-widget.c 2006-01-12 02:22:28.000000000 -0500 -@@ -137,16 +137,6 @@ - if (!GTK_WIDGET_DRAWABLE (widget)) - return FALSE; - -- if (gdk_rectangle_intersect ( -- &event->area, &sw->image_bounds, &exposed)) -- gdk_draw_drawable ( -- GDK_DRAWABLE (widget->window), -- widget->style->black_gc, -- GDK_DRAWABLE (sw->bg_pixmap), -- exposed.x, exposed.y, -- exposed.x, exposed.y, -- exposed.width, exposed.height); -- - for (l = sw->icons; l; l = l->next) { - SplashIcon *si = l->data; - -@@ -208,33 +218,42 @@ splash_widget_size_request (GtkWidget - static void - splash_widget_realize (GtkWidget *widget) - { -- GdkPixmap *pm; - SplashWidget *sw = (SplashWidget *) widget; - - GNOME_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget)); - - if (sw->background && widget->window) { -- int width, height; -+ GdkPixmap *pixmap; -+ GdkBitmap *mask; -+ GdkColormap *colormap; - -- width = gdk_pixbuf_get_width (sw->background); -- height = gdk_pixbuf_get_height (sw->background); -+ pixmap = NULL; -+ mask = NULL; - -- pm = gdk_pixmap_new ( -- widget->window, -- width, height, -- gdk_drawable_get_visual (widget->window)->depth); -+ colormap = gtk_widget_get_colormap (widget); -+ gdk_pixbuf_render_pixmap_and_mask_for_colormap (sw->background, -+ colormap, -+ &pixmap, &mask, -+ 125); - -- if (pm) { -- gdk_pixbuf_render_to_drawable ( -- sw->background, GDK_DRAWABLE (pm), -- widget->style->black_gc, -- 0, 0, 0, 0, width, height, -- GDK_RGB_DITHER_NORMAL, -- 0, 0); -- -- gdk_window_set_back_pixmap ( -- widget->window, pm, FALSE); -- sw->bg_pixmap = pm; -+ if (pixmap) { -+ GtkStyle *style; -+ -+ style = gtk_style_copy (widget->style); -+ style->bg_pixmap[GTK_STATE_NORMAL] = pixmap; -+ -+ gtk_widget_set_style (widget, style); -+ g_object_unref (style); -+ -+ if (mask) { -+ gdk_window_shape_combine_mask (widget->window, -+ mask, 0, 0); -+ -+ g_object_unref (mask); -+ } -+ -+ gtk_style_set_background (widget->style, widget->window, -+ GTK_STATE_NORMAL); - } - } - } -@@ -257,11 +256,6 @@ - { - SplashWidget *sw = (SplashWidget *) widget; - -- if (sw->bg_pixmap) { -- g_object_unref (sw->bg_pixmap); -- sw->bg_pixmap = NULL; -- } -- - GNOME_CALL_PARENT (GTK_WIDGET_CLASS, unrealize, (widget)); - } - diff --git a/source/gnome/gnome-session/19_gnome-wm-tweaking.patch b/source/gnome/gnome-session/19_gnome-wm-tweaking.patch deleted file mode 100644 index cde77b3..0000000 --- a/source/gnome/gnome-session/19_gnome-wm-tweaking.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur gnome-session-2.20.0.orig/gnome-session/gnome-wm gnome-session-2.20.0/gnome-session/gnome-wm ---- gnome-session-2.20.0.orig/gnome-session/gnome-wm 2007-09-24 19:55:59.000000000 +0200 -+++ gnome-session-2.20.0/gnome-session/gnome-wm 2007-09-24 19:59:19.000000000 +0200 -@@ -37,6 +37,11 @@ - esac - done - -+# Get previously set window manager in gconf -+if [ -z "$DEFWM" -o "x$DEFWM" = "xgnome-wm" ]; then -+ DEFWM=`gconftool-2 -g /desktop/gnome/applications/window_manager/default 2>/dev/null` -+fi -+ - # WINDOW_MANAGER overrides all - - if [ -z "$WINDOW_MANAGER" ] ; then -@@ -128,6 +133,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!" diff --git a/source/gnome/gnome-session/21_dont_grab_when_composited.patch b/source/gnome/gnome-session/21_dont_grab_when_composited.patch deleted file mode 100644 index 37d6eea..0000000 --- a/source/gnome/gnome-session/21_dont_grab_when_composited.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -ur gnome-session-2.16.0/gnome-session/logout.c gnome-session-2.16.0.patched/gnome-session/logout.c ---- gnome-session-2.16.0/gnome-session/logout.c 2006-09-29 18:30:17 +0100 -+++ gnome-session-2.16.0.patched/gnome-session/logout.c 2006-09-29 18:32:09 +0100 -@@ -796,8 +796,16 @@ - */ - if (!a11y_enabled && !getenv("LTSP_CLIENT")) - { -- XGrabServer (GDK_DISPLAY ()); -- gsm_foreach_screen (fadeout_screen); -+ Atom cmSnAtom; -+ Window currentCmSnOwner; -+ -+ cmSnAtom = XInternAtom (GDK_DISPLAY (), "_NET_WM_CM_S0", 0); -+ currentCmSnOwner = XGetSelectionOwner (GDK_DISPLAY (), cmSnAtom); -+ -+ if (currentCmSnOwner == None) { -+ XGrabServer (GDK_DISPLAY ()); -+ gsm_foreach_screen (fadeout_screen); -+ } - } - - gtk_widget_show_all (dialog->dialog); -@@ -823,8 +831,17 @@ - - if (!a11y_enabled && !getenv("LTSP_CLIENT")) - { -+ Atom cmSnAtom; -+ Window currentCmSnOwner; -+ - hide_fadeout_windows (); -- XUngrabServer (GDK_DISPLAY ()); -+ -+ cmSnAtom = XInternAtom (GDK_DISPLAY (), "_NET_WM_CM_S0", 0); -+ currentCmSnOwner = XGetSelectionOwner (GDK_DISPLAY (), cmSnAtom); -+ -+ if (currentCmSnOwner == None) { -+ XUngrabServer (GDK_DISPLAY ()); -+ } - - gdk_pointer_ungrab (GDK_CURRENT_TIME); - gdk_keyboard_ungrab (GDK_CURRENT_TIME); diff --git a/source/gnome/gnome-session/FrugalBuild b/source/gnome/gnome-session/FrugalBuild index 79eb231..1ac4395 100644 --- a/source/gnome/gnome-session/FrugalBuild +++ b/source/gnome/gnome-session/FrugalBuild @@ -5,7 +5,7 @@ pkgname=gnome-session pkgver=2.24.0 -pkgrel=2 +pkgrel=3 pkgdesc="GNOME session manager" depends=('libgnomeui>=2.24.0' 'gnome-desktop>=2.24.0' \ 'dbus-glib>=0.76' 'gnome-control-center>=2.24.0.1' 'gnome-vfs>=2.24.0' 'libnotify' 'gnome-keyring>=2.24.0') @@ -16,18 +16,15 @@ _F_gnome_schemas=('/etc/gconf/schemas/gnome-session.schemas') _F_gnome_iconcache="y" _F_gnome_desktop="y" Finclude gnome gnome-scriptlet -source=(${source[@]} 02-splash-disappear.patch \ - $pkgname http://ftp.frugalware.org/pub/other/artwork/gnome-theme/GNOME-Splash-1.0.png \ - 09_splash_hide.patch 19_gnome-wm-tweaking.patch) +source=(${source[@]} enable_splash.diff \ + $pkgname http://ftp.frugalware.org/pub/other/artwork/gnome-theme/GNOME-Splash-1.0.png ) sha1sums=('5a4b329db62ae3518029982ae86fb1b138500c3e' \ - 'd45d51203dc7ad290b12bc70281d59844a79be75' \ + '5a63c81ad2ecd0d29aa33c73d2717dcd1774333e' \ '047ac00bb24d52986aac94e232b4b40fa122f582' \ - '222c9a2fd01872acc2fb69c17e9771cde2e1e5a2' \ - '97585abf9d468e532422af3daceb42b61d832a13' \ - 'a69fefc4ee7f11ee1be13f61a4f7c711f3390c80') + '222c9a2fd01872acc2fb69c17e9771cde2e1e5a2') build() { - #Fpatchall + Fpatchall Fmake --disable-schemas-install Fmakeinstall GCONF_DISABLE_SCHEMA_INSTALL=1 Fbuild_gnome_scriptlet diff --git a/source/gnome/gnome-session/enable_splash.diff b/source/gnome/gnome-session/enable_splash.diff new file mode 100644 index 0000000..d9c897e --- /dev/null +++ b/source/gnome/gnome-session/enable_splash.diff @@ -0,0 +1,11 @@ +--- gnome-session-2.24.0old/data/gnome-session.schemas.in 2008-09-22 23:21:08.000000000 +0200 ++++ gnome-session-2.24.0/data/gnome-session.schemas.in 2008-10-01 16:39:35.000000000 +0200 +@@ -7,7 +7,7 @@ + <applyto>/apps/gnome-session/options/show_splash_screen</applyto> + <owner>gnome</owner> + <type>bool</type> +- <default>false</default> ++ <default>true</default> + <locale name="C"> + <short>Show the splash screen</short> + <long>Show the splash screen when the session starts up</long> From bouleetbil at frogdev.info Fri Oct 10 15:25:25 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:27:20 2008 Subject: [Frugalware-git] frugalware-current: gnome-menus-2.24.0-2-i686 Message-ID: <20081010132525.C734B11904E9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d068949e77744eba1fa244fccea6a96543f0c3e2 commit d068949e77744eba1fa244fccea6a96543f0c3e2 Author: bouleetbil <bouleetbil@frogdev.info> Date: Wed Oct 1 20:23:22 2008 +0200 gnome-menus-2.24.0-2-i686 *fixe broken submenu diff --git a/source/gnome/gnome-menus/FrugalBuild b/source/gnome/gnome-menus/FrugalBuild index 36195de..8b2cddf 100644 --- a/source/gnome/gnome-menus/FrugalBuild +++ b/source/gnome/gnome-menus/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gnome-menus pkgver=2.24.0 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME menus and menu editor" depends=('gamin>=0.1.9-3' 'pygtk>=2.12.1-2') makedepends=('intltool') @@ -12,9 +12,9 @@ replaces=('gnome-main-menu') archs=('i686' 'x86_64' 'ppc') Finclude gnome Fsysconfdir="/etc/gnome" -Fconfopts="$Fconfopts --enable-python --enable-debug=no --enable-inotify" +Fconfopts="$Fconfopts --enable-python --enable-debug=no" source=(${source[@]} $pkgname-2.18.0-categorize-prefs-menu.patch) sha1sums=('29c55f48a576216489ce139aa9c1bedf43394de1' \ - 'fa6cec3a8d11a35e0436b54038193f8e4c3b143f') + '1b397c1eaee3b6dda7460c0b00092b10abf521d4') # optimization OK diff --git a/source/gnome/gnome-menus/gnome-menus-2.18.0-categorize-prefs-menu.patch b/source/gnome/gnome-menus/gnome-menus-2.18.0-categorize-prefs-menu.patch index e4b0d85..856a31b 100644 --- a/source/gnome/gnome-menus/gnome-menus-2.18.0-categorize-prefs-menu.patch +++ b/source/gnome/gnome-menus/gnome-menus-2.18.0-categorize-prefs-menu.patch @@ -9,29 +9,47 @@ diff -Naur gnome-menus-2.20.0.orig/desktop-directories/Hardware.directory.in gno +Icon=system Type=Directory Encoding=UTF-8 ---- gnome-menus-2.24.0old/layout/applications.menu 2008-09-22 23:10:56.000000000 +0200 -+++ gnome-menus-2.24.0/layout/applications.menu 2008-09-29 20:40:30.000000000 +0200 -@@ -18,6 +18,16 @@ - <!-- Read in overrides and child menus from applications-merged/ --> - <DefaultMergeDirs/> - -+ <!-- Sort the control center categories --> -+ <Layout> -+ <Menuname>Personal</Menuname> -+ <Menuname>Look and Feel</Menuname> -+ <Menuname>Internet and Network</Menuname> -+ <Menuname>Hardware</Menuname> -+ <Menuname>System</Menuname> -+ <Merge type="all" /> -+ </Layout> -+ - <!-- Accessories submenu --> - <Menu> - <Name>Accessories</Name> -@@ -137,6 +147,55 @@ +--- gnome-menus-2.24.0old/layout/settings.menu 2008-09-22 23:10:56.000000000 +0200 ++++ gnome-menus-2.24.0/layout/settings.menu 2008-10-01 13:06:11.000000000 +0200 +@@ -28,6 +28,11 @@ + <Not> + <Or> + <Category>System</Category> ++ <Category>X-GNOME-PersonalSettings</Category> ++ <Category>DesktopSettings</Category> ++ <Category>X-GNOME-NetworkSettings</Category> ++ <Category>HardwareSettings</Category> ++ <Category>X-GNOME-SystemSettings</Category> + <Filename>gnomecc.desktop</Filename> + </Or> + </Not> +@@ -47,6 +52,81 @@ </Include> - </Menu> <!-- End System Tools --> + </Menu> <!-- End System Settings --> ++ <!-- Personal Submenu --> ++ <Menu> ++ <Name>Personal</Name> ++ <Directory>Personal.directory</Directory> ++ <Include> ++ <And> ++ <Category>Settings</Category> ++ <Category>X-GNOME-PersonalSettings</Category> ++ </And> ++ </Include> ++ </Menu> <!-- End Personal --> ++ ++ <Menu> ++ <Name>Look and Feel</Name> ++ <Directory>LookAndFeel.directory</Directory> ++ <Include> ++ <And> ++ <Category>Settings</Category> ++ <Category>DesktopSettings</Category> ++ </And> ++ </Include> ++ </Menu> ++ + <!-- Internet and Network submenu --> + <Menu> + <Name>Internet and Network</Name> @@ -81,8 +99,9 @@ diff -Naur gnome-menus-2.20.0.orig/desktop-directories/Hardware.directory.in gno + </Include> + </Menu> <!-- End System --> + - <!-- Other --> - <Menu> - <Name>Other</Name> - - ++ ++ ++ + <Layout> + <Menuname>Preferences</Menuname> + <Menuname>Administration</Menuname> From bouleetbil at frogdev.info Fri Oct 10 15:25:26 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:27:22 2008 Subject: [Frugalware-git] frugalware-current: gnome-settings-daemon-2.24.0-2-i686 Message-ID: <20081010132526.11F3111904EB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0a56d94606dc31962b8aca66932e826699b6b366 commit 0a56d94606dc31962b8aca66932e826699b6b366 Author: bouleetbil <bouleetbil@frogdev.info> Date: Wed Oct 1 21:29:50 2008 +0200 gnome-settings-daemon-2.24.0-2-i686 *fixe launch gnome-setting-daemon to startup *fixe _F_gnome_schemas diff --git a/source/gnome/gnome-settings-daemon/FrugalBuild b/source/gnome/gnome-settings-daemon/FrugalBuild index f2c8121..d706070 100644 --- a/source/gnome/gnome-settings-daemon/FrugalBuild +++ b/source/gnome/gnome-settings-daemon/FrugalBuild @@ -3,17 +3,17 @@ pkgname=gnome-settings-daemon pkgver=2.24.0 -pkgrel=1 +pkgrel=2 pkgdesc="Utility library for accessing gnome-settings-daemon over DBUS" depends=('libgnomekbd' 'esd' 'gst-plugins-base' 'libgnomeui' 'libxxf86misc' 'gnome-desktop' 'gconf' 'alsa-lib') makedepends=('intltool' 'gtk-doc>=1.9' 'gnome-doc-utils>=0.12.2') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') -_F_gnome_schemas=('/etc/gconf/schemas/gnome-settings-daemon.schemas' - '/etc/gconf/schemas/desktop_gnome_font_rendering.schemas' - '/etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas' - '/etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas') -_F_gnome_entries=('/etc/gconf/schemas/panel-default-setup.entries') +_F_gnome_schemas=('/etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas' \ + '/etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas' \ + '/etc/gconf/schemas/apps_gnome_settings_daemon_xrandr.schemas' \ + '/etc/gconf/schemas/desktop_gnome_font_rendering.schemas' \ + '/etc/gconf/schemas/gnome-settings-daemon.schemas') _F_gnome_scrollkeeper="y" _F_gnome_iconcache="y" Finclude gnome gnome-scriptlet @@ -22,4 +22,11 @@ sha1sums=('7d95a7550c465c9a64e4bda64331c92069958bfd' \ 'eb601b6406db7700c12d6b144eacbbdc7c4a780e') Fconfopts="$Fconfopts --enable-gstreamer" +build(){ + Fbuild + Fbuild_gnome_scriptlet + Fmkdir usr/share/gnome/autostart + Fcprel $Fdestdir/etc/xdg/autostart/gnome-settings-daemon.desktop usr/share/gnome/autostart/gnome-settings-daemon.desktop +} + # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:26 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:27:23 2008 Subject: [Frugalware-git] frugalware-current: eog-2.24.0-1-i686 Message-ID: <20081010132526.3C63211904F6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f7bb1c375e6b8691b2b80d55f66839cb253cd9bc commit f7bb1c375e6b8691b2b80d55f66839cb253cd9bc Author: bouleetbil <bouleetbil@frogdev.info> Date: Wed Oct 1 21:41:15 2008 +0200 eog-2.24.0-1-i686 *version bump diff --git a/source/gnome/eog/FrugalBuild b/source/gnome/eog/FrugalBuild index 8123302..ac93d99 100644 --- a/source/gnome/eog/FrugalBuild +++ b/source/gnome/eog/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=eog -pkgver=2.22.2 +pkgver=2.24.0 pkgrel=1 pkgdesc="An image viewing and cataloging program for GNOME" -depends=('libexif' 'libgnomeui>=2.22.1' 'rarian' 'desktop-file-utils' \ - 'gnome-desktop>=2.22.2' 'lcms' 'pygtk' 'gnome-python' 'libart_lgpl') +depends=('libexif' 'libgnomeui>=2.24.0' 'rarian' 'desktop-file-utils' \ + 'gnome-desktop>=2.24.0' 'lcms' 'pygtk' 'gnome-python' 'libart_lgpl') makedepends=('intltool' 'gnome-doc-utils>=0.12.2') groups=('gnome') archs=('i686' 'x86_64' 'ppc') @@ -15,6 +15,6 @@ _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" _F_gnome_iconcache="y" Finclude gnome gnome-scriptlet -sha1sums=('b9091c25b31fea262c9557d1148f5e6d4af08f9e') +sha1sums=('a36bcd101e19046f8b04b4f87dfa6a468c385b92') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:26 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:27:24 2008 Subject: [Frugalware-git] frugalware-current: gconf-editor-2.24.0.1-1-i686 Message-ID: <20081010132526.566C811901A5@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c97280cb912964839f8a540190e8a2cf3a0ba702 commit c97280cb912964839f8a540190e8a2cf3a0ba702 Author: bouleetbil <bouleetbil@frogdev.info> Date: Wed Oct 1 21:51:48 2008 +0200 gconf-editor-2.24.0.1-1-i686 *version bump diff --git a/source/gnome/gconf-editor/FrugalBuild b/source/gnome/gconf-editor/FrugalBuild index 8ec6df2..f2afabd 100644 --- a/source/gnome/gconf-editor/FrugalBuild +++ b/source/gnome/gconf-editor/FrugalBuild @@ -2,18 +2,19 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=gconf-editor -pkgver=2.22.0 +pkgver=2.24.0.1 pkgrel=1 pkgdesc="An editor for the GConf configuration system" url="http://www.gnome.org/" -depends=('libgnomeui>=2.22.0' 'rarian') +depends=('libgnomeui>=2.24.0' 'rarian') makedepends=('intltool' 'gnome-doc-utils>=0.10.1' 'perl-xml-parser') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') _F_gnome_schemas=('/etc/gconf/schemas/gconf-editor.schemas') _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" +_F_gnome_iconcache="y" Finclude gnome gnome-scriptlet +sha1sums=('090e80d050a9c4bb67361575e838cf0b8e3d978e') -sha1sums=('7ca44dbb09136203b37d7dd5398b62bcf15ee528') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:26 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:27:26 2008 Subject: [Frugalware-git] frugalware-current: gnome-utils-2.24.0-1-i686 Message-ID: <20081010132526.95EF611904EA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e0be175587addc771959fdafb0d7da1ca50b563d commit e0be175587addc771959fdafb0d7da1ca50b563d Author: bouleetbil <bouleetbil@frogdev.info> Date: Wed Oct 1 22:05:52 2008 +0200 gnome-utils-2.24.0-1-i686 *version bump diff --git a/source/gnome/gnome-utils/FrugalBuild b/source/gnome/gnome-utils/FrugalBuild index 3f2417e..f49d2cf 100644 --- a/source/gnome/gnome-utils/FrugalBuild +++ b/source/gnome/gnome-utils/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=gnome-utils -pkgver=2.20.0.1 -pkgrel=3 +pkgver=2.24.0 +pkgrel=1 pkgdesc="GNOME utilities" url="http://www.gnome.org/" -depends=('libgnomeprintui>=2.18.0' 'gnome-panel>=2.22.0' 'e2fsprogs' 'rarian' \ - 'desktop-file-utils' 'hal>=0.5.8.1-4' 'libgtop>=2.22.0' 'gnome-vfs>=2.22.0' \ +depends=('libgnomeprintui>=2.18.0' 'gnome-panel>=2.24.0' 'e2fsprogs' 'rarian' \ + 'desktop-file-utils' 'hal>=0.5.8.1-4' 'libgtop>=2.24.0' 'gnome-vfs>=2.24.0' \ 'dbus-glib>=0.71' 'avahi-glib>=0.6.17') makedepends=('intltool' 'gnome-doc-utils>=0.10.0' 'gtk-doc') groups=('gnome' 'gnome-minimal') @@ -25,5 +25,5 @@ _F_gnome_iconcache="y" Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --enable-hal --enable-ipv6 --disable-gtk-doc --enable-gfloppy=yes" -sha1sums=('21aedfa39d2b937cf6e2ad697378dbecbe838dc7') +sha1sums=('82144b0804b9f612eaec818a9acfdbe149d9c894') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:26 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:27:27 2008 Subject: [Frugalware-git] frugalware-current: gnome-system-monitor-2.24.0-1-i686 Message-ID: <20081010132526.C307A11904E7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cf6716f824d3a9aa25ebbc85d7cb5d7e810e92eb commit cf6716f824d3a9aa25ebbc85d7cb5d7e810e92eb Author: bouleetbil <bouleetbil@frogdev.info> Date: Wed Oct 1 22:17:09 2008 +0200 gnome-system-monitor-2.24.0-1-i686 *version bump diff --git a/source/gnome/gnome-system-monitor/FrugalBuild b/source/gnome/gnome-system-monitor/FrugalBuild index c301ec4..1d36efd 100644 --- a/source/gnome/gnome-system-monitor/FrugalBuild +++ b/source/gnome/gnome-system-monitor/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=gnome-system-monitor -pkgver=2.22.3 +pkgver=2.24.0 pkgrel=1 pkgdesc="A system monitor for GNOME" url="http://www.gnome.org/" -depends=('libgnomeui>=2.22.1' 'libgtop>=2.22.3' 'libwnck>=2.22.3' \ +depends=('libgnomeui>=2.24.0' 'libgtop>=2.24.0' 'libwnck>=2.22.3' \ 'rarian' 'libgksu>=2.0.6' 'libsexy' 'gnome-icon-theme' 'pcre' 'gtkmm>=2.12.7' 'librsvg') makedepends=('intltool' 'gnome-doc-utils>=0.12.2') groups=('gnome' 'gnome-minimal') @@ -15,6 +15,6 @@ _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" _F_gnome_schemas=('/etc/gconf/schemas/gnome-system-monitor.schemas') Finclude gnome gnome-scriptlet -sha1sums=('6778d4dfa3b3f555d98d14c6f24a1f6f74befe9f') +sha1sums=('fb999996b2838b49977b5ee6600cf9a986bbbab7') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:28 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:27:29 2008 Subject: [Frugalware-git] frugalware-current: gcalctool-5.24.0-1-i686 Message-ID: <20081010132528.ED79F1190503@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=97cff49df27ef0594f625c9271d6ddcb8965ddf2 commit 97cff49df27ef0594f625c9271d6ddcb8965ddf2 Author: bouleetbil <bouleetbil@frogdev.info> Date: Wed Oct 1 22:23:15 2008 +0200 gcalctool-5.24.0-1-i686 *version bump diff --git a/source/gnome/gcalctool/FrugalBuild b/source/gnome/gcalctool/FrugalBuild index 2eee91c..53d462b 100644 --- a/source/gnome/gcalctool/FrugalBuild +++ b/source/gnome/gcalctool/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=gcalctool -pkgver=5.22.1 +pkgver=5.24.0 pkgrel=1 pkgdesc="A scientific calculator for GNOME" url="http://www.gnome.org/" -depends=('rarian' 'libbonobo>=2.22.0' 'gtk+2>=2.12.9' 'gconf>=2.22.0' 'libglade') +depends=('rarian' 'libbonobo>=2.24.0' 'gtk+2>=2.14.3' 'gconf>=2.24.0' 'libglade') makedepends=('intltool' 'gnome-doc-utils>=0.10.0') groups=('gnome') archs=('i686' 'x86_64' 'ppc') @@ -14,6 +14,6 @@ _F_gnome_schemas=('/etc/gconf/schemas/gcalctool.schemas') _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" Finclude gnome gnome-scriptlet -sha1sums=('8436067dfb3e91338abf236c4b229ae435aa3681') +sha1sums=('f3379dbeddbb9582f9fd60497ab7d85094f52602') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:29 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:27:30 2008 Subject: [Frugalware-git] frugalware-current: zenity-2.24.0-1-i686 Message-ID: <20081010132529.63D9C11904FC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4f328b53792b0893a0dac155c5e997847b1bc9ef commit 4f328b53792b0893a0dac155c5e997847b1bc9ef Author: bouleetbil <bouleetbil@frogdev.info> Date: Wed Oct 1 22:27:09 2008 +0200 zenity-2.24.0-1-i686 *version bump diff --git a/source/gnome/zenity/FrugalBuild b/source/gnome/zenity/FrugalBuild index 89f6d9c..cd61eef 100644 --- a/source/gnome/zenity/FrugalBuild +++ b/source/gnome/zenity/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=zenity -pkgver=2.22.1 +pkgver=2.24.0 pkgrel=1 pkgdesc="A rewrite of gdialog" url="http://www.gnome.org/" @@ -13,6 +13,6 @@ groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') _F_gnome_scrollkeeper="y" Finclude gnome gnome-scriptlet +sha1sums=('f0e7239e8934de89f9722fbbb2b1e7fb636afd0d') -sha1sums=('776c5c84ad07bb87ba2f796ace8268aa298b0819') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:29 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:27:31 2008 Subject: [Frugalware-git] frugalware-current: at-spi-1.24.0-1-i686 Message-ID: <20081010132529.749CF11901F8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=437ce439e48a9efed020f99efd2dd2725b99fc63 commit 437ce439e48a9efed020f99efd2dd2725b99fc63 Author: bouleetbil <bouleetbil@frogdev.info> Date: Wed Oct 1 22:33:45 2008 +0200 at-spi-1.24.0-1-i686 *version bump diff --git a/source/gnome/at-spi/FrugalBuild b/source/gnome/at-spi/FrugalBuild index 79125e5..b12439d 100644 --- a/source/gnome/at-spi/FrugalBuild +++ b/source/gnome/at-spi/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=at-spi -pkgver=1.22.1 +pkgver=1.24.0 pkgrel=1 pkgdesc="The Gnome Accessibility Toolkit" -depends=('gtk+2>=2.12.9' 'gail>=1.22.1' 'libbonobo>=2.22.0' 'libxtst' 'libxevie') -makedepends=('gtk-doc' 'perl-xml-parser') +depends=('gtk+2>=2.14.3' 'gail>=1.22.1' 'libbonobo>=2.22.0' 'libxtst' 'libxevie') +makedepends=('gtk-doc' 'perl-xml-parser' 'intltool') groups=('gnome') archs=('i686' 'x86_64' 'ppc') Finclude gnome url="http://developer.gnome.org/projects/gap/" Fconfopts="$Fconfopts --enable-gtk-doc" +sha1sums=('9c1349e27617d7a2006e76101e5b12c721e07e1a') -sha1sums=('b7dca093dbe9617e65a0c44ec0e255700a2ab048') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:32 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:03 2008 Subject: [Frugalware-git] frugalware-current: gtkhtml-3.24.0-1-i686 Message-ID: <20081010132532.DE5C4119053E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=91fd9cf5fc7721b40b1d7fa195b9216369095a25 commit 91fd9cf5fc7721b40b1d7fa195b9216369095a25 Author: bouleetbil <bouleetbil@frogdev.info> Date: Thu Oct 2 05:59:07 2008 +0200 gtkhtml-3.24.0-1-i686 *version bump diff --git a/source/gnome/gtkhtml/FrugalBuild b/source/gnome/gtkhtml/FrugalBuild index 4a7c6c8..022beb8 100644 --- a/source/gnome/gtkhtml/FrugalBuild +++ b/source/gnome/gtkhtml/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=gtkhtml -pkgver=3.18.1 +pkgver=3.24.0 pkgrel=1 pkgdesc="A lightweight HTML rendering/printing/editing engine" -depends=('gail>=1.20.1' 'libgnomeui>=2.22.0' \ - 'libsoup>=2.4.1' 'gnome-icon-theme>=2.22.0' \ - 'libbonobo>=2.22.0') +depends=('gail>=1.20.1' 'libgnomeui>=2.24.0' \ + 'libsoup>=2.24.0.1-2' 'gnome-icon-theme>=2.24.0' \ + 'libbonobo>=2.24.0' 'enchant' 'iso-codes') makedepends=('intltool') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') Finclude gnome +sha1sums=('df1f0cf1420d28193540c68a9a945f046d427e87') -sha1sums=('6f2310fd7ef392941593f873e3181827705f6021') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:33 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:08 2008 Subject: [Frugalware-git] frugalware-current: sound-juicer-2.24.0-1-i686 Message-ID: <20081010132533.168771190540@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4435d7f9737b910ac5d44bd05ae3c19ea330cca3 commit 4435d7f9737b910ac5d44bd05ae3c19ea330cca3 Author: bouleetbil <bouleetbil@frogdev.info> Date: Thu Oct 2 06:19:53 2008 +0200 sound-juicer-2.24.0-1-i686 *version bump diff --git a/source/gnome-extra/sound-juicer/FrugalBuild b/source/gnome-extra/sound-juicer/FrugalBuild index 8e3c561..3767fa2 100644 --- a/source/gnome-extra/sound-juicer/FrugalBuild +++ b/source/gnome-extra/sound-juicer/FrugalBuild @@ -3,13 +3,13 @@ # Contributor: DNAku <DNAku@frugalware.org> pkgname=sound-juicer -pkgver=2.22.0 +pkgver=2.24.0 pkgrel=1 pkgdesc="Sound Juicer is a CD ripper for GNOME 2" -depends=('libstdc++' 'libcdio' 'gnome-media>=2.20.1' 'gst-plugins-base' 'gst-plugins-good' 'libmusicbrainz' 'taglib' \ +depends=('libstdc++' 'libcdio' 'gnome-media>=2.24.0.1' 'gst-plugins-base' 'gst-plugins-good' 'libmusicbrainz' 'taglib' \ 'gst-plugins-base-cdparanoia' 'gst-plugins-base-gnomevfs' 'gst-plugins-good-flac' 'gst-plugins-base-pango' \ gst-plugins-base-vorbis) -makedepends=('gnome-doc-utils' 'perl-xml-parser') +makedepends=('gnome-doc-utils' 'perl-xml-parser' 'intltool') groups=('gnome-extra') archs=('i686' 'x86_64') _F_gnome_schemas=('/etc/gconf/schemas/sound-juicer.schemas') @@ -19,7 +19,13 @@ _F_gnome_iconcache="y" options=('scriptlet') Finclude gnome gnome-scriptlet url="http://www.burtonini.com/blog/computers/sound-juicer" -sha1sums=('d710d2041f4214a80387d6518056856c6401719a') -unset MAKEFLAGS +sha1sums=('f1b0e44d8947b0391a6dda97f18a21fe227ea699') + +build() { + unset MAKEFLAGS + Fsed "SUBDIRS = po data libjuicer src tests help" "SUBDIRS = po data libjuicer src tests" Makefile.* + Fbuild + Fbuild_gnome_scriptlet +} # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:33 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:10 2008 Subject: [Frugalware-git] frugalware-current: evince-2.24.0-1-i686 Message-ID: <20081010132533.96C201190927@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5785654df3b6315664467d2e3d1a9b4086b856f7 commit 5785654df3b6315664467d2e3d1a9b4086b856f7 Author: bouleetbil <bouleetbil@frogdev.info> Date: Thu Oct 2 06:48:53 2008 +0200 evince-2.24.0-1-i686 *version bump diff --git a/source/gnome/evince/FrugalBuild b/source/gnome/evince/FrugalBuild index 09e5933..53b330d 100644 --- a/source/gnome/evince/FrugalBuild +++ b/source/gnome/evince/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=evince -pkgver=2.22.2 +pkgver=2.24.0 pkgrel=1 pkgdesc="A document viewer for GNOME" -depends=('libgnomeui>=2.22.1' 'poppler-glib>=0.8.2' 'ghostscript' 'rarian' 'desktop-file-utils' \ +depends=('libgnomeui>=2.24.0' 'poppler-glib>=0.8.2' 'ghostscript' 'rarian' 'desktop-file-utils' \ 't1lib' 'dbus-glib>=0.76' 'tetex-kpathsea' 'djvulibre') -makedepends=('intltool' 'gnome-doc-utils' 'perl-xml-parser' 'tetex' 'nautilus>=2.22.3') +makedepends=('intltool' 'gnome-doc-utils' 'perl-xml-parser' 'tetex' 'nautilus>=2.24.0') replaces=('gpdf') groups=('gnome') archs=('i686' 'x86_64' 'ppc') @@ -22,11 +22,11 @@ _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" Finclude gnome gnome-scriptlet url="http://www.gnome.org/projects/evince/" -sha1sums=('c1be08426c8d7220021d20502a7ffafbe82108b4') +sha1sums=('125e4a3a88daa742cd7f12c09eb21187071c94cb') subpkgs=('evince-nautilus') subdescs=('Evince plugin for Nautilus') -subdepends=("nautilus>=2.20.0 $pkgname=$pkgver") +subdepends=("nautilus>=2.24.0 $pkgname=$pkgver") subgroups=('gnome') subarchs=('x86_64 i686 ppc') From bouleetbil at frogdev.info Fri Oct 10 15:25:33 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:11 2008 Subject: [Frugalware-git] frugalware-current: empathy-2.24.0-1-i686 Message-ID: <20081010132533.3AB561190542@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2c279d43455c74676c838894b4dc91c78685dcd6 commit 2c279d43455c74676c838894b4dc91c78685dcd6 Author: bouleetbil <bouleetbil@frogdev.info> Date: Thu Oct 2 06:33:54 2008 +0200 empathy-2.24.0-1-i686 *version bump diff --git a/source/gnome-extra/empathy/FrugalBuild b/source/gnome-extra/empathy/FrugalBuild index 4b7e56a..be93efb 100644 --- a/source/gnome-extra/empathy/FrugalBuild +++ b/source/gnome-extra/empathy/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil <bouleetbil@frogdev.info> pkgname=empathy -pkgver=0.23.4 +pkgver=2.24.0 pkgrel=1 pkgdesc="Empathy consists of a rich set of reusable instant messaging widgets" depends=('gconf' 'telepathy-glib' 'libxml2' 'enchant' \ @@ -20,11 +20,10 @@ _F_gnome_desktop="y" _F_gnome_schemas=('/etc/gconf/schemas/empathy.schemas'\ '/etc/gconf/schemas/GNOME_Megaphone_Applet.schemas') Finclude gnome gnome-scriptlet -sha1sums=('fc90f970fad3dc04b210d93e11003b32c13d033c') Fconfopts="${Fconfopts[@]} --enable-python=yes --enable-gtk-doc \ --disable-scrollkeeper --enable-spell=yes \ --enable-megaphone=yes --enable-nothere=yes" -sha1sums=('fc90f970fad3dc04b210d93e11003b32c13d033c') +sha1sums=('6a293f0dbd9ac12d3cf1e58132ae7641f710cf75') build() { Fcd From bouleetbil at frogdev.info Fri Oct 10 15:25:33 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:13 2008 Subject: [Frugalware-git] frugalware-current: gnome-sharp-2.24.0-1-i686 Message-ID: <20081010132534.00A73119021A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=64efa5cc89f92d4636bccf41f2574d4653cc98c0 commit 64efa5cc89f92d4636bccf41f2574d4653cc98c0 Author: bouleetbil <bouleetbil@frogdev.info> Date: Thu Oct 2 22:01:15 2008 +0200 gnome-sharp-2.24.0-1-i686 *version bump diff --git a/source/gnome/gnome-sharp/FrugalBuild b/source/gnome/gnome-sharp/FrugalBuild index b14c79f..5332742 100644 --- a/source/gnome/gnome-sharp/FrugalBuild +++ b/source/gnome/gnome-sharp/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: AlexExtreme <alex@alex-smith.me.uk> pkgname=gnome-sharp -pkgver=2.20.1 +pkgver=2.24.0 pkgrel=1 pkgdesc="C# bindings for the Gnome desktop" url="http://www.gnome.org" -depends=('gtk2-sharp>=2.12.1' 'libart_lgpl' 'gnome-vfs>=2.22.0' 'libgnomecanvas>=2.20.1.1-2' \ - 'gnome-panel>=2.22.1.1' 'libgnomeprintui>=2.18.2-2') +depends=('gtk2-sharp>=2.12.4' 'libart_lgpl' 'gnome-vfs>=2.24.0' 'libgnomecanvas>=2.20.1.1-2' \ + 'gnome-panel>=2.24.0' 'libgnomeprintui>=2.18.2-2') groups=('gnome') archs=('i686' 'x86_64' 'ppc') _F_mono_aot=0 Finclude gnome mono -sha1sums=('84e2a9c71aee7d18f3afe7b0a96046932d269523') +sha1sums=('7cb0607e19019771ec707df1bcd2b5b71d835c54') unset MAKEFLAGS From bouleetbil at frogdev.info Fri Oct 10 15:25:33 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:14 2008 Subject: [Frugalware-git] frugalware-current: gtk2-sharp-2.12.4-1-i686 Message-ID: <20081010132533.BAB8D119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=95cb8deb9b5b92fe9669d35a3ce26625c52a72b2 commit 95cb8deb9b5b92fe9669d35a3ce26625c52a72b2 Author: bouleetbil <bouleetbil@frogdev.info> Date: Thu Oct 2 21:48:52 2008 +0200 gtk2-sharp-2.12.4-1-i686 *version bump diff --git a/source/gnome/gtk2-sharp/FrugalBuild b/source/gnome/gtk2-sharp/FrugalBuild index 86878a4..7dae4ed 100644 --- a/source/gnome/gtk2-sharp/FrugalBuild +++ b/source/gnome/gtk2-sharp/FrugalBuild @@ -3,11 +3,11 @@ pkgname=gtk2-sharp _F_gnome_name=gtk-sharp -pkgver=2.12.1 +pkgver=2.12.4 pkgrel=1 pkgdesc="A C# language binding for the GTK+2 toolkit" url="http://www.mono-project.com/GtkSharp" -depends=('mono>=1.9' 'gtk+2>=2.12.9' 'libglade' 'libxdamage') +depends=('mono>=1.9' 'gtk+2>=2.14.3' 'libglade' 'libxdamage') provides=('gtk-sharp') replaces=('gtk-sharp') groups=('gnome') @@ -15,7 +15,7 @@ archs=('i686' 'x86_64' 'ppc') _F_cd_path="$_F_gnome_name-$pkgver" _F_mono_aot=0 Finclude gnome mono -sha1sums=('0208d9f6119fd72162dc12d4be98429d34bb6858') +sha1sums=('e189e7fbf4331b02570bb0788bc710c8bb9dd2fd') unset MAKEFLAGS From bouleetbil at frogdev.info Fri Oct 10 15:25:34 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:15 2008 Subject: [Frugalware-git] frugalware-current: gnome-desktop-sharp-2.24.0-1-i686 Message-ID: <20081010132534.8C707119053C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=326920521e2173dd3ed092d86260904ccca43938 commit 326920521e2173dd3ed092d86260904ccca43938 Author: bouleetbil <bouleetbil@frogdev.info> Date: Thu Oct 2 22:31:10 2008 +0200 gnome-desktop-sharp-2.24.0-1-i686 *version bump diff --git a/source/gnome/gnome-desktop-sharp/FrugalBuild b/source/gnome/gnome-desktop-sharp/FrugalBuild index 4baeea6..bee5c83 100644 --- a/source/gnome/gnome-desktop-sharp/FrugalBuild +++ b/source/gnome/gnome-desktop-sharp/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=gnome-desktop-sharp -pkgver=2.20.1 +pkgver=2.24.0 pkgrel=1 pkgdesc="C# bindings for the Gnome desktop" url="http://www.gnome.org" -depends=('gtk2-sharp>=2.12.0' 'libart_lgpl' 'librsvg>=2.22.2' 'gtkhtml>=3.18.1' 'vte>=0.16.13' \ - 'nautilus-cd-burner>=2.22.1' 'gtksourceview>=2.2.1' 'libwnck>=2.22.1' 'gnome-sharp>=2.20.0-2') +depends=('gtk2-sharp>=2.12.4' 'libart_lgpl' 'librsvg>=2.22.2' 'gtkhtml>=3.18.1' 'vte>=0.17.4' \ + 'nautilus-cd-burner>=2.24.0' 'gtksourceview>=2.2.1' 'libwnck>=2.22.1' 'gnome-sharp>=2.24.0') groups=('gnome') archs=('i686' 'x86_64' 'ppc') _F_mono_aot=0 Finclude gnome mono -sha1sums=('b99729f7a7265fb1cecf09ced31e009e3ccd66bb') +sha1sums=('bfc56b97d9fb19dd2b69c3b509d0b7bf95365c10') unset MAKEFLAGS From bouleetbil at frogdev.info Fri Oct 10 15:25:29 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:17 2008 Subject: [Frugalware-git] frugalware-current: epiphany-2.24.0.1-1-i686 Message-ID: <20081010132529.9054011904EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eaac9397ea94700b1f925541745b484f7967a92c commit eaac9397ea94700b1f925541745b484f7967a92c Author: bouleetbil <bouleetbil@frogdev.info> Date: Wed Oct 1 22:57:22 2008 +0200 epiphany-2.24.0.1-1-i686 *version bump diff --git a/source/gnome-extra/epiphany/FrugalBuild b/source/gnome-extra/epiphany/FrugalBuild index 1f92987..e04c4ab 100644 --- a/source/gnome-extra/epiphany/FrugalBuild +++ b/source/gnome-extra/epiphany/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=epiphany -pkgver=2.22.2 +pkgver=2.24.0.1 pkgrel=1 pkgdesc="GNOME webbrowser based on the mozilla rendering engine" url="http://www.gnome.org/projects/epiphany/" -depends=('libstdc++' 'dbus-x11' 'atk' 'libxslt' 'gnome-desktop>=2.22.2' 'startup-notification' \ +depends=('libstdc++' 'dbus-x11' 'atk' 'libxslt' 'gnome-desktop>=2.24.0' 'startup-notification' \ 'xulrunner>=1.8.1.3' 'docbook-xsl') -makedepends=('pygtk>=2.12.1' 'gtk-doc>=1.9' 'perl-xml-parser' 'python>=2.5' 'gnome-python>=2.22.0' 'iso-codes' 'gnome-doc-utils>=0.12.2') +makedepends=('pygtk>=2.12.1' 'gtk-doc>=1.9' 'perl-xml-parser' 'python>=2.5' 'gnome-python>=2.22.1' 'iso-codes' 'gnome-doc-utils>=0.12.2' 'intltool') _F_gnome_schemas=('/etc/gconf/schemas/epiphany.schemas' '/etc/gconf/schemas/epiphany-lockdown.schemas' '/etc/gconf/schemas/epiphany-pango.schemas' @@ -21,6 +21,6 @@ groups=('gnome-extra') archs=('x86_64' 'i686') Fconfopts="$Fconfopts -with-gecko=xulrunner \ --enable-python --enable-certificate-manager --disable-gtk-doc" -sha1sums=('bd57901dec8684e6f39bfadb426eac475a353a97') +sha1sums=('5cea9f40c25fb6be2d281625862f8443c094e8dc') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:29 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:18 2008 Subject: [Frugalware-git] frugalware-current: epiphany-extensions-2.24.0-1-i686 Message-ID: <20081010132529.F08A01190506@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e3d60e1e4dd4c9818b037d61a1c8e3cdcd5e074d commit e3d60e1e4dd4c9818b037d61a1c8e3cdcd5e074d Author: bouleetbil <bouleetbil@frogdev.info> Date: Wed Oct 1 23:10:57 2008 +0200 epiphany-extensions-2.24.0-1-i686 *version bump diff --git a/source/gnome-extra/epiphany-extensions/FrugalBuild b/source/gnome-extra/epiphany-extensions/FrugalBuild index 94daebf..9e26e96 100644 --- a/source/gnome-extra/epiphany-extensions/FrugalBuild +++ b/source/gnome-extra/epiphany-extensions/FrugalBuild @@ -2,18 +2,18 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=epiphany-extensions -pkgver=2.22.2 -pkgrel=2 +pkgver=2.24.0 +pkgrel=1 pkgdesc="Extensions for epiphany web browser" url="http://www.gnome.org/projects/epiphany/extensions" -depends=('opensp' 'nss>=3.12' 'nspr>=4.7.1' 'pcre' 'epiphany>=2.22.2') -makedepends=('perl-xml-parser' 'gnome-doc-utils>=0.12.2') +depends=('opensp' 'nss>=3.12' 'nspr>=4.7.1' 'pcre' 'epiphany>=2.24.0.1') +makedepends=('perl-xml-parser' 'gnome-doc-utils>=0.12.2' 'intltool') _F_gnome_scrollkeeper="y" Finclude gnome gnome-scriptlet license="GPL2" groups=('gnome-extra') archs=('x86_64' 'i686') Fconfopts="$Fconfopts --with-gecko=xulrunner --with-extensions=really-all" -sha1sums=('0dff50f48a14e01dc358fa484b218f6d6a7f5519') +sha1sums=('802d42fe002bcb045ae7c760ba7c872e0fc2406b') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:30 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:20 2008 Subject: [Frugalware-git] frugalware-current: gnome-games-2.24.0-1-i686 Message-ID: <20081010132530.3DC801190505@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5ee3612deec63233b00dc5c2ecc179014ee8f9e0 commit 5ee3612deec63233b00dc5c2ecc179014ee8f9e0 Author: bouleetbil <bouleetbil@frogdev.info> Date: Thu Oct 2 04:25:14 2008 +0200 gnome-games-2.24.0-1-i686 *version bump diff --git a/source/gnome-extra/gnome-games/FrugalBuild b/source/gnome-extra/gnome-games/FrugalBuild index 989d4ff..88f883f 100644 --- a/source/gnome-extra/gnome-games/FrugalBuild +++ b/source/gnome-extra/gnome-games/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=gnome-games -pkgver=2.22.3 +pkgver=2.24.0 pkgrel=1 pkgdesc="Games for GNOME" url="http://www.gnome.org/" -depends=('guile' 'libgnomeui>=2.22.1' 'librsvg>=2.22.2' 'rarian>=0.8.0' \ - 'desktop-file-utils' 'libbonobo>=2.22.0' 'gnome-python-desktop>=2.22.0' 'ggz-client-libs' 'sdl' 'sdl_mixer') +depends=('guile' 'libgnomeui>=2.24.0' 'librsvg>=2.22.2' 'rarian>=0.8.0' \ + 'desktop-file-utils' 'libbonobo>=2.22.0' 'gnome-python-desktop>=2.24.0' 'ggz-client-libs' 'sdl' 'sdl_mixer') makedepends=('intltool' 'gnome-doc-utils>=0.12.2') groups=('gnome-extra') archs=('i686' 'x86_64') @@ -31,6 +31,6 @@ _F_gnome_desktop="y" _F_gnome_iconcache="y" Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --with-scores-group=users --with-scores-user=root" -sha1sums=('55d17c8e5dcadf7192532f5ef30dcba22168c9a8') +sha1sums=('bc8bc818db93065dcc4552e9386508d4dfe564e4') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:30 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:22 2008 Subject: [Frugalware-git] frugalware-current: gnome-games-extra-data-2.24.0-1-i686 Message-ID: <20081010132530.E1B801190210@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c564deeda497507ad89ecfd0daa23eb88271c1cc commit c564deeda497507ad89ecfd0daa23eb88271c1cc Author: bouleetbil <bouleetbil@frogdev.info> Date: Thu Oct 2 04:42:53 2008 +0200 gnome-games-extra-data-2.24.0-1-i686 *version bump diff --git a/source/gnome-extra/gnome-games-extra-data/FrugalBuild b/source/gnome-extra/gnome-games-extra-data/FrugalBuild index 6f2c27a..7bf511e 100644 --- a/source/gnome-extra/gnome-games-extra-data/FrugalBuild +++ b/source/gnome-extra/gnome-games-extra-data/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: AlexExtreme <alex@alex-smith.me.uk> pkgname=gnome-games-extra-data -pkgver=2.22.0 +pkgver=2.24.0 pkgrel=1 pkgdesc="Extra data files for the GNOME games" url="http://www.gnome.org/" -depends=('gnome-games>=2.22.0') +depends=('gnome-games>=2.24.0') groups=('gnome-extra') archs=('i686' 'x86_64') Finclude gnome -sha1sums=('ad9ed0f3fbe9e688f77b52eea5c8b03d20ef590a') +sha1sums=('a33d7fd3ba40be8fca472a9517138c849ae36be8') From bouleetbil at frogdev.info Fri Oct 10 15:25:31 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:23 2008 Subject: [Frugalware-git] frugalware-current: libxml++-2.24.0-1-i686 Message-ID: <20081010132531.1284011901FA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=06612347b8e078cd1a341fd79e30ff823e80dfb1 commit 06612347b8e078cd1a341fd79e30ff823e80dfb1 Author: bouleetbil <bouleetbil@frogdev.info> Date: Thu Oct 2 05:10:39 2008 +0200 libxml++-2.24.0-1-i686 *version bump diff --git a/source/lib-extra/libxml++/FrugalBuild b/source/lib-extra/libxml++/FrugalBuild index 1ca976a..6540058 100644 --- a/source/lib-extra/libxml++/FrugalBuild +++ b/source/lib-extra/libxml++/FrugalBuild @@ -3,17 +3,15 @@ # Maintainer: voroskoi <voroskoi@frugalware.org> pkgname=libxml++ -pkgver=2.22.0 -pkgrel=2 +pkgver=2.24.0 +pkgrel=1 pkgdesc="libxml++ is a C++ wrapper for the libxml XML parser library" url="http://libxmlplusplus.sourceforge.net/" groups=('lib-extra') archs=('i686' 'x86_64') depends=('libxml2' 'glibmm' 'glib2') Finclude gnome -source=(${source[@]} ${pkgname}_nodes.patch) -sha1sums=('8c69339e1b472bd5e541e30fdaa47b152bc186bc' \ - '680075d2b754b28cfb2a9ea8d888045e2bc9ae0b') +sha1sums=('bfeeda534a4ba3800c6cf22fd0aa9136f3036d99') build() { Fbuild diff --git a/source/lib-extra/libxml++/libxml++_nodes.patch b/source/lib-extra/libxml++/libxml++_nodes.patch deleted file mode 100644 index 85fdeb6..0000000 --- a/source/lib-extra/libxml++/libxml++_nodes.patch +++ /dev/null @@ -1,288 +0,0 @@ -diff -Naur libxml++-2.22.0/libxml++/nodes/element.cc libxml++-2.23.1/libxml++/nodes/element.cc ---- libxml++-2.22.0/libxml++/nodes/element.cc 2008-01-17 14:56:54.000000000 +0530 -+++ libxml++-2.23.1/libxml++/nodes/element.cc 2008-06-24 18:59:04.000000000 +0530 -@@ -156,6 +156,40 @@ - return 0; - } - -+TextNode* Element::add_child_text(xmlpp::Node* previous_sibling, const Glib::ustring& content) -+{ -+ if(!previous_sibling) -+ return 0; -+ -+ if(cobj()->type == XML_ELEMENT_NODE) -+ { -+ xmlNode* node = xmlNewText((const xmlChar*)content.c_str()); -+ -+ // Use the result, because node can be freed when merging text nodes: -+ node = xmlAddNextSibling(previous_sibling->cobj(), node); -+ -+ return static_cast<TextNode*>(node->_private); -+ } -+ return 0; -+} -+ -+TextNode* Element::add_child_text_before(xmlpp::Node* next_sibling, const Glib::ustring& content) -+{ -+ if(!next_sibling) -+ return 0; -+ -+ if(cobj()->type == XML_ELEMENT_NODE) -+ { -+ xmlNode* node = xmlNewText((const xmlChar*)content.c_str()); -+ -+ // Use the result, because node can be freed when merging text nodes: -+ node = xmlAddPrevSibling(next_sibling->cobj(), node); -+ -+ return static_cast<TextNode*>(node->_private); -+ } -+ return 0; -+} -+ - bool Element::has_child_text() const - { - return get_child_text() != 0; -diff -Naur libxml++-2.22.0/libxml++/nodes/element.h libxml++-2.23.1/libxml++/nodes/element.h ---- libxml++-2.22.0/libxml++/nodes/element.h 2008-01-17 14:56:54.000000000 +0530 -+++ libxml++-2.23.1/libxml++/nodes/element.h 2008-06-24 18:59:04.000000000 +0530 -@@ -94,6 +94,26 @@ - */ - TextNode* add_child_text(const Glib::ustring& content = Glib::ustring()); - -+ /** Add a new text node after the specified existing child node. -+ * -+ * @newin2p24 -+ * -+ * @param previous_sibling An existing child node. -+ * @param content The text. This should be unescaped - see ContentNode::set_content(). -+ * @returns The new text node. -+ */ -+ TextNode* add_child_text(xmlpp::Node* previous_sibling, const Glib::ustring& content = Glib::ustring()); -+ -+ /** Add a new text node before the specified existing child node. -+ * -+ * @newin2p24 -+ * -+ * @param next_sibling An existing child node. -+ * @param content The text. This should be unescaped - see ContentNode::set_content(). -+ * @returns The new text node. -+ */ -+ TextNode* add_child_text_before(xmlpp::Node* next_sibling, const Glib::ustring& content = Glib::ustring()); -+ - /** Set the text of the first text node, adding one if necessary. - * This is a convenience method, meant as an alternative to iterating over all the child nodes to find the first suitable node then and setting the text directly. - * @param content The text. This should be unescaped - see ContentNode::set_content(). -diff -Naur libxml++-2.22.0/libxml++/nodes/node.cc libxml++-2.23.1/libxml++/nodes/node.cc ---- libxml++-2.22.0/libxml++/nodes/node.cc 2008-01-17 14:56:54.000000000 +0530 -+++ libxml++-2.23.1/libxml++/nodes/node.cc 2008-06-24 18:59:04.000000000 +0530 -@@ -97,7 +97,55 @@ - Element* Node::add_child(const Glib::ustring& name, - const Glib::ustring& ns_prefix) - { -- xmlNode* node = 0; -+ _xmlNode* child = create_new_child_node(name, ns_prefix); -+ if(!child) -+ return 0; -+ -+ _xmlNode* node = xmlAddChild(impl_, child); -+ if(node) -+ return static_cast<Element*>(node->_private); -+ else -+ return 0; -+} -+ -+Element* Node::add_child(xmlpp::Node* previous_sibling, -+ const Glib::ustring& name, -+ const Glib::ustring& ns_prefix) -+{ -+ if(!previous_sibling) -+ return 0; -+ -+ _xmlNode* child = create_new_child_node(name, ns_prefix); -+ if(!child) -+ return 0; -+ -+ _xmlNode* node = xmlAddNextSibling(previous_sibling->cobj(), child); -+ if(node) -+ return static_cast<Element*>(node->_private); -+ else -+ return 0; -+} -+ -+Element* Node::add_child_before(xmlpp::Node* next_sibling, -+ const Glib::ustring& name, -+ const Glib::ustring& ns_prefix) -+{ -+ if(!next_sibling) -+ return 0; -+ -+ _xmlNode* child = create_new_child_node(name, ns_prefix); -+ if(!child) -+ return 0; -+ -+ _xmlNode* node = xmlAddPrevSibling(next_sibling->cobj(), child); -+ if(node) -+ return static_cast<Element*>(node->_private); -+ else -+ return 0; -+} -+ -+_xmlNode* Node::create_new_child_node(const Glib::ustring& name, const Glib::ustring& ns_prefix) -+{ - xmlNs* ns = 0; - - if(impl_->type != XML_ELEMENT_NODE) -@@ -124,14 +172,10 @@ - } - } - -- node = xmlAddChild(impl_, xmlNewNode(ns, (const xmlChar*)name.c_str())); -- -- if(node) -- return static_cast<Element*>(node->_private); -- else -- return 0; -+ return xmlNewNode(ns, (const xmlChar*)name.c_str()); - } - -+ - void Node::remove_child(Node* node) - { - //TODO: Allow a node to be removed without deleting it, to allow it to be moved? -diff -Naur libxml++-2.22.0/libxml++/nodes/node.h libxml++-2.23.1/libxml++/nodes/node.h ---- libxml++-2.22.0/libxml++/nodes/node.h 2007-08-13 18:17:18.000000000 +0530 -+++ libxml++-2.23.1/libxml++/nodes/node.h 2008-06-24 18:59:04.000000000 +0530 -@@ -20,7 +20,8 @@ - } - #endif //DOXYGEN_SHOULD_SKIP_THIS - --namespace xmlpp { -+namespace xmlpp -+{ - - class TextNode; - class Element; -@@ -50,7 +51,7 @@ - */ - void set_name(const Glib::ustring& name); - -- /** Set the namespace prefix used by the node -+ /** Set the namespace prefix used by the node. - * If no such namespace prefix has been declared then this method will throw an exception. - * @param ns_prefix The namespace prefix. - */ -@@ -64,32 +65,32 @@ - */ - int get_line() const; - -- /** Get the parent element for this node -+ /** Get the parent element for this node. - * @returns The parent node - */ - const Element* get_parent() const; - -- /** Get the parent element for this node -+ /** Get the parent element for this node. - * @returns The parent node - */ - Element* get_parent(); - -- /** Get the next sibling for this node -+ /** Get the next sibling for this node. - * @returns The next sibling - */ - const Node* get_next_sibling() const; - -- /** Get the next sibling for this node -+ /** Get the next sibling for this node. - * @returns The next sibling - */ - Node* get_next_sibling(); - -- /** Get the previous sibling for this node -+ /** Get the previous sibling for this node . - * @returns The previous sibling - */ - const Node* get_previous_sibling() const; - -- /** Get the previous sibling for this node -+ /** Get the previous sibling for this node. - * @returns The previous sibling - */ - Node* get_previous_sibling(); -@@ -106,7 +107,7 @@ - */ - const NodeList get_children(const Glib::ustring& name = Glib::ustring()) const; - -- /** Add a child element to this node -+ /** Add a child element to this node. - * @param name The new node name - * @param ns_prefix The namespace prefix. If the prefix has not been declared then this method will throw an exception. - * @returns The newly-created element -@@ -114,6 +115,30 @@ - Element* add_child(const Glib::ustring& name, - const Glib::ustring& ns_prefix = Glib::ustring()); - -+ /** Add a child element to this node after the specified existing child node. -+ * -+ * @newin2p24 -+ * -+ * @param previous_sibling An existing child node. -+ * @param name The new node name -+ * @param ns_prefix The namespace prefix. If the prefix has not been declared then this method will throw an exception. -+ * @returns The newly-created element -+ */ -+ Element* add_child(xmlpp::Node* previous_sibling, const Glib::ustring& name, -+ const Glib::ustring& ns_prefix = Glib::ustring()); -+ -+ /** Add a child element to this node before the specified existing child node. -+ * -+ * @newin2p24 -+ * -+ * @param next_sibling An existing child node. -+ * @param name The new node name -+ * @param ns_prefix The namespace prefix. If the prefix has not been declared then this method will throw an exception. -+ * @returns The newly-created element -+ */ -+ Element* add_child_before(xmlpp::Node* next_sibling, const Glib::ustring& name, -+ const Glib::ustring& ns_prefix = Glib::ustring()); -+ - /** Remove the child node. - * @param node The child node to remove. This Node will be deleted and therefore unusable after calling this method. - */ -@@ -127,12 +152,12 @@ - Node* import_node(const Node* node, bool recursive = true); - - -- /** Return the XPath of this node -+ /** Return the XPath of this node. - * @result The XPath of the node. - */ - Glib::ustring get_path() const; - -- /** Find nodes from a XPath expression -+ /** Find nodes from a XPath expression. - * @param xpath The XPath of the nodes. - */ - NodeSet find(const Glib::ustring& xpath) const; -@@ -141,7 +166,7 @@ - */ - typedef std::map<Glib::ustring, Glib::ustring> PrefixNsMap; - -- /** Find nodes from a XPath expression -+ /** Find nodes from a XPath expression. - * @param xpath The XPath of the nodes. - * @param namespaces A map of namespace prefixes to namespace URIs to be used while finding. - */ -@@ -154,6 +179,11 @@ - ///Access the underlying libxml implementation. - const _xmlNode* cobj() const; - -+protected: -+ -+ ///Create the C instance ready to be added to the parent node. -+ _xmlNode* create_new_child_node(const Glib::ustring& name, const Glib::ustring& ns_prefix); -+ - private: - _xmlNode* impl_; - }; From bouleetbil at frogdev.info Fri Oct 10 15:25:31 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:25 2008 Subject: [Frugalware-git] frugalware-current: file-roller-2.24.0-1-i686 Message-ID: <20081010132531.864B51190539@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=afc49ea28a3180a99a9b9282c6c87c2395c827ce commit afc49ea28a3180a99a9b9282c6c87c2395c827ce Author: bouleetbil <bouleetbil@frogdev.info> Date: Thu Oct 2 05:21:05 2008 +0200 file-roller-2.24.0-1-i686 *version bump diff --git a/source/gnome/file-roller/FrugalBuild b/source/gnome/file-roller/FrugalBuild index 4329746..bcf811c 100644 --- a/source/gnome/file-roller/FrugalBuild +++ b/source/gnome/file-roller/FrugalBuild @@ -2,10 +2,10 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=file-roller -pkgver=2.22.4 +pkgver=2.24.0 pkgrel=1 pkgdesc="Archive manager utility for GNOME" -depends=('nautilus>=2.22.5.1' 'rarian' 'desktop-file-utils') +depends=('nautilus>=2.24.0' 'rarian' 'desktop-file-utils') makedepends=('intltool' 'gnome-doc-utils>=0.12.2') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') @@ -14,6 +14,6 @@ _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" _F_gnome_iconcache="y" Finclude gnome gnome-scriptlet -sha1sums=('2894493c7e9eb55a874f3690b416fb16ad5d5729') +sha1sums=('cd22cea10b1d2be0edb1d64957e3a3cdf63b55ba') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:32 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:26 2008 Subject: [Frugalware-git] frugalware-current: vino-2.24.0-1-i686 Message-ID: <20081010132532.465BA11904E8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f4fe70a03c7755094596872f9f3da3bd3861e17a commit f4fe70a03c7755094596872f9f3da3bd3861e17a Author: bouleetbil <bouleetbil@frogdev.info> Date: Thu Oct 2 05:38:35 2008 +0200 vino-2.24.0-1-i686 *version bump diff --git a/source/gnome/vino/FrugalBuild b/source/gnome/vino/FrugalBuild index 3665ea4..ba11f0a 100644 --- a/source/gnome/vino/FrugalBuild +++ b/source/gnome/vino/FrugalBuild @@ -2,10 +2,10 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=vino -pkgver=2.22.2 +pkgver=2.24.0 pkgrel=1 pkgdesc="An integrated VNC server for GNOME" -depends=('libgnomeui>=2.22.1' 'gnutls>=2.2' 'avahi' 'libxtst' 'libxdamage' 'libnotify' 'gnome-keyring') +depends=('libgnomeui>=2.24.0' 'gnutls>=2.2' 'avahi' 'libxtst' 'libxdamage' 'libnotify' 'gnome-keyring') makedepends=('intltool' 'perl-xml-parser') groups=('gnome') archs=('i686' 'x86_64' 'ppc') @@ -15,6 +15,6 @@ _F_gnome_iconcache="y" Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --enable-http-server=yes --enable-session-support=yes --enable-avahi \ --enable-debug=no --enable-gnome-keyring=yes" -sha1sums=('ded4b0ce4e05caa31f6378ba65dc172b20a9594d') +sha1sums=('7b6a2fa97b923653140d8ad8661bdebd250d5968') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:32 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:29 2008 Subject: [Frugalware-git] frugalware-current: nautilus-open-terminal-0.9-2-i686 Message-ID: <20081010132532.142F711901AD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4ad767bad64fbf96e42c315f1a4c343f8c5dc597 commit 4ad767bad64fbf96e42c315f1a4c343f8c5dc597 Author: bouleetbil <bouleetbil@frogdev.info> Date: Thu Oct 2 05:33:46 2008 +0200 nautilus-open-terminal-0.9-2-i686 *rebuild with nautilus>=2.24.0 diff --git a/source/gnome/nautilus-open-terminal/FrugalBuild b/source/gnome/nautilus-open-terminal/FrugalBuild index e2bba67..bf51cfd 100644 --- a/source/gnome/nautilus-open-terminal/FrugalBuild +++ b/source/gnome/nautilus-open-terminal/FrugalBuild @@ -3,12 +3,13 @@ pkgname=nautilus-open-terminal pkgver=0.9 -pkgrel=1 +pkgrel=2 pkgdesc="Nautilus open terminal feature with improvements." url="http://manny.cluecoder.org/packages/nautilus-open-terminal/" -depends=('nautilus' 'perl-xml-parser') +depends=('nautilus>=2.24.0' 'perl-xml-parser') groups=('gnome') archs=('i686' 'x86_64' 'ppc') +_F_gnome_schemas=('/etc/gconf/schemas/nautilus-open-terminal.schemas') Finclude gnome sha1sums=('14ae57b4b17fd82c0bc00cf138cf4f387feaf10d') From bouleetbil at frogdev.info Fri Oct 10 15:25:32 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:30 2008 Subject: [Frugalware-git] frugalware-current: gnome-volume-manager-2.24.0-1-i686 Message-ID: <20081010132532.70CFD11901F7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=56d7562825b3d7183cf6d5eaef2452c578caf463 commit 56d7562825b3d7183cf6d5eaef2452c578caf463 Author: bouleetbil <bouleetbil@frogdev.info> Date: Thu Oct 2 05:44:07 2008 +0200 gnome-volume-manager-2.24.0-1-i686 *version bump diff --git a/source/gnome/gnome-volume-manager/FrugalBuild b/source/gnome/gnome-volume-manager/FrugalBuild index 849d6c6..7d79217 100644 --- a/source/gnome/gnome-volume-manager/FrugalBuild +++ b/source/gnome/gnome-volume-manager/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=gnome-volume-manager -pkgver=2.22.5 +pkgver=2.24.0 pkgrel=1 pkgdesc="A volume manager for GNOME" url="http://www.gnome.org/" -depends=('gnome-media>=2.22.0' 'dbus-glib>=0.71' 'libnotify>=0.4.4' 'gnome-vfs>=2.22.0' 'avahi-glib>=0.6.17') -rodepends=('totem>=2.22.0' 'gthumb') +depends=('gnome-media>=2.24.0.1' 'dbus-glib>=0.71' 'libnotify>=0.4.4' 'gnome-vfs>=2.24.0' 'avahi-glib>=0.6.17') +rodepends=('totem>=2.24.0' 'gthumb') makedepends=('intltool') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') @@ -15,7 +15,7 @@ _F_gnome_schemas=('/etc/gconf/schemas/gnome-volume-manager.schemas') _F_gnome_desktop="y" Finclude gnome gnome-scriptlet source=(${source[@]} 01-defaults.patch $pkgname-gthumb) -sha1sums=('108a3c7cab897680f202a796ee7f4f07809a790e' \ +sha1sums=('3ce48166b1f70e3a5e6353de996c98311791f715' \ '0624b78a7354e8673d480df497233945f0cb86e5' \ '2f814a6a4b287532899e48a5a4df0490ec9fddeb') From bouleetbil at frogdev.info Fri Oct 10 15:25:32 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:31 2008 Subject: [Frugalware-git] frugalware-current: gnome-backgrounds-2.24.0-1-i686 Message-ID: <20081010132532.884B0119053D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1693bca0ba0cadf6256dc62eb176931736c11ba6 commit 1693bca0ba0cadf6256dc62eb176931736c11ba6 Author: bouleetbil <bouleetbil@frogdev.info> Date: Thu Oct 2 05:45:58 2008 +0200 gnome-backgrounds-2.24.0-1-i686 *version bump diff --git a/source/gnome/gnome-backgrounds/FrugalBuild b/source/gnome/gnome-backgrounds/FrugalBuild index 7e941c2..9f7c377 100644 --- a/source/gnome/gnome-backgrounds/FrugalBuild +++ b/source/gnome/gnome-backgrounds/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=gnome-backgrounds -pkgver=2.22.0 +pkgver=2.24.0 pkgrel=1 pkgdesc="A set of backgrounds for GNOME" url="http://www.gnome.org/" @@ -11,6 +11,6 @@ makedepends=('intltool') groups=('gnome') archs=('i686' 'x86_64' 'ppc') Finclude gnome -sha1sums=('eede46b91595b4f72fe8d160a13fcaee8e4b0236') +sha1sums=('3ceb98be1b49d7af6456b0ef2aefddca15e6146b') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:34 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:33 2008 Subject: [Frugalware-git] frugalware-current: gnome-doc-utils-0.14.0-1-i686 Message-ID: <20081010132534.3AACC1190928@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ec8f8b95c116cd3ab5177c2ac160a89f062b3b80 commit ec8f8b95c116cd3ab5177c2ac160a89f062b3b80 Author: bouleetbil <bouleetbil@frogdev.info> Date: Thu Oct 2 22:12:59 2008 +0200 gnome-doc-utils-0.14.0-1-i686 *version bump diff --git a/source/gnome-extra/gnome-doc-utils/FrugalBuild b/source/gnome-extra/gnome-doc-utils/FrugalBuild index 8ceaf46..dde1b2d 100644 --- a/source/gnome-extra/gnome-doc-utils/FrugalBuild +++ b/source/gnome-extra/gnome-doc-utils/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=gnome-doc-utils -pkgver=0.12.2 +pkgver=0.14.0 pkgrel=1 pkgdesc="A collection of documentation utilities for GNOME" url="http://www.gnome.org/" @@ -12,6 +12,6 @@ groups=('gnome-extra') archs=('i686' 'x86_64' 'ppc') _F_gnome_scrollkeeper="y" Finclude gnome gnome-scriptlet +sha1sums=('e3de92c19f9140cbdee9f6ad0b179e4e797b3505') -sha1sums=('8006f6c2c3cf41c6be0295b4ba48df0d4d4f51d1') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:35 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:34 2008 Subject: [Frugalware-git] frugalware-current: gnome-vfsmm-2.24.0-1-i686 Message-ID: <20081010132535.9F5D91190541@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c10efecc368a694430d4c8c4db4338d9dba774fc commit c10efecc368a694430d4c8c4db4338d9dba774fc Author: bouleetbil <bouleetbil@frogdev.info> Date: Thu Oct 2 23:01:44 2008 +0200 gnome-vfsmm-2.24.0-1-i686 *version bump diff --git a/source/gnome-extra/gnome-vfsmm/FrugalBuild b/source/gnome-extra/gnome-vfsmm/FrugalBuild index 64ca644..2966b10 100644 --- a/source/gnome-extra/gnome-vfsmm/FrugalBuild +++ b/source/gnome-extra/gnome-vfsmm/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=gnome-vfsmm -pkgver=2.22.0 +pkgver=2.24.0 pkgrel=1 pkgdesc="A C++ wrapper for gnome-vfs." url="http://www.gnome.org/" -depends=('gnome-vfs>=2.20.0' 'glibmm>=2.16.0') +depends=('gnome-vfs>=2.24.0' 'glibmm>=2.16.0') makedepends=('doxygen') options=('scriptlet') groups=('gnome-extra') archs=('i686' 'x86_64') Finclude gnome -sha1sums=('cd739e1b2b68af080089b52bcfffd3e96b35d6e9') +sha1sums=('36ac608f26287b9146dcf5a250312471a759cefe') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:35 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:38 2008 Subject: [Frugalware-git] frugalware-current: gnome-power-manager-2.24.0-1-i686 Message-ID: <20081010132535.52E61119021C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c273d45b13bf38a7477429adc494a3771432c229 commit c273d45b13bf38a7477429adc494a3771432c229 Author: bouleetbil <bouleetbil@frogdev.info> Date: Thu Oct 2 22:51:39 2008 +0200 gnome-power-manager-2.24.0-1-i686 *version bump *added patch for disable pam I HATE PAM diff --git a/source/gnome/gnome-power-manager/DisableHelp.diff b/source/gnome/gnome-power-manager/DisableHelp.diff new file mode 100644 index 0000000..479eed2 --- /dev/null +++ b/source/gnome/gnome-power-manager/DisableHelp.diff @@ -0,0 +1,11 @@ +--- gnome-power-manager-2.24.0old/Makefile.am 2008-09-04 12:05:20.000000000 +0200 ++++ gnome-power-manager-2.24.0/Makefile.am 2008-10-02 22:26:05.000000000 +0200 +@@ -11,7 +11,6 @@ + docs \ + man \ + data \ +- help \ + tools + + if HAVE_APPLETS + diff --git a/source/gnome/gnome-power-manager/Fix_disablepam.diff b/source/gnome/gnome-power-manager/Fix_disablepam.diff new file mode 100644 index 0000000..5d27d4f --- /dev/null +++ b/source/gnome/gnome-power-manager/Fix_disablepam.diff @@ -0,0 +1,13257 @@ +--- gnome-power-manager-2.24.0old/configure 2008-09-22 22:46:09.000000000 +0200 ++++ gnome-power-manager-2.24.0/configure 2008-10-02 14:22:35.000000000 +0200 +@@ -1,9 +1,9 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.61 for gnome-power-manager 2.24.0. ++# Generated by GNU Autoconf 2.63 for gnome-power-manager 2.24.0. + # + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. + ## --------------------- ## +@@ -15,7 +15,7 @@ + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # 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 +@@ -37,17 +37,45 @@ + as_cr_digits='0123456789' + as_cr_alnum=$as_cr_Letters$as_cr_digits + +-# The user is always right. +-if test "${PATH_SEPARATOR+set}" != set; then +- echo "#! /bin/sh" >conf$$.sh +- echo "exit 0" >>conf$$.sh +- chmod +x conf$$.sh +- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then +- PATH_SEPARATOR=';' ++as_nl=' ++' ++export as_nl ++# Printing a long string crashes Solaris 7 /usr/bin/printf. ++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 ++ as_echo='printf %s\n' ++ as_echo_n='printf %s' ++else ++ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then ++ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' ++ as_echo_n='/usr/ucb/echo -n' + else +- PATH_SEPARATOR=: ++ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' ++ as_echo_n_body='eval ++ arg=$1; ++ case $arg in ++ *"$as_nl"*) ++ expr "X$arg" : "X\\(.*\\)$as_nl"; ++ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; ++ esac; ++ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" ++ ' ++ export as_echo_n_body ++ as_echo_n='sh -c $as_echo_n_body as_echo' + fi +- rm -f conf$$.sh ++ export as_echo_body ++ as_echo='sh -c $as_echo_body as_echo' ++fi ++ ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ PATH_SEPARATOR=: ++ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { ++ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || ++ PATH_SEPARATOR=';' ++ } + fi + + # Support unset when possible. +@@ -63,8 +91,6 @@ + # there to prevent editors from complaining about space-tab. + # (If _AS_PATH_WALK were called with IFS unset, it would disable word + # splitting by setting IFS to empty value.) +-as_nl=' +-' + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +@@ -87,7 +113,7 @@ + as_myself=$0 + fi + if test ! -f "$as_myself"; then +- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } + fi + +@@ -100,17 +126,10 @@ + PS4='+ ' + + # NLS nuisances. +-for as_var in \ +- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ +- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ +- LC_TELEPHONE LC_TIME +-do +- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then +- eval $as_var=C; export $as_var +- else +- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +- fi +-done ++LC_ALL=C ++export LC_ALL ++LANGUAGE=C ++export LANGUAGE + + # Required to use basename. + if expr a : '\(a\)' >/dev/null 2>&1 && +@@ -132,7 +151,7 @@ + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +-echo X/"$0" | ++$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q +@@ -158,7 +177,7 @@ + as_have_required=no + fi + +- if test $as_have_required = yes && (eval ": ++ if test $as_have_required = yes && (eval ": + (as_func_return () { + (exit \$1) + } +@@ -240,7 +259,7 @@ + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # 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 +@@ -261,7 +280,7 @@ + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # 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 +@@ -341,10 +360,10 @@ + + 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 +- export CONFIG_SHELL +- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} ++ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++ done ++ export CONFIG_SHELL ++ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + fi + + +@@ -413,9 +432,10 @@ + + test \$exitcode = 0") || { + echo No shell found that supports shell functions. +- echo Please tell autoconf@gnu.org about your system, +- echo including any error possibly output before this +- echo message ++ 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. + } + + +@@ -451,7 +471,7 @@ + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || +- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 ++ { $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 +@@ -479,7 +499,6 @@ + *) + ECHO_N='-n';; + esac +- + if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +@@ -492,19 +511,22 @@ + rm -f conf$$.dir/conf$$.file + else + rm -f conf$$.dir +- mkdir conf$$.dir ++ mkdir conf$$.dir 2>/dev/null + fi +-echo >conf$$.file +-if ln -s conf$$.file conf$$ 2>/dev/null; then +- as_ln_s='ln -s' +- # ... but there are two gotchas: +- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. +- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -p'. +- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || ++if (echo >conf$$.file) 2>/dev/null; then ++ if ln -s conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s='ln -s' ++ # ... but there are two gotchas: ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. ++ # In both cases, we have to default to `cp -p'. ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || ++ as_ln_s='cp -p' ++ elif ln conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s=ln ++ else + as_ln_s='cp -p' +-elif ln conf$$.file conf$$ 2>/dev/null; then +- as_ln_s=ln ++ fi + else + as_ln_s='cp -p' + fi +@@ -529,10 +551,10 @@ + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then +- test -d "$1/."; ++ test -d "$1/."; + else + case $1 in +- -*)set "./$1";; ++ -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi +@@ -767,235 +789,268 @@ + # include <unistd.h> + #endif" + +-ac_subst_vars='SHELL +-PATH_SEPARATOR +-PACKAGE_NAME +-PACKAGE_TARNAME +-PACKAGE_VERSION +-PACKAGE_STRING +-PACKAGE_BUGREPORT +-exec_prefix +-prefix +-program_transform_name +-bindir +-sbindir +-libexecdir +-datarootdir +-datadir +-sysconfdir +-sharedstatedir +-localstatedir +-includedir +-oldincludedir +-docdir +-infodir +-htmldir +-dvidir +-pdfdir +-psdir +-libdir +-localedir +-mandir +-DEFS +-ECHO_C +-ECHO_N +-ECHO_T +-LIBS +-build_alias +-host_alias +-target_alias +-INSTALL_PROGRAM +-INSTALL_SCRIPT +-INSTALL_DATA +-am__isrc +-CYGPATH_W +-PACKAGE +-VERSION +-ACLOCAL +-AUTOCONF +-AUTOMAKE +-AUTOHEADER +-MAKEINFO +-install_sh +-STRIP +-INSTALL_STRIP_PROGRAM +-mkdir_p +-AWK +-SET_MAKE +-am__leading_dot +-AMTAR +-am__tar +-am__untar +-CC +-CFLAGS +-LDFLAGS +-CPPFLAGS +-ac_ct_CC +-EXEEXT +-OBJEXT +-DEPDIR +-am__include +-am__quote +-AMDEP_TRUE +-AMDEP_FALSE +-AMDEPBACKSLASH +-CCDEPMODE +-am__fastdepCC_TRUE +-am__fastdepCC_FALSE +-build +-build_cpu +-build_vendor +-build_os +-host +-host_cpu +-host_vendor +-host_os +-SED +-GREP +-EGREP +-LN_S +-ECHO +-AR +-RANLIB +-CPP +-CXX +-CXXFLAGS +-ac_ct_CXX +-CXXDEPMODE +-am__fastdepCXX_TRUE +-am__fastdepCXX_FALSE +-CXXCPP +-F77 +-FFLAGS +-ac_ct_F77 +-LIBTOOL +-INTLTOOL_DESKTOP_RULE +-INTLTOOL_DIRECTORY_RULE +-INTLTOOL_KEYS_RULE +-INTLTOOL_PROP_RULE +-INTLTOOL_OAF_RULE +-INTLTOOL_PONG_RULE +-INTLTOOL_SERVER_RULE +-INTLTOOL_SHEET_RULE +-INTLTOOL_SOUNDLIST_RULE +-INTLTOOL_UI_RULE +-INTLTOOL_XAM_RULE +-INTLTOOL_KBD_RULE +-INTLTOOL_XML_RULE +-INTLTOOL_XML_NOMERGE_RULE +-INTLTOOL_CAVES_RULE +-INTLTOOL_SCHEMAS_RULE +-INTLTOOL_THEME_RULE +-INTLTOOL_SERVICE_RULE +-INTLTOOL_POLICY_RULE +-XGETTEXT +-MSGMERGE +-MSGFMT +-INTLTOOL_EXTRACT +-INTLTOOL_MERGE +-INTLTOOL_UPDATE +-INTLTOOL_PERL +-ALL_LINGUAS +-DATADIRNAME +-WARN_CFLAGS +-PKG_CONFIG +-HELP_DIR +-OMF_DIR +-DOC_USER_FORMATS +-ENABLE_SK_TRUE +-ENABLE_SK_FALSE +-DISTCHECK_CONFIGURE_FLAGS +-HAVE_GNOME_DOC_UTILS_TRUE +-HAVE_GNOME_DOC_UTILS_FALSE +-GLIB_GENMARSHAL +-GETTEXT_PACKAGE +-USE_NLS +-MSGFMT_OPTS +-GMSGFMT +-CATALOGS +-CATOBJEXT +-GMOFILES +-INSTOBJEXT +-INTLLIBS +-PO_IN_DATADIR_TRUE +-PO_IN_DATADIR_FALSE +-POFILES +-POSUB +-MKINSTALLDIRS +-GLIB_REQUIRED +-GTK_REQUIRED +-GDK_REQUIRED +-LIBGNOME_REQUIRED +-LIBGNOMEUI_REQUIRED +-HAL_REQUIRED +-DBUS_REQUIRED +-LIBGLADE_REQUIRED +-LIBNOTIFY_REQUIRED +-LIBWNCK_REQUIRED +-CAIRO_REQUIRED +-UNIQUE_REQUIRED +-LIBPANEL_REQUIRED +-GSTREAMER_REQUIRED +-XRANDR_REQUIRED +-POLKIT_GNOME_REQUIRED +-GLIB_CFLAGS +-GLIB_LIBS +-HAL_CFLAGS +-HAL_LIBS +-GSTREAMER_CFLAGS +-GSTREAMER_LIBS +-DBUS_CFLAGS +-DBUS_LIBS +-GNOME_CFLAGS +-GNOME_LIBS +-GDK_CFLAGS +-GDK_LIBS +-XRANDR_CFLAGS +-XRANDR_LIBS +-GCONFTOOL +-GCONF_SCHEMA_CONFIG_SOURCE +-GCONF_SCHEMA_FILE_DIR +-GCONF_SCHEMAS_INSTALL_TRUE +-GCONF_SCHEMAS_INSTALL_FALSE +-XMKMF +-X_CFLAGS +-X_PRE_LIBS +-X_LIBS +-X_EXTRA_LIBS +-SYSCONFDIR +-DATADIR +-BINDIR +-SBINDIR +-DOCDIR +-POLKIT_CFLAGS +-POLKIT_LIBS +-HAVE_TESTS_TRUE +-HAVE_TESTS_FALSE +-POLKIT_GNOME_CFLAGS +-POLKIT_GNOME_LIBS +-HAVE_GCONF_DEFAULTS_TRUE +-HAVE_GCONF_DEFAULTS_FALSE +-HAVE_APPLETS_TRUE +-HAVE_APPLETS_FALSE +-XMLTO +-DOCBOOK_DOCS_ENABLED_TRUE +-DOCBOOK_DOCS_ENABLED_FALSE +-DBUS_SERVICES_DIR +-LIBNOTIFY_CFLAGS +-LIBNOTIFY_LIBS +-HAVE_LIBNOTIFY_TRUE +-HAVE_LIBNOTIFY_FALSE +-UNIQUE_CFLAGS +-UNIQUE_LIBS +-HAVE_UNIQUE_TRUE +-HAVE_UNIQUE_FALSE +-GPM_EXTRA_LIBS +-DOCBOOK2MAN +-HAVE_DOCBOOK2MAN_TRUE +-HAVE_DOCBOOK2MAN_FALSE ++ac_subst_vars='LTLIBOBJS + LIBOBJS +-LTLIBOBJS' ++HAVE_DOCBOOK2MAN_FALSE ++HAVE_DOCBOOK2MAN_TRUE ++DOCBOOK2MAN ++GPM_EXTRA_LIBS ++HAVE_UNIQUE_FALSE ++HAVE_UNIQUE_TRUE ++UNIQUE_LIBS ++UNIQUE_CFLAGS ++HAVE_LIBNOTIFY_FALSE ++HAVE_LIBNOTIFY_TRUE ++LIBNOTIFY_LIBS ++LIBNOTIFY_CFLAGS ++DBUS_SERVICES_DIR ++DOCBOOK_DOCS_ENABLED_FALSE ++DOCBOOK_DOCS_ENABLED_TRUE ++XMLTO ++HAVE_APPLETS_FALSE ++HAVE_APPLETS_TRUE ++HAVE_GCONF_DEFAULTS_FALSE ++HAVE_GCONF_DEFAULTS_TRUE ++POLKIT_GNOME_LIBS ++POLKIT_GNOME_CFLAGS ++HAVE_TESTS_FALSE ++HAVE_TESTS_TRUE ++POLKIT_LIBS ++POLKIT_CFLAGS ++DOCDIR ++SBINDIR ++BINDIR ++DATADIR ++SYSCONFDIR ++X_EXTRA_LIBS ++X_LIBS ++X_PRE_LIBS ++X_CFLAGS ++XMKMF ++GCONF_SCHEMAS_INSTALL_FALSE ++GCONF_SCHEMAS_INSTALL_TRUE ++GCONF_SCHEMA_FILE_DIR ++GCONF_SCHEMA_CONFIG_SOURCE ++GCONFTOOL ++XRANDR_LIBS ++XRANDR_CFLAGS ++GDK_LIBS ++GDK_CFLAGS ++GNOME_LIBS ++GNOME_CFLAGS ++DBUS_LIBS ++DBUS_CFLAGS ++GSTREAMER_LIBS ++GSTREAMER_CFLAGS ++HAL_LIBS ++HAL_CFLAGS ++GLIB_LIBS ++GLIB_CFLAGS ++POLKIT_GNOME_REQUIRED ++XRANDR_REQUIRED ++GSTREAMER_REQUIRED ++LIBPANEL_REQUIRED ++UNIQUE_REQUIRED ++CAIRO_REQUIRED ++LIBWNCK_REQUIRED ++LIBNOTIFY_REQUIRED ++LIBGLADE_REQUIRED ++DBUS_REQUIRED ++HAL_REQUIRED ++LIBGNOMEUI_REQUIRED ++LIBGNOME_REQUIRED ++GDK_REQUIRED ++GTK_REQUIRED ++GLIB_REQUIRED ++MKINSTALLDIRS ++POSUB ++POFILES ++PO_IN_DATADIR_FALSE ++PO_IN_DATADIR_TRUE ++INTLLIBS ++INSTOBJEXT ++GMOFILES ++CATOBJEXT ++CATALOGS ++GMSGFMT ++MSGFMT_OPTS ++USE_NLS ++GETTEXT_PACKAGE ++GLIB_GENMARSHAL ++HAVE_GNOME_DOC_UTILS_FALSE ++HAVE_GNOME_DOC_UTILS_TRUE ++DISTCHECK_CONFIGURE_FLAGS ++ENABLE_SK_FALSE ++ENABLE_SK_TRUE ++DOC_USER_FORMATS ++OMF_DIR ++HELP_DIR ++PKG_CONFIG ++WARN_CFLAGS ++DATADIRNAME ++ALL_LINGUAS ++INTLTOOL_PERL ++INTLTOOL_UPDATE ++INTLTOOL_MERGE ++INTLTOOL_EXTRACT ++MSGFMT ++MSGMERGE ++XGETTEXT ++INTLTOOL_POLICY_RULE ++INTLTOOL_SERVICE_RULE ++INTLTOOL_THEME_RULE ++INTLTOOL_SCHEMAS_RULE ++INTLTOOL_CAVES_RULE ++INTLTOOL_XML_NOMERGE_RULE ++INTLTOOL_XML_RULE ++INTLTOOL_KBD_RULE ++INTLTOOL_XAM_RULE ++INTLTOOL_UI_RULE ++INTLTOOL_SOUNDLIST_RULE ++INTLTOOL_SHEET_RULE ++INTLTOOL_SERVER_RULE ++INTLTOOL_PONG_RULE ++INTLTOOL_OAF_RULE ++INTLTOOL_PROP_RULE ++INTLTOOL_KEYS_RULE ++INTLTOOL_DIRECTORY_RULE ++INTLTOOL_DESKTOP_RULE ++LIBTOOL ++ac_ct_F77 ++FFLAGS ++F77 ++CXXCPP ++am__fastdepCXX_FALSE ++am__fastdepCXX_TRUE ++CXXDEPMODE ++ac_ct_CXX ++CXXFLAGS ++CXX ++CPP ++RANLIB ++AR ++ECHO ++LN_S ++EGREP ++GREP ++SED ++host_os ++host_vendor ++host_cpu ++host ++build_os ++build_vendor ++build_cpu ++build ++am__fastdepCC_FALSE ++am__fastdepCC_TRUE ++CCDEPMODE ++AMDEPBACKSLASH ++AMDEP_FALSE ++AMDEP_TRUE ++am__quote ++am__include ++DEPDIR ++OBJEXT ++EXEEXT ++ac_ct_CC ++CPPFLAGS ++LDFLAGS ++CFLAGS ++CC ++am__untar ++am__tar ++AMTAR ++am__leading_dot ++SET_MAKE ++AWK ++mkdir_p ++MKDIR_P ++INSTALL_STRIP_PROGRAM ++STRIP ++install_sh ++MAKEINFO ++AUTOHEADER ++AUTOMAKE ++AUTOCONF ++ACLOCAL ++VERSION ++PACKAGE ++CYGPATH_W ++am__isrc ++INSTALL_DATA ++INSTALL_SCRIPT ++INSTALL_PROGRAM ++target_alias ++host_alias ++build_alias ++LIBS ++ECHO_T ++ECHO_N ++ECHO_C ++DEFS ++mandir ++localedir ++libdir ++psdir ++pdfdir ++dvidir ++htmldir ++infodir ++docdir ++oldincludedir ++includedir ++localstatedir ++sharedstatedir ++sysconfdir ++datadir ++datarootdir ++libexecdir ++sbindir ++bindir ++program_transform_name ++prefix ++exec_prefix ++PACKAGE_BUGREPORT ++PACKAGE_STRING ++PACKAGE_VERSION ++PACKAGE_TARNAME ++PACKAGE_NAME ++PATH_SEPARATOR ++SHELL' + ac_subst_files='' ++ac_user_opts=' ++enable_option_checking ++enable_dependency_tracking ++enable_shared ++enable_static ++enable_fast_install ++with_gnu_ld ++enable_libtool_lock ++with_pic ++with_tags ++enable_compile_warnings ++enable_iso_c ++with_help_dir ++with_omf_dir ++with_help_formats ++enable_scrollkeeper ++with_gconf_source ++with_gconf_schema_file_dir ++enable_schemas_install ++with_x ++with_doc_dir ++enable_policykit ++enable_checkfg ++enable_xevents ++enable_tests ++enable_gconf_defaults ++enable_applets ++enable_docbook_docs ++with_dbus_services ++with_dpms_ext ++enable_more_warnings ++' + ac_precious_vars='build_alias + host_alias + target_alias +@@ -1040,6 +1095,8 @@ + # Initialize some variables set by options. + ac_init_help= + ac_init_version=false ++ac_unrecognized_opts= ++ac_unrecognized_sep= + # The variables have the same names as the options, with + # dashes changed to underlines. + cache_file=/dev/null +@@ -1138,13 +1195,21 @@ + datarootdir=$ac_optarg ;; + + -disable-* | --disable-*) +- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` ++ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 + { (exit 1); exit 1; }; } +- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` +- eval enable_$ac_feature=no ;; ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"enable_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval enable_$ac_useropt=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; +@@ -1157,13 +1222,21 @@ + dvidir=$ac_optarg ;; + + -enable-* | --enable-*) +- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` ++ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 + { (exit 1); exit 1; }; } +- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` +- eval enable_$ac_feature=\$ac_optarg ;; ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"enable_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval enable_$ac_useropt=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ +@@ -1354,22 +1427,38 @@ + ac_init_version=: ;; + + -with-* | --with-*) +- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` ++ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid package name: $ac_package" >&2 ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 + { (exit 1); exit 1; }; } +- ac_package=`echo $ac_package | sed 's/[-.]/_/g'` +- eval with_$ac_package=\$ac_optarg ;; ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"with_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval with_$ac_useropt=\$ac_optarg ;; + + -without-* | --without-*) +- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` ++ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid package name: $ac_package" >&2 ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 + { (exit 1); exit 1; }; } +- ac_package=`echo $ac_package | sed 's/[-.]/_/g'` +- eval with_$ac_package=no ;; ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"with_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval with_$ac_useropt=no ;; + + --x) + # Obsolete; use --with-x. +@@ -1389,7 +1478,7 @@ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + +- -*) { echo "$as_me: error: unrecognized option: $ac_option ++ -*) { $as_echo "$as_me: error: unrecognized option: $ac_option + Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } + ;; +@@ -1398,16 +1487,16 @@ + 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 && +- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 ++ { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { (exit 1); exit 1; }; } + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + + *) + # FIXME: should be removed in autoconf 3.0. +- echo "$as_me: WARNING: you should use --build, --host, --target" >&2 ++ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && +- echo "$as_me: WARNING: invalid host type: $ac_option" >&2 ++ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + ;; + +@@ -1416,22 +1505,38 @@ + + if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` +- { echo "$as_me: error: missing argument to $ac_option" >&2 ++ { $as_echo "$as_me: error: missing argument to $ac_option" >&2 + { (exit 1); exit 1; }; } + fi + +-# Be sure to have absolute directory names. ++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; }; } ;; ++ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; ++ esac ++fi ++ ++# Check all directory arguments for consistency. + for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir + do + eval ac_val=\$$ac_var ++ # Remove trailing slashes. ++ case $ac_val in ++ */ ) ++ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` ++ eval $ac_var=\$ac_val;; ++ esac ++ # Be sure to have absolute directory names. + case $ac_val in + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac +- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 ++ { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; } + done + +@@ -1446,7 +1551,7 @@ + if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe +- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. ++ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used." >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes +@@ -1462,10 +1567,10 @@ + ac_pwd=`pwd` && test -n "$ac_pwd" && + ac_ls_di=`ls -di .` && + ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || +- { echo "$as_me: error: Working directory cannot be determined" >&2 ++ { $as_echo "$as_me: error: working directory cannot be determined" >&2 + { (exit 1); exit 1; }; } + test "X$ac_ls_di" = "X$ac_pwd_ls_di" || +- { echo "$as_me: error: pwd does not report name of working directory" >&2 ++ { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 + { (exit 1); exit 1; }; } + + +@@ -1473,12 +1578,12 @@ + if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then the parent directory. +- ac_confdir=`$as_dirname -- "$0" || +-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$0" : 'X\(//\)[^/]' \| \ +- X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)' \| . 2>/dev/null || +-echo X"$0" | ++ ac_confdir=`$as_dirname -- "$as_myself" || ++$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_myself" : 'X\(//\)[^/]' \| \ ++ X"$as_myself" : 'X\(//\)$' \| \ ++ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$as_myself" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -1505,12 +1610,12 @@ + fi + if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." +- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 ++ { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 + { (exit 1); exit 1; }; } + fi + ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" + ac_abs_confdir=`( +- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 ++ cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 + { (exit 1); exit 1; }; } + pwd)` + # When building in place, set srcdir=. +@@ -1559,9 +1664,9 @@ + + Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX +- [$ac_default_prefix] ++ [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX +- [PREFIX] ++ [PREFIX] + + By default, \`make install' will install all the files in + \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +@@ -1571,25 +1676,26 @@ + For better control, use the options below. + + Fine tuning of the installation directories: +- --bindir=DIR user executables [EPREFIX/bin] +- --sbindir=DIR system admin executables [EPREFIX/sbin] +- --libexecdir=DIR program executables [EPREFIX/libexec] +- --sysconfdir=DIR read-only single-machine data [PREFIX/etc] +- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] +- --localstatedir=DIR modifiable single-machine data [PREFIX/var] +- --libdir=DIR object code libraries [EPREFIX/lib] +- --includedir=DIR C header files [PREFIX/include] +- --oldincludedir=DIR C header files for non-gcc [/usr/include] +- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] +- --datadir=DIR read-only architecture-independent data [DATAROOTDIR] +- --infodir=DIR info documentation [DATAROOTDIR/info] +- --localedir=DIR locale-dependent data [DATAROOTDIR/locale] +- --mandir=DIR man documentation [DATAROOTDIR/man] +- --docdir=DIR documentation root [DATAROOTDIR/doc/gnome-power-manager] +- --htmldir=DIR html documentation [DOCDIR] +- --dvidir=DIR dvi documentation [DOCDIR] +- --pdfdir=DIR pdf documentation [DOCDIR] +- --psdir=DIR ps documentation [DOCDIR] ++ --bindir=DIR user executables [EPREFIX/bin] ++ --sbindir=DIR system admin executables [EPREFIX/sbin] ++ --libexecdir=DIR program executables [EPREFIX/libexec] ++ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] ++ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] ++ --localstatedir=DIR modifiable single-machine data [PREFIX/var] ++ --libdir=DIR object code libraries [EPREFIX/lib] ++ --includedir=DIR C header files [PREFIX/include] ++ --oldincludedir=DIR C header files for non-gcc [/usr/include] ++ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] ++ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] ++ --infodir=DIR info documentation [DATAROOTDIR/info] ++ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] ++ --mandir=DIR man documentation [DATAROOTDIR/man] ++ --docdir=DIR documentation root ++ [DATAROOTDIR/doc/gnome-power-manager] ++ --htmldir=DIR html documentation [DOCDIR] ++ --dvidir=DIR dvi documentation [DOCDIR] ++ --pdfdir=DIR pdf documentation [DOCDIR] ++ --psdir=DIR ps documentation [DOCDIR] + _ACEOF + + cat <<\_ACEOF +@@ -1616,6 +1722,7 @@ + cat <<\_ACEOF + + Optional Features: ++ --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --disable-dependency-tracking speeds up one-time build +@@ -1719,15 +1826,17 @@ + if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue +- test -d "$ac_dir" || continue ++ test -d "$ac_dir" || ++ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || ++ continue + ac_builddir=. + + case "$ac_dir" in + .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) +- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` ++ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. +- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` ++ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; +@@ -1763,7 +1872,7 @@ + echo && + $SHELL "$ac_srcdir/configure" --help=recursive + else +- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 ++ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } + done +@@ -1773,10 +1882,10 @@ + if $ac_init_version; then + cat <<\_ACEOF + gnome-power-manager configure 2.24.0 +-generated by GNU Autoconf 2.61 ++generated by GNU Autoconf 2.63 + + Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + _ACEOF +@@ -1787,7 +1896,7 @@ + running configure, to aid debugging if configure makes a mistake. + + It was created by gnome-power-manager $as_me 2.24.0, which was +-generated by GNU Autoconf 2.61. Invocation command line was ++generated by GNU Autoconf 2.63. Invocation command line was + + $ $0 $@ + +@@ -1823,7 +1932,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- echo "PATH: $as_dir" ++ $as_echo "PATH: $as_dir" + done + IFS=$as_save_IFS + +@@ -1858,7 +1967,7 @@ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) +- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; +@@ -1910,11 +2019,12 @@ + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( +- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; ++ *_cv_*) { $as_echo "$as_me:$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 ;; + esac ;; + esac +@@ -1944,9 +2054,9 @@ + do + eval ac_val=\$$ac_var + case $ac_val in +- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac +- echo "$ac_var='\''$ac_val'\''" ++ $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + +@@ -1961,9 +2071,9 @@ + do + eval ac_val=\$$ac_var + case $ac_val in +- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac +- echo "$ac_var='\''$ac_val'\''" ++ $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi +@@ -1979,8 +2089,8 @@ + echo + fi + test "$ac_signal" != 0 && +- echo "$as_me: caught signal $ac_signal" +- echo "$as_me: exit $exit_status" ++ $as_echo "$as_me: caught signal $ac_signal" ++ $as_echo "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && +@@ -2022,21 +2132,24 @@ + + + # Let the site file select an alternate cache file if it wants to. +-# Prefer explicitly selected file to automatically selected ones. ++# Prefer an explicitly selected file to automatically selected ones. ++ac_site_file1=NONE ++ac_site_file2=NONE + if test -n "$CONFIG_SITE"; then +- set x "$CONFIG_SITE" ++ ac_site_file1=$CONFIG_SITE + elif test "x$prefix" != xNONE; then +- set x "$prefix/share/config.site" "$prefix/etc/config.site" ++ ac_site_file1=$prefix/share/config.site ++ ac_site_file2=$prefix/etc/config.site + else +- set x "$ac_default_prefix/share/config.site" \ +- "$ac_default_prefix/etc/config.site" ++ ac_site_file1=$ac_default_prefix/share/config.site ++ ac_site_file2=$ac_default_prefix/etc/config.site + fi +-shift +-for ac_site_file ++for ac_site_file in "$ac_site_file1" "$ac_site_file2" + do ++ test "x$ac_site_file" = xNONE && continue + if test -r "$ac_site_file"; then +- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +-echo "$as_me: loading site script $ac_site_file" >&6;} ++ { $as_echo "$as_me:$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" + fi +@@ -2046,16 +2159,16 @@ + # Some versions of bash will fail to source /dev/null (special + # files actually), so we avoid doing that. + if test -f "$cache_file"; then +- { echo "$as_me:$LINENO: loading cache $cache_file" >&5 +-echo "$as_me: loading cache $cache_file" >&6;} ++ { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 ++$as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi + else +- { echo "$as_me:$LINENO: creating cache $cache_file" >&5 +-echo "$as_me: creating cache $cache_file" >&6;} ++ { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 ++$as_echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file + fi + +@@ -2069,29 +2182,38 @@ + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) +- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ++ { $as_echo "$as_me:$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) +- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 +-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ++ { $as_echo "$as_me:$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=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then +- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 +-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} +- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 +-echo "$as_me: former value: $ac_old_val" >&2;} +- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 +-echo "$as_me: current value: $ac_new_val" >&2;} +- ac_cache_corrupted=: ++ # differences in whitespace do not lead to failure. ++ 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: 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: 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: former value: \`$ac_old_val'" >&2;} ++ { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 ++$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in +- *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; ++ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in +@@ -2101,10 +2223,12 @@ + fi + done + if $ac_cache_corrupted; then +- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 +-echo "$as_me: error: changes in the environment can compromise the build" >&2;} +- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} ++ { $as_echo "$as_me:$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: 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; }; } + fi + +@@ -2159,8 +2283,8 @@ + fi + done + if test -z "$ac_aux_dir"; then +- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} ++ { { $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; }; } + fi + +@@ -2186,11 +2310,12 @@ + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # OS/2's system install, which has a completely different semantic + # ./install, which can be erroneously created by make from ./install.sh. +-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } ++# Reject install programs that cannot install multiple files. ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -2219,17 +2344,29 @@ + # program-specific install script used by HP pwplus--don't use. + : + else +- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" +- break 3 ++ rm -rf conftest.one conftest.two conftest.dir ++ echo one > conftest.one ++ echo two > conftest.two ++ mkdir conftest.dir ++ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && ++ test -s conftest.one && test -s conftest.two && ++ test -s conftest.dir/conftest.one && ++ test -s conftest.dir/conftest.two ++ then ++ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" ++ break 3 ++ fi + fi + fi + done + done + ;; + esac ++ + done + IFS=$as_save_IFS + ++rm -rf conftest.one conftest.two conftest.dir + + fi + if test "${ac_cv_path_install+set}" = set; then +@@ -2242,8 +2379,8 @@ + INSTALL=$ac_install_sh + fi + fi +-{ echo "$as_me:$LINENO: result: $INSTALL" >&5 +-echo "${ECHO_T}$INSTALL" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 ++$as_echo "$INSTALL" >&6; } + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. + # It thinks the first close brace ends the variable substitution. +@@ -2253,8 +2390,8 @@ + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 ++$as_echo_n "checking whether build environment is sane... " >&6; } + # Just in case + sleep 1 + echo timestamp > conftest.file +@@ -2277,9 +2414,9 @@ + # 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". +- { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken ++ { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken + alias in your environment" >&5 +-echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken ++$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; }; } + fi +@@ -2290,26 +2427,23 @@ + # Ok. + : + else +- { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! ++ { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! + Check your system clock" >&5 +-echo "$as_me: error: newly created file is older than distributed files! ++$as_echo "$as_me: error: newly created file is older than distributed files! + Check your system clock" >&2;} + { (exit 1); exit 1; }; } + fi +-{ echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++{ $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" + # Use a double $ so make ignores it. + test "$program_suffix" != NONE && + program_transform_name="s&\$&$program_suffix&;$program_transform_name" +-# Double any \ or $. echo might interpret backslashes. ++# Double any \ or $. + # By default was `s,x,x', remove it if useless. +-cat <<\_ACEOF >conftest.sed +-s/[\\$]/&&/g;s/;s,x,x,$// +-_ACEOF +-program_transform_name=`echo $program_transform_name | sed -f conftest.sed` +-rm -f conftest.sed ++ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' ++program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` + + # expand $ac_aux_dir to an absolute path + am_aux_dir=`cd $ac_aux_dir && pwd` +@@ -2320,15 +2454,15 @@ + am_missing_run="$MISSING --run " + else + am_missing_run= +- { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 +-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 ++$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + fi + +-{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +-echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +@@ -2363,8 +2497,8 @@ + MKDIR_P="$ac_install_sh -d" + fi + fi +-{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +-echo "${ECHO_T}$MKDIR_P" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 ++$as_echo "$MKDIR_P" >&6; } + + mkdir_p="$MKDIR_P" + case $mkdir_p in +@@ -2376,10 +2510,10 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_prog_AWK+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +@@ -2392,7 +2526,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -2403,22 +2537,23 @@ + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then +- { echo "$as_me:$LINENO: result: $AWK" >&5 +-echo "${ECHO_T}$AWK" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $AWK" >&5 ++$as_echo "$AWK" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + + test -n "$AWK" && break + done + +-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } +-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.make <<\_ACEOF + SHELL = /bin/sh +@@ -2435,12 +2570,12 @@ + rm -f conftest.make + fi + if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + SET_MAKE= + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" + fi + +@@ -2459,8 +2594,8 @@ + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then +- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} ++ { { $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; }; } + fi + fi +@@ -2515,10 +2650,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_prog_STRIP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +@@ -2531,7 +2666,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -2542,11 +2677,11 @@ + fi + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then +- { echo "$as_me:$LINENO: result: $STRIP" >&5 +-echo "${ECHO_T}$STRIP" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 ++$as_echo "$STRIP" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -2555,10 +2690,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +@@ -2571,7 +2706,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -2582,11 +2717,11 @@ + fi + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then +- { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +-echo "${ECHO_T}$ac_ct_STRIP" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 ++$as_echo "$ac_ct_STRIP" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + if test "x$ac_ct_STRIP" = x; then +@@ -2594,12 +2729,8 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++{ $as_echo "$as_me:$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 + STRIP=$ac_ct_STRIP +@@ -2635,10 +2766,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -2651,7 +2782,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -2662,11 +2793,11 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -2675,10 +2806,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +@@ -2691,7 +2822,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -2702,11 +2833,11 @@ + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++$as_echo "$ac_ct_CC" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + if test "x$ac_ct_CC" = x; then +@@ -2714,12 +2845,8 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++{ $as_echo "$as_me:$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 + CC=$ac_ct_CC +@@ -2732,10 +2859,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -2748,7 +2875,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -2759,11 +2886,11 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -2772,10 +2899,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -2793,7 +2920,7 @@ + continue + fi + ac_cv_prog_CC="cc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -2816,11 +2943,11 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -2831,10 +2958,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -2847,7 +2974,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -2858,11 +2985,11 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -2875,10 +3002,10 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +@@ -2891,7 +3018,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -2902,11 +3029,11 @@ + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++$as_echo "$ac_ct_CC" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -2918,12 +3045,8 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++{ $as_echo "$as_me:$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 + CC=$ac_ct_CC +@@ -2933,44 +3056,50 @@ + fi + + +-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH ++test -z "$CC" && { { $as_echo "$as_me:$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 +-echo "$as_me: error: no acceptable C compiler found in \$PATH ++$as_echo "$as_me: error: no acceptable C compiler found in \$PATH + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { (exit 1); exit 1; }; }; } + + # Provide some information about the compiler. +-echo "$as_me:$LINENO: checking for C compiler version" >&5 +-ac_compiler=`set X $ac_compile; echo $2` ++$as_echo "$as_me:$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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + + cat >conftest.$ac_ext <<_ACEOF +@@ -2989,27 +3118,22 @@ + } + _ACEOF + ac_clean_files_save=$ac_clean_files +-ac_clean_files="$ac_clean_files a.out a.exe b.out" ++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.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. +-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } +-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +-# +-# List of possible output files, starting from the most likely. +-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) +-# only as a last resort. b.out is created by i960 compilers. +-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' +-# +-# The IRIX 6 linker writes into existing files which may not be +-# executable, retaining their permissions. Remove them first so a +-# subsequent execution test works. ++{ $as_echo "$as_me:$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[^ ]*//'` ++ ++# The possible output files: ++ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" ++ + ac_rmfiles= + for ac_file in $ac_files + do + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac + done +@@ -3020,10 +3144,11 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; 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' +@@ -3034,7 +3159,7 @@ + do + test -f "$ac_file" || continue + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most +@@ -3061,25 +3186,27 @@ + ac_file='' + fi + +-{ echo "$as_me:$LINENO: result: $ac_file" >&5 +-echo "${ECHO_T}$ac_file" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 ++$as_echo "$ac_file" >&6; } + if test -z "$ac_file"; then +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables ++{ { $as_echo "$as_me:$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 +-echo "$as_me: error: C compiler cannot create executables ++$as_echo "$as_me: error: C compiler cannot create executables + See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; } ++ { (exit 77); exit 77; }; }; } + 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. +-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +@@ -3088,49 +3215,53 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else +- { { echo "$as_me:$LINENO: error: cannot run C compiled programs. ++ { { $as_echo "$as_me:$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. + If you meant to cross compile, use \`--host'. + See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot run C compiled programs. ++$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; }; } ++ { (exit 1); exit 1; }; }; } + fi + fi + fi +-{ echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++{ $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + +-rm -f a.out a.exe conftest$ac_cv_exeext b.out ++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.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. +-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } +-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 +-echo "${ECHO_T}$cross_compiling" >&6; } ++{ $as_echo "$as_me:$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 "$cross_compiling" >&6; } + +-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 +-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 ++$as_echo_n "checking for suffix of executables... " >&6; } + if { (ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # If both `conftest.exe' and `conftest' are `present' (well, observable) + # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +@@ -3139,31 +3270,33 @@ + for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + break;; + * ) break;; + esac + done + else +- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link ++ { { $as_echo "$as_me:$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 +-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link ++$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; }; } ++ { (exit 1); exit 1; }; }; } + fi + + rm -f conftest$ac_cv_exeext +-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +-echo "${ECHO_T}$ac_cv_exeext" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 ++$as_echo "$ac_cv_exeext" >&6; } + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT +-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 +-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -3186,40 +3319,43 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac + done + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile ++{ { $as_echo "$as_me:$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 +-echo "$as_me: error: cannot compute suffix of object files: cannot compile ++$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { (exit 1); exit 1; }; }; } + fi + + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +-echo "${ECHO_T}$ac_cv_objext" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 ++$as_echo "$ac_cv_objext" >&6; } + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -3245,20 +3381,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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_compiler_gnu=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_compiler_gnu=no +@@ -3268,15 +3405,19 @@ + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } +-GCC=`test $ac_compiler_gnu = yes && echo yes` ++{ $as_echo "$as_me:$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 ++else ++ GCC= ++fi + ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS +-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes +@@ -3303,20 +3444,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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_prog_cc_g=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + CFLAGS="" +@@ -3341,20 +3483,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_c_werror_flag=$ac_save_c_werror_flag +@@ -3380,20 +3523,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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_prog_cc_g=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -3408,8 +3552,8 @@ + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } ++{ $as_echo "$as_me:$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 + elif test $ac_cv_prog_cc_g = yes; then +@@ -3425,10 +3569,10 @@ + CFLAGS= + fi + fi +-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_cv_prog_cc_c89=no + ac_save_CC=$CC +@@ -3499,20 +3643,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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_prog_cc_c89=$ac_arg + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -3528,15 +3673,15 @@ + # AC_CACHE_VAL + case "x$ac_cv_prog_cc_c89" in + x) +- { echo "$as_me:$LINENO: result: none needed" >&5 +-echo "${ECHO_T}none needed" >&6; } ;; ++ { $as_echo "$as_me:$LINENO: result: none needed" >&5 ++$as_echo "none needed" >&6; } ;; + xno) +- { echo "$as_me:$LINENO: result: unsupported" >&5 +-echo "${ECHO_T}unsupported" >&6; } ;; ++ { $as_echo "$as_me:$LINENO: result: unsupported" >&5 ++$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" +- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; ++ { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 ++$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; + esac + + +@@ -3557,8 +3702,8 @@ + .PHONY: am__doit + END + # If we don't find an include directive, just comment out the code. +-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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= + _am_result=none +@@ -3585,8 +3730,8 @@ + fi + + +-{ echo "$as_me:$LINENO: result: $_am_result" >&5 +-echo "${ECHO_T}$_am_result" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 ++$as_echo "$_am_result" >&6; } + rm -f confinc confmf + + # Check whether --enable-dependency-tracking was given. +@@ -3610,10 +3755,10 @@ + + depcc="$CC" am_compiler_list= + +-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up +@@ -3701,8 +3846,8 @@ + fi + + fi +-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } ++{ $as_echo "$as_me:$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 + + if +@@ -3717,16 +3862,16 @@ + + + if test "x$CC" != xcc; then +- { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5 +-echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5 ++$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } + else +- { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5 +-echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5 ++$as_echo_n "checking whether cc understands -c and -o together... " >&6; } + fi +-set dummy $CC; ac_cc=`echo $2 | ++set dummy $CC; ac_cc=`$as_echo "$2" | + sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` + if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -3752,19 +3897,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + test -f conftest2.$ac_objext && { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; + then + eval ac_cv_prog_cc_${ac_cc}_c_o=yes +@@ -3775,10 +3922,11 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' + rm -f conftest2.* +@@ -3786,19 +3934,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + test -f conftest2.$ac_objext && { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; + then + # cc works too. +@@ -3816,11 +3966,11 @@ + + fi + if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + + cat >>confdefs.h <<\_ACEOF + #define NO_MINUS_C_MINUS_O 1 +@@ -3856,11 +4006,12 @@ + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # OS/2's system install, which has a completely different semantic + # ./install, which can be erroneously created by make from ./install.sh. +-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } ++# Reject install programs that cannot install multiple files. ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -3889,17 +4040,29 @@ + # program-specific install script used by HP pwplus--don't use. + : + else +- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" +- break 3 ++ rm -rf conftest.one conftest.two conftest.dir ++ echo one > conftest.one ++ echo two > conftest.two ++ mkdir conftest.dir ++ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && ++ test -s conftest.one && test -s conftest.two && ++ test -s conftest.dir/conftest.one && ++ test -s conftest.dir/conftest.two ++ then ++ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" ++ break 3 ++ fi + fi + fi + done + done + ;; + esac ++ + done + IFS=$as_save_IFS + ++rm -rf conftest.one conftest.two conftest.dir + + fi + if test "${ac_cv_path_install+set}" = set; then +@@ -3912,8 +4075,8 @@ + INSTALL=$ac_install_sh + fi + fi +-{ echo "$as_me:$LINENO: result: $INSTALL" >&5 +-echo "${ECHO_T}$INSTALL" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 ++$as_echo "$INSTALL" >&6; } + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. + # It thinks the first close brace ends the variable substitution. +@@ -3997,34 +4160,34 @@ + + # Make sure we can run config.sub. + $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || +- { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} ++ { { $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; }; } + +-{ echo "$as_me:$LINENO: checking build system type" >&5 +-echo $ECHO_N "checking build system type... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking build system type" >&5 ++$as_echo_n "checking build system type... " >&6; } + if test "${ac_cv_build+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $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 && +- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +-echo "$as_me: error: cannot guess build type; you must specify one" >&2;} ++ { { $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; }; } + ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || +- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} ++ { { $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; }; } + + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +-echo "${ECHO_T}$ac_cv_build" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 ++$as_echo "$ac_cv_build" >&6; } + case $ac_cv_build in + *-*-*) ;; +-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +-echo "$as_me: error: invalid value of canonical build" >&2;} ++*) { { $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; }; };; + esac + build=$ac_cv_build +@@ -4041,27 +4204,27 @@ + case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +-{ echo "$as_me:$LINENO: checking host system type" >&5 +-echo $ECHO_N "checking host system type... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking host system type" >&5 ++$as_echo_n "checking host system type... " >&6; } + if test "${ac_cv_host+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $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` || +- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} ++ { { $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; }; } + fi + + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +-echo "${ECHO_T}$ac_cv_host" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 ++$as_echo "$ac_cv_host" >&6; } + case $ac_cv_host in + *-*-*) ;; +-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +-echo "$as_me: error: invalid value of canonical host" >&2;} ++*) { { $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; }; };; + esac + host=$ac_cv_host +@@ -4078,10 +4241,10 @@ + case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + +-{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 "${lt_cv_path_SED+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + # Loop through the user's path and test for sed and gsed. + # Then use that list of sed's as ones to test for truncation. +@@ -4134,45 +4297,40 @@ + + SED=$lt_cv_path_SED + +-{ echo "$as_me:$LINENO: result: $SED" >&5 +-echo "${ECHO_T}$SED" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $SED" >&5 ++$as_echo "$SED" >&6; } + +-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } +-if test "${ac_cv_path_GREP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- # Extract the first word of "grep ggrep" to use in msg output +-if test -z "$GREP"; then +-set dummy grep ggrep; ac_prog_name=$2 ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else ++ if test -z "$GREP"; then + ac_path_GREP_found=false +-# Loop through the user's path and test for each of PROGNAME-LIST +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++ # Loop through the user's path and test for each of PROGNAME-LIST ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + 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 +- # Check for GNU ac_path_GREP and select it if it is found. ++ 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 ++# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP + case `"$ac_path_GREP" --version 2>&1` in + *GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; + *) + ac_count=0 +- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" ++ $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" +- echo 'GREP' >> "conftest.nl" ++ $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` +@@ -4187,74 +4345,60 @@ + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; + esac + +- +- $ac_path_GREP_found && break 3 ++ $ac_path_GREP_found && break 3 ++ done + done + done +- +-done + IFS=$as_save_IFS +- +- +-fi +- +-GREP="$ac_cv_path_GREP" +-if test -z "$GREP"; then +- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} ++ 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; }; } +-fi +- ++ fi + else + ac_cv_path_GREP=$GREP + fi + +- + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +-echo "${ECHO_T}$ac_cv_path_GREP" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 ++$as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +-{ echo "$as_me:$LINENO: checking for egrep" >&5 +-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 ++$as_echo_n "checking for egrep... " >&6; } + if test "${ac_cv_path_EGREP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else +- # Extract the first word of "egrep" to use in msg output +-if test -z "$EGREP"; then +-set dummy egrep; ac_prog_name=$2 +-if test "${ac_cv_path_EGREP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else ++ if test -z "$EGREP"; then + ac_path_EGREP_found=false +-# Loop through the user's path and test for each of PROGNAME-LIST +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++ # Loop through the user's path and test for each of PROGNAME-LIST ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + 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 +- # Check for GNU ac_path_EGREP and select it if it is found. ++ 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 ++# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP + case `"$ac_path_EGREP" --version 2>&1` in + *GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; + *) + ac_count=0 +- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" ++ $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" +- echo 'EGREP' >> "conftest.nl" ++ $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` +@@ -4269,33 +4413,24 @@ + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; + esac + +- +- $ac_path_EGREP_found && break 3 ++ $ac_path_EGREP_found && break 3 ++ done + done + done +- +-done + IFS=$as_save_IFS +- +- +-fi +- +-EGREP="$ac_cv_path_EGREP" +-if test -z "$EGREP"; then +- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} ++ 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; }; } +-fi +- ++ fi + else + ac_cv_path_EGREP=$EGREP + fi + +- + fi + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 ++$as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +@@ -4310,8 +4445,8 @@ + ac_prog=ld + if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. +- { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 ++$as_echo_n "checking for ld used by $CC... " >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw +@@ -4340,14 +4475,14 @@ + ;; + esac + elif test "$with_gnu_ld" = yes; then +- { echo "$as_me:$LINENO: checking for GNU ld" >&5 +-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 ++$as_echo_n "checking for GNU ld... " >&6; } + else +- { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +@@ -4377,19 +4512,19 @@ + + LD="$lt_cv_path_LD" + if test -n "$LD"; then +- { echo "$as_me:$LINENO: result: $LD" >&5 +-echo "${ECHO_T}$LD" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $LD" >&5 ++$as_echo "$LD" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi +-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} ++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; }; } +-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + # I'd rather use --version here, but apparently some GNU lds only accept -v. + case `$LD -v 2>&1 </dev/null` in +@@ -4401,20 +4536,20 @@ + ;; + esac + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 ++$as_echo "$lt_cv_prog_gnu_ld" >&6; } + with_gnu_ld=$lt_cv_prog_gnu_ld + + +-{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 +-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_cv_ld_reload_flag='-r' + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 +-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } ++{ $as_echo "$as_me:$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 + "" | " "*) ;; +@@ -4431,10 +4566,10 @@ + ;; + esac + +-{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 +-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 ++$as_echo_n "checking for BSD-compatible nm... " >&6; } + if test "${lt_cv_path_NM+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$NM"; then + # Let the user override the test. +@@ -4480,25 +4615,25 @@ + test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm + fi + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 +-echo "${ECHO_T}$lt_cv_path_NM" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 ++$as_echo "$lt_cv_path_NM" >&6; } + NM="$lt_cv_path_NM" + +-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 +-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + else +- { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +-echo "${ECHO_T}no, using $LN_S" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 ++$as_echo "no, using $LN_S" >&6; } + fi + +-{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 +-echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_cv_file_magic_cmd='$MAGIC_CMD' + lt_cv_file_magic_test_file= +@@ -4681,8 +4816,8 @@ + esac + + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 +-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } ++{ $as_echo "$as_me:$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 + test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -4716,7 +4851,7 @@ + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) +@@ -4731,11 +4866,11 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 4734 "configure"' > conftest.$ac_ext ++ echo '#line 4869 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in +@@ -4773,7 +4908,7 @@ + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.o` in + *32-bit*) +@@ -4824,10 +4959,10 @@ + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" +- { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 +-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -4856,26 +4991,30 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + lt_cv_cc_needs_belf=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + ac_ext=c +@@ -4885,8 +5024,8 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 +-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } ++{ $as_echo "$as_me:$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 + CFLAGS="$SAVE_CFLAGS" +@@ -4898,7 +5037,7 @@ + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.o` in + *64-bit*) +@@ -4923,15 +5062,15 @@ + 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 +-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" +@@ -4963,20 +5102,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +@@ -5000,13 +5140,14 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 +@@ -5014,7 +5155,7 @@ + # Broken: success on invalid input. + continue + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +@@ -5039,8 +5180,8 @@ + else + ac_cv_prog_CPP=$CPP + fi +-{ echo "$as_me:$LINENO: result: $CPP" >&5 +-echo "${ECHO_T}$CPP" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 ++$as_echo "$CPP" >&6; } + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes + do +@@ -5068,20 +5209,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +@@ -5105,13 +5247,14 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 +@@ -5119,7 +5262,7 @@ + # Broken: success on invalid input. + continue + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +@@ -5135,11 +5278,13 @@ + if $ac_preproc_ok; then + : + else +- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check ++ { { $as_echo "$as_me:$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 +-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check ++$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { (exit 1); exit 1; }; }; } + fi + + ac_ext=c +@@ -5149,10 +5294,10 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -5179,20 +5324,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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_stdc=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_stdc=no +@@ -5284,37 +5430,40 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 ++ $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 + + ( exit $ac_status ) + 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 + fi + + + fi + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +-echo "${ECHO_T}$ac_cv_header_stdc" >&6; } ++{ $as_echo "$as_me:$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 +@@ -5336,11 +5485,11 @@ + 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=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -5358,20 +5507,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Header=no" +@@ -5379,12 +5529,15 @@ + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-ac_res=`eval echo '${'$as_ac_Header'}'` +- { echo "$as_me:$LINENO: result: $ac_res" >&5 +-echo "${ECHO_T}$ac_res" >&6; } +-if test `eval echo '${'$as_ac_Header'}'` = yes; then ++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 + cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -5395,20 +5548,21 @@ + + for ac_header in dlfcn.h + do +-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++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 +- { echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + fi +-ac_res=`eval echo '${'$as_ac_Header'}'` +- { echo "$as_me:$LINENO: result: $ac_res" >&5 +-echo "${ECHO_T}$ac_res" >&6; } ++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? +-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++{ $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 +@@ -5424,32 +5578,33 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 +- echo "$as_me: failed program was:" >&5 ++ $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 +-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++$as_echo "$ac_header_compiler" >&6; } + + # Is the header present? +-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++{ $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 +@@ -5463,69 +5618,73 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 +- echo "$as_me: failed program was:" >&5 ++ $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 +-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6; } ++{ $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: ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ { $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:* ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ { $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;} + + ;; + esac +-{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++{ $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + eval "$as_ac_Header=\$ac_header_preproc" + fi +-ac_res=`eval echo '${'$as_ac_Header'}'` +- { echo "$as_me:$LINENO: result: $ac_res" >&5 +-echo "${ECHO_T}$ac_res" >&6; } ++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 +-if test `eval echo '${'$as_ac_Header'}'` = yes; then ++as_val=`eval 'as_val=${'$as_ac_Header'} ++ $as_echo "$as_val"'` ++ if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -5546,10 +5705,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_prog_CXX+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +@@ -5562,7 +5721,7 @@ + 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_CXX="$ac_tool_prefix$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -5573,11 +5732,11 @@ + fi + CXX=$ac_cv_prog_CXX + if test -n "$CXX"; then +- { echo "$as_me:$LINENO: result: $CXX" >&5 +-echo "${ECHO_T}$CXX" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $CXX" >&5 ++$as_echo "$CXX" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -5590,10 +5749,10 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. +@@ -5606,7 +5765,7 @@ + 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_CXX="$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -5617,11 +5776,11 @@ + fi + ac_ct_CXX=$ac_cv_prog_ac_ct_CXX + if test -n "$ac_ct_CXX"; then +- { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +-echo "${ECHO_T}$ac_ct_CXX" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 ++$as_echo "$ac_ct_CXX" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -5633,12 +5792,8 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++{ $as_echo "$as_me:$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 + CXX=$ac_ct_CXX +@@ -5648,43 +5803,47 @@ + fi + fi + # Provide some information about the compiler. +-echo "$as_me:$LINENO: checking for C++ compiler version" >&5 +-ac_compiler=`set X $ac_compile; echo $2` ++$as_echo "$as_me:$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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + +-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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_cxx_compiler_gnu+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -5710,20 +5869,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_compiler_gnu=no +@@ -5733,15 +5893,19 @@ + ac_cv_cxx_compiler_gnu=$ac_compiler_gnu + + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } +-GXX=`test $ac_compiler_gnu = yes && echo yes` ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 ++$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } ++if test $ac_compiler_gnu = yes; then ++ GXX=yes ++else ++ GXX= ++fi + ac_test_CXXFLAGS=${CXXFLAGS+set} + ac_save_CXXFLAGS=$CXXFLAGS +-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 ++$as_echo_n "checking whether $CXX accepts -g... " >&6; } + if test "${ac_cv_prog_cxx_g+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes +@@ -5768,20 +5932,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + CXXFLAGS="" +@@ -5806,20 +5971,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +@@ -5845,20 +6011,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -5873,8 +6040,8 @@ + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 ++$as_echo "$ac_cv_prog_cxx_g" >&6; } + if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS + elif test $ac_cv_prog_cxx_g = yes; then +@@ -5898,10 +6065,10 @@ + + depcc="$CXX" am_compiler_list= + +-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++$as_echo_n "checking dependency style of $depcc... " >&6; } + if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up +@@ -5989,8 +6156,8 @@ + fi + + fi +-{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 ++$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } + CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + + if +@@ -6014,11 +6181,11 @@ + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +-{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 ++$as_echo_n "checking how to run the C++ preprocessor... " >&6; } + if test -z "$CXXCPP"; then + if test "${ac_cv_prog_CXXCPP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + # Double quotes because CXXCPP needs to be expanded + for CXXCPP in "$CXX -E" "/lib/cpp" +@@ -6050,20 +6217,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then + : + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +@@ -6087,13 +6255,14 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err +@@ -6101,7 +6270,7 @@ + # Broken: success on invalid input. + continue + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +@@ -6126,8 +6295,8 @@ + else + ac_cv_prog_CXXCPP=$CXXCPP + fi +-{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 +-echo "${ECHO_T}$CXXCPP" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5 ++$as_echo "$CXXCPP" >&6; } + ac_preproc_ok=false + for ac_cxx_preproc_warn_flag in '' yes + do +@@ -6155,20 +6324,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then + : + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +@@ -6192,13 +6362,14 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err +@@ -6206,7 +6377,7 @@ + # Broken: success on invalid input. + continue + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +@@ -6222,11 +6393,13 @@ + if $ac_preproc_ok; then + : + else +- { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check ++ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check + See \`config.log' for more details." >&5 +-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check ++$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { (exit 1); exit 1; }; }; } + fi + + ac_ext=cpp +@@ -6247,10 +6420,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_prog_F77+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$F77"; then + ac_cv_prog_F77="$F77" # Let the user override the test. +@@ -6263,7 +6436,7 @@ + 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_F77="$ac_tool_prefix$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -6274,11 +6447,11 @@ + fi + F77=$ac_cv_prog_F77 + if test -n "$F77"; then +- { echo "$as_me:$LINENO: result: $F77" >&5 +-echo "${ECHO_T}$F77" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $F77" >&5 ++$as_echo "$F77" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -6291,10 +6464,10 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_prog_ac_ct_F77+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_F77"; then + ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. +@@ -6307,7 +6480,7 @@ + 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_F77="$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -6318,11 +6491,11 @@ + fi + ac_ct_F77=$ac_cv_prog_ac_ct_F77 + if test -n "$ac_ct_F77"; then +- { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 +-echo "${ECHO_T}$ac_ct_F77" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 ++$as_echo "$ac_ct_F77" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -6334,12 +6507,8 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++{ $as_echo "$as_me:$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 + F77=$ac_ct_F77 +@@ -6348,37 +6517,41 @@ + + + # Provide some information about the compiler. +-echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 +-ac_compiler=`set X $ac_compile; echo $2` ++$as_echo "$as_me:$LINENO: checking for Fortran 77 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + rm -f a.out + +@@ -6386,10 +6559,10 @@ + # input file. (Note that this only needs to work for GNU compilers.) + ac_save_ext=$ac_ext + ac_ext=F +-{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 +-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 ++$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; } + if test "${ac_cv_f77_compiler_gnu+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + program main +@@ -6405,20 +6578,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_compiler_gnu=no +@@ -6428,16 +6602,16 @@ + ac_cv_f77_compiler_gnu=$ac_compiler_gnu + + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 +-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 ++$as_echo "$ac_cv_f77_compiler_gnu" >&6; } + ac_ext=$ac_save_ext + ac_test_FFLAGS=${FFLAGS+set} + ac_save_FFLAGS=$FFLAGS + FFLAGS= +-{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 +-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 ++$as_echo_n "checking whether $F77 accepts -g... " >&6; } + if test "${ac_cv_prog_f77_g+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + FFLAGS=-g + cat >conftest.$ac_ext <<_ACEOF +@@ -6451,20 +6625,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_f77_g=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_prog_f77_g=no +@@ -6473,8 +6648,8 @@ + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 +-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 ++$as_echo "$ac_cv_prog_f77_g" >&6; } + if test "$ac_test_FFLAGS" = set; then + FFLAGS=$ac_save_FFLAGS + elif test $ac_cv_prog_f77_g = yes; then +@@ -6491,7 +6666,11 @@ + fi + fi + +-G77=`test $ac_compiler_gnu = yes && echo yes` ++if test $ac_compiler_gnu = yes; then ++ G77=yes ++else ++ G77= ++fi + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -6503,10 +6682,10 @@ + # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! + + # find the maximum length of command line arguments +-{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 +-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + i=0 + teststring="ABCD" +@@ -6615,11 +6794,11 @@ + fi + + if test -n $lt_cv_sys_max_cmd_len ; then +- { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 +-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 ++$as_echo "$lt_cv_sys_max_cmd_len" >&6; } + else +- { echo "$as_me:$LINENO: result: none" >&5 +-echo "${ECHO_T}none" >&6; } ++ { $as_echo "$as_me:$LINENO: result: none" >&5 ++$as_echo "none" >&6; } + fi + + +@@ -6627,10 +6806,10 @@ + + + # Check for command to grab the raw symbol name followed by C symbol from nm. +-{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 +-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + + # These are sane defaults that work on at least a few old systems. +@@ -6735,14 +6914,14 @@ + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; 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 + (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then +@@ -6797,7 +6976,7 @@ + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext}; then + pipe_works=yes + fi +@@ -6832,17 +7011,17 @@ + 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 +- { echo "$as_me:$LINENO: result: failed" >&5 +-echo "${ECHO_T}failed" >&6; } ++ { $as_echo "$as_me:$LINENO: result: failed" >&5 ++$as_echo "failed" >&6; } + else +- { echo "$as_me:$LINENO: result: ok" >&5 +-echo "${ECHO_T}ok" >&6; } ++ { $as_echo "$as_me:$LINENO: result: ok" >&5 ++$as_echo "ok" >&6; } + fi + +-{ echo "$as_me:$LINENO: checking for objdir" >&5 +-echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for objdir" >&5 ++$as_echo_n "checking for objdir... " >&6; } + if test "${lt_cv_objdir+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + rm -f .libs 2>/dev/null + mkdir .libs 2>/dev/null +@@ -6854,8 +7033,8 @@ + fi + rmdir .libs 2>/dev/null + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 +-echo "${ECHO_T}$lt_cv_objdir" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 ++$as_echo "$lt_cv_objdir" >&6; } + objdir=$lt_cv_objdir + + +@@ -6906,10 +7085,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_prog_AR+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +@@ -6922,7 +7101,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -6933,11 +7112,11 @@ + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- { echo "$as_me:$LINENO: result: $AR" >&5 +-echo "${ECHO_T}$AR" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $AR" >&5 ++$as_echo "$AR" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -6946,10 +7125,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. +@@ -6962,7 +7141,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -6973,11 +7152,11 @@ + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 +-echo "${ECHO_T}$ac_ct_AR" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 ++$as_echo "$ac_ct_AR" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + if test "x$ac_ct_AR" = x; then +@@ -6985,12 +7164,8 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++{ $as_echo "$as_me:$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 + AR=$ac_ct_AR +@@ -7002,10 +7177,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_prog_RANLIB+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +@@ -7018,7 +7193,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -7029,11 +7204,11 @@ + fi + RANLIB=$ac_cv_prog_RANLIB + if test -n "$RANLIB"; then +- { echo "$as_me:$LINENO: result: $RANLIB" >&5 +-echo "${ECHO_T}$RANLIB" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 ++$as_echo "$RANLIB" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -7042,10 +7217,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +@@ -7058,7 +7233,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -7069,11 +7244,11 @@ + fi + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB + if test -n "$ac_ct_RANLIB"; then +- { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +-echo "${ECHO_T}$ac_ct_RANLIB" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 ++$as_echo "$ac_ct_RANLIB" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + if test "x$ac_ct_RANLIB" = x; then +@@ -7081,12 +7256,8 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++{ $as_echo "$as_me:$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 + RANLIB=$ac_ct_RANLIB +@@ -7098,10 +7269,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_prog_STRIP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +@@ -7114,7 +7285,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -7125,11 +7296,11 @@ + fi + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then +- { echo "$as_me:$LINENO: result: $STRIP" >&5 +-echo "${ECHO_T}$STRIP" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 ++$as_echo "$STRIP" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -7138,10 +7309,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +@@ -7154,7 +7325,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -7165,11 +7336,11 @@ + fi + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then +- { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +-echo "${ECHO_T}$ac_ct_STRIP" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 ++$as_echo "$ac_ct_STRIP" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + if test "x$ac_ct_STRIP" = x; then +@@ -7177,12 +7348,8 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++{ $as_echo "$as_me:$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 + STRIP=$ac_ct_STRIP +@@ -7245,10 +7412,10 @@ + case $deplibs_check_method in + file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then +- { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 +-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case $MAGIC_CMD in + [\\/*] | ?:[\\/]*) +@@ -7298,19 +7465,19 @@ + + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if test -n "$MAGIC_CMD"; then +- { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +-echo "${ECHO_T}$MAGIC_CMD" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 ++$as_echo "$MAGIC_CMD" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then +- { echo "$as_me:$LINENO: checking for file" >&5 +-echo $ECHO_N "checking for file... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for file" >&5 ++$as_echo_n "checking for file... " >&6; } + if test "${lt_cv_path_MAGIC_CMD+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case $MAGIC_CMD in + [\\/*] | ?:[\\/]*) +@@ -7360,11 +7527,11 @@ + + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if test -n "$MAGIC_CMD"; then +- { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +-echo "${ECHO_T}$MAGIC_CMD" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 ++$as_echo "$MAGIC_CMD" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + else +@@ -7451,10 +7618,10 @@ + lt_prog_compiler_no_builtin_flag=' -fno-builtin' + + +-{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext +@@ -7469,11 +7636,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:7472: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7639: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7476: \$? = $ac_status" >&5 ++ echo "$as_me:7643: \$? = $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. +@@ -7486,8 +7653,8 @@ + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } ++{ $as_echo "$as_me:$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 + lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" +@@ -7501,8 +7668,8 @@ + lt_prog_compiler_pic= + lt_prog_compiler_static= + +-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 + lt_prog_compiler_wl='-Wl,' +@@ -7733,18 +7900,18 @@ + esac + fi + +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 ++$as_echo "$lt_prog_compiler_pic" >&6; } + + # + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic"; then + +-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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_prog_compiler_pic_works+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_prog_compiler_pic_works=no + ac_outfile=conftest.$ac_objext +@@ -7759,11 +7926,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:7762: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7929: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7766: \$? = $ac_status" >&5 ++ echo "$as_me:7933: \$? = $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. +@@ -7776,8 +7943,8 @@ + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 ++$as_echo "$lt_prog_compiler_pic_works" >&6; } + + if test x"$lt_prog_compiler_pic_works" = xyes; then + case $lt_prog_compiler_pic in +@@ -7804,10 +7971,10 @@ + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" +-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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_prog_compiler_static_works+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_prog_compiler_static_works=no + save_LDFLAGS="$LDFLAGS" +@@ -7832,8 +7999,8 @@ + LDFLAGS="$save_LDFLAGS" + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 +-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 ++$as_echo "$lt_prog_compiler_static_works" >&6; } + + if test x"$lt_prog_compiler_static_works" = xyes; then + : +@@ -7842,10 +8009,10 @@ + fi + + +-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_c_o=no + $rm -r conftest 2>/dev/null +@@ -7863,11 +8030,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:7866: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8033: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:7870: \$? = $ac_status" >&5 ++ echo "$as_me:8037: \$? = $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 +@@ -7889,34 +8056,34 @@ + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 ++$as_echo "$lt_cv_prog_compiler_c_o" >&6; } + + + 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 +- { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no +- { echo "$as_me:$LINENO: result: $hard_links" >&5 +-echo "${ECHO_T}$hard_links" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 ++$as_echo "$hard_links" >&6; } + if test "$hard_links" = no; then +- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} ++ { $as_echo "$as_me:$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 + else + need_locks=no + fi + +-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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= + allow_undefined_flag= +@@ -8345,18 +8512,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -8371,12 +8541,13 @@ + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi + else +- echo "$as_me: failed program was:" >&5 ++ $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 + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8411,18 +8582,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -8437,12 +8611,13 @@ + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi + else +- echo "$as_me: failed program was:" >&5 ++ $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 + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8895,8 +9070,8 @@ + esac + fi + +-{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 +-echo "${ECHO_T}$ld_shlibs" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5 ++$as_echo "$ld_shlibs" >&6; } + test "$ld_shlibs" = no && can_build_shared=no + + # +@@ -8916,15 +9091,15 @@ + # 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. +- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } 2>conftest.err; then + soname=conftest + lib=conftest +@@ -8942,7 +9117,7 @@ + if { (eval echo "$as_me:$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=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + then + archive_cmds_need_lc=no +@@ -8954,16 +9129,16 @@ + cat conftest.err 1>&5 + fi + $rm conftest* +- { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 +-echo "${ECHO_T}$archive_cmds_need_lc" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 ++$as_echo "$archive_cmds_need_lc" >&6; } + ;; + esac + fi + ;; + esac + +-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++$as_echo_n "checking dynamic linker characteristics... " >&6; } + library_names_spec= + libname_spec='lib$name' + soname_spec= +@@ -9566,8 +9741,8 @@ + dynamic_linker=no + ;; + esac +-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +-echo "${ECHO_T}$dynamic_linker" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++$as_echo "$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +@@ -9575,8 +9750,8 @@ + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" + fi + +-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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" || \ + test -n "$runpath_var" || \ +@@ -9600,8 +9775,8 @@ + # directories. + hardcode_action=unsupported + fi +-{ echo "$as_me:$LINENO: result: $hardcode_action" >&5 +-echo "${ECHO_T}$hardcode_action" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 ++$as_echo "$hardcode_action" >&6; } + + if test "$hardcode_action" = relink; then + # Fast installation is not supported +@@ -9614,13 +9789,13 @@ + + striplib= + old_striplib= +-{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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" +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + else + # FIXME - insert some real tests, host_os isn't really good enough + case $host_os in +@@ -9628,16 +9803,16 @@ + if test -n "$STRIP" ; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + ;; + *) +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + ;; + esac + fi +@@ -9669,10 +9844,10 @@ + + darwin*) + # if libdl is installed we need to link against it +- { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldl $LIBS" +@@ -9704,33 +9879,37 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_dl_dlopen=yes + else +- echo "$as_me: failed program was:" >&5 ++ $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 +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } +-if test $ac_cv_lib_dl_dlopen = yes; then ++{ $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 + +@@ -9743,10 +9922,10 @@ + ;; + + *) +- { echo "$as_me:$LINENO: checking for shl_load" >&5 +-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -9799,38 +9978,42 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_func_shl_load=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_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 + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +-echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } +-if test $ac_cv_func_shl_load = yes; then ++{ $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" + else +- { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldld $LIBS" +@@ -9862,39 +10045,43 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_dld_shl_load=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } +-if test $ac_cv_lib_dld_shl_load = yes; then ++{ $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="-dld" + else +- { echo "$as_me:$LINENO: checking for dlopen" >&5 +-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -9947,38 +10134,42 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_func_dlopen=yes + else +- echo "$as_me: failed program was:" >&5 ++ $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 +-{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } +-if test $ac_cv_func_dlopen = yes; then ++{ $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 +- { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldl $LIBS" +@@ -10010,39 +10201,43 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_dl_dlopen=yes + else +- echo "$as_me: failed program was:" >&5 ++ $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 +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } +-if test $ac_cv_lib_dl_dlopen = yes; then ++{ $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 +- { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsvld $LIBS" +@@ -10074,39 +10269,43 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_svld_dlopen=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } +-if test $ac_cv_lib_svld_dlopen = yes; then ++{ $as_echo "$as_me:$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 + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" + else +- { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 +-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldld $LIBS" +@@ -10138,33 +10337,37 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_dld_dld_link=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } +-if test $ac_cv_lib_dld_dld_link = yes; then ++{ $as_echo "$as_me:$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 + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" + fi + +@@ -10203,10 +10406,10 @@ + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + +- { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 +-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self=cross +@@ -10214,7 +10417,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 10217 "configure" ++#line 10420 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -10280,7 +10483,7 @@ + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? +@@ -10298,15 +10501,15 @@ + + + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +-echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } ++{ $as_echo "$as_me:$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\" +- { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 +-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self_static=cross +@@ -10314,7 +10517,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 10317 "configure" ++#line 10520 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -10380,7 +10583,7 @@ + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? +@@ -10398,8 +10601,8 @@ + + + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 ++$as_echo "$lt_cv_dlopen_self_static" >&6; } + fi + + CPPFLAGS="$save_CPPFLAGS" +@@ -10421,13 +10624,13 @@ + + + # Report which library types will actually be built +-{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } +-{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 +-echo "${ECHO_T}$can_build_shared" >&6; } ++{ $as_echo "$as_me:$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 "$can_build_shared" >&6; } + +-{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 + + # On AIX, shared libraries and static libraries use the same namespace, and +@@ -10447,15 +10650,15 @@ + fi + ;; + esac +-{ echo "$as_me:$LINENO: result: $enable_shared" >&5 +-echo "${ECHO_T}$enable_shared" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 ++$as_echo "$enable_shared" >&6; } + +-{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +-{ echo "$as_me:$LINENO: result: $enable_static" >&5 +-echo "${ECHO_T}$enable_static" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5 ++$as_echo "$enable_static" >&6; } + + # The else clause should only fire when bootstrapping the + # libtool distribution, otherwise you forgot to ship ltmain.sh +@@ -10547,8 +10750,8 @@ + cfgfile="${ofile}T" + trap "$rm \"$cfgfile\"; exit 1" 1 2 15 + $rm -f "$cfgfile" +- { echo "$as_me:$LINENO: creating $ofile" >&5 +-echo "$as_me: creating $ofile" >&6;} ++ { $as_echo "$as_me:$LINENO: creating $ofile" >&5 ++$as_echo "$as_me: creating $ofile" >&6;} + + cat <<__EOF__ >> "$cfgfile" + #! $SHELL +@@ -10956,18 +11159,18 @@ + + if test -f "$ltmain" && test -n "$tagnames"; then + if test ! -f "${ofile}"; then +- { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 +-echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 ++$as_echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} + fi + + if test -z "$LTCC"; then + eval "`$SHELL ${ofile} --config | grep '^LTCC='`" + if test -z "$LTCC"; then +- { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5 +-echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5 ++$as_echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;} + else +- { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5 +-echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5 ++$as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} + fi + fi + if test -z "$LTCFLAGS"; then +@@ -10984,16 +11187,16 @@ + # Check whether tagname contains only valid characters + case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in + "") ;; +- *) { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5 +-echo "$as_me: error: invalid tag name: $tagname" >&2;} ++ *) { { $as_echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5 ++$as_echo "$as_me: error: invalid tag name: $tagname" >&2;} + { (exit 1); exit 1; }; } + ;; + esac + + if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null + then +- { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 +-echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} ++ { { $as_echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 ++$as_echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} + { (exit 1); exit 1; }; } + fi + +@@ -11135,8 +11338,8 @@ + ac_prog=ld + if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. +- { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 ++$as_echo_n "checking for ld used by $CC... " >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw +@@ -11165,14 +11368,14 @@ + ;; + esac + elif test "$with_gnu_ld" = yes; then +- { echo "$as_me:$LINENO: checking for GNU ld" >&5 +-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 ++$as_echo_n "checking for GNU ld... " >&6; } + else +- { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +@@ -11202,19 +11405,19 @@ + + LD="$lt_cv_path_LD" + if test -n "$LD"; then +- { echo "$as_me:$LINENO: result: $LD" >&5 +-echo "${ECHO_T}$LD" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $LD" >&5 ++$as_echo "$LD" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi +-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} ++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; }; } +-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + # I'd rather use --version here, but apparently some GNU lds only accept -v. + case `$LD -v 2>&1 </dev/null` in +@@ -11226,8 +11429,8 @@ + ;; + esac + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 ++$as_echo "$lt_cv_prog_gnu_ld" >&6; } + with_gnu_ld=$lt_cv_prog_gnu_ld + + +@@ -11277,8 +11480,8 @@ + fi + + # PORTME: fill in a description of your system's C++ link characteristics +-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + ld_shlibs_CXX=yes + case $host_os in + aix3*) +@@ -11395,18 +11598,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -11421,12 +11627,13 @@ + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi + else +- echo "$as_me: failed program was:" >&5 ++ $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 + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -11462,18 +11669,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -11488,12 +11698,13 @@ + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi + else +- echo "$as_me: failed program was:" >&5 ++ $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 + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -12251,8 +12462,8 @@ + ld_shlibs_CXX=no + ;; + esac +-{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +-echo "${ECHO_T}$ld_shlibs_CXX" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 ++$as_echo "$ld_shlibs_CXX" >&6; } + test "$ld_shlibs_CXX" = no && can_build_shared=no + + GCC_CXX="$GXX" +@@ -12272,7 +12483,7 @@ + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. +@@ -12424,8 +12635,8 @@ + lt_prog_compiler_pic_CXX= + lt_prog_compiler_static_CXX= + +-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 ++$as_echo_n "checking for $compiler option to produce PIC... " >&6; } + + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then +@@ -12708,18 +12919,18 @@ + esac + fi + +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 ++$as_echo "$lt_prog_compiler_pic_CXX" >&6; } + + # + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic_CXX"; then + +-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 +-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 ++$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } + if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_prog_compiler_pic_works_CXX=no + ac_outfile=conftest.$ac_objext +@@ -12734,11 +12945,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:12737: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:12948: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:12741: \$? = $ac_status" >&5 ++ echo "$as_me:12952: \$? = $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. +@@ -12751,8 +12962,8 @@ + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 ++$as_echo "$lt_prog_compiler_pic_works_CXX" >&6; } + + if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then + case $lt_prog_compiler_pic_CXX in +@@ -12779,10 +12990,10 @@ + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" +-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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_prog_compiler_static_works_CXX+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_prog_compiler_static_works_CXX=no + save_LDFLAGS="$LDFLAGS" +@@ -12807,8 +13018,8 @@ + LDFLAGS="$save_LDFLAGS" + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 +-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 ++$as_echo "$lt_prog_compiler_static_works_CXX" >&6; } + + if test x"$lt_prog_compiler_static_works_CXX" = xyes; then + : +@@ -12817,10 +13028,10 @@ + fi + + +-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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_CXX+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_c_o_CXX=no + $rm -r conftest 2>/dev/null +@@ -12838,11 +13049,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:12841: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13052: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:12845: \$? = $ac_status" >&5 ++ echo "$as_me:13056: \$? = $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 +@@ -12864,34 +13075,34 @@ + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 ++$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } + + + hard_links="nottested" + if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user +- { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no +- { echo "$as_me:$LINENO: result: $hard_links" >&5 +-echo "${ECHO_T}$hard_links" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 ++$as_echo "$hard_links" >&6; } + if test "$hard_links" = no; then +- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} ++ { $as_echo "$as_me:$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 + else + need_locks=no + fi + +-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + case $host_os in +@@ -12915,8 +13126,8 @@ + ;; + esac + +-{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +-echo "${ECHO_T}$ld_shlibs_CXX" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 ++$as_echo "$ld_shlibs_CXX" >&6; } + test "$ld_shlibs_CXX" = no && can_build_shared=no + + # +@@ -12936,15 +13147,15 @@ + # 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. +- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } 2>conftest.err; then + soname=conftest + lib=conftest +@@ -12962,7 +13173,7 @@ + if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 + (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + then + archive_cmds_need_lc_CXX=no +@@ -12974,16 +13185,16 @@ + cat conftest.err 1>&5 + fi + $rm conftest* +- { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 +-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 ++$as_echo "$archive_cmds_need_lc_CXX" >&6; } + ;; + esac + fi + ;; + esac + +-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++$as_echo_n "checking dynamic linker characteristics... " >&6; } + library_names_spec= + libname_spec='lib$name' + soname_spec= +@@ -13534,8 +13745,8 @@ + dynamic_linker=no + ;; + esac +-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +-echo "${ECHO_T}$dynamic_linker" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++$as_echo "$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +@@ -13543,8 +13754,8 @@ + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" + fi + +-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++$as_echo_n "checking how to hardcode library paths into programs... " >&6; } + hardcode_action_CXX= + if test -n "$hardcode_libdir_flag_spec_CXX" || \ + test -n "$runpath_var_CXX" || \ +@@ -13568,8 +13779,8 @@ + # directories. + hardcode_action_CXX=unsupported + fi +-{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 +-echo "${ECHO_T}$hardcode_action_CXX" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 ++$as_echo "$hardcode_action_CXX" >&6; } + + if test "$hardcode_action_CXX" = relink; then + # Fast installation is not supported +@@ -14102,13 +14313,13 @@ + cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + + +-{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } +-{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 +-echo "${ECHO_T}$can_build_shared" >&6; } ++{ $as_echo "$as_me:$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 "$can_build_shared" >&6; } + +-{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 + + # On AIX, shared libraries and static libraries use the same namespace, and +@@ -14127,15 +14338,15 @@ + fi + ;; + esac +-{ echo "$as_me:$LINENO: result: $enable_shared" >&5 +-echo "${ECHO_T}$enable_shared" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 ++$as_echo "$enable_shared" >&6; } + +-{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +-{ echo "$as_me:$LINENO: result: $enable_static" >&5 +-echo "${ECHO_T}$enable_static" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5 ++$as_echo "$enable_static" >&6; } + + GCC_F77="$G77" + LD_F77="$LD" +@@ -14144,8 +14355,8 @@ + lt_prog_compiler_pic_F77= + lt_prog_compiler_static_F77= + +-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 + lt_prog_compiler_wl_F77='-Wl,' +@@ -14376,18 +14587,18 @@ + esac + fi + +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 ++$as_echo "$lt_prog_compiler_pic_F77" >&6; } + + # + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic_F77"; then + +-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 +-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 ++$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; } + if test "${lt_prog_compiler_pic_works_F77+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_prog_compiler_pic_works_F77=no + ac_outfile=conftest.$ac_objext +@@ -14402,11 +14613,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:14405: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14616: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:14409: \$? = $ac_status" >&5 ++ echo "$as_me:14620: \$? = $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. +@@ -14419,8 +14630,8 @@ + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 ++$as_echo "$lt_prog_compiler_pic_works_F77" >&6; } + + if test x"$lt_prog_compiler_pic_works_F77" = xyes; then + case $lt_prog_compiler_pic_F77 in +@@ -14447,10 +14658,10 @@ + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" +-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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_prog_compiler_static_works_F77+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_prog_compiler_static_works_F77=no + save_LDFLAGS="$LDFLAGS" +@@ -14475,8 +14686,8 @@ + LDFLAGS="$save_LDFLAGS" + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 +-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 ++$as_echo "$lt_prog_compiler_static_works_F77" >&6; } + + if test x"$lt_prog_compiler_static_works_F77" = xyes; then + : +@@ -14485,10 +14696,10 @@ + fi + + +-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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_F77+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_c_o_F77=no + $rm -r conftest 2>/dev/null +@@ -14506,11 +14717,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:14509: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14720: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:14513: \$? = $ac_status" >&5 ++ echo "$as_me:14724: \$? = $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 +@@ -14532,34 +14743,34 @@ + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 ++$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; } + + + hard_links="nottested" + if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user +- { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no +- { echo "$as_me:$LINENO: result: $hard_links" >&5 +-echo "${ECHO_T}$hard_links" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 ++$as_echo "$hard_links" >&6; } + if test "$hard_links" = no; then +- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} ++ { $as_echo "$as_me:$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 + else + need_locks=no + fi + +-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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= + allow_undefined_flag_F77= +@@ -14978,18 +15189,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -15004,12 +15218,13 @@ + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi + else +- echo "$as_me: failed program was:" >&5 ++ $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 + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -15034,18 +15249,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -15060,12 +15278,13 @@ + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi + else +- echo "$as_me: failed program was:" >&5 ++ $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 + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -15518,8 +15737,8 @@ + esac + fi + +-{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 +-echo "${ECHO_T}$ld_shlibs_F77" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 ++$as_echo "$ld_shlibs_F77" >&6; } + test "$ld_shlibs_F77" = no && can_build_shared=no + + # +@@ -15539,15 +15758,15 @@ + # 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. +- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } 2>conftest.err; then + soname=conftest + lib=conftest +@@ -15565,7 +15784,7 @@ + if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 + (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + then + archive_cmds_need_lc_F77=no +@@ -15577,16 +15796,16 @@ + cat conftest.err 1>&5 + fi + $rm conftest* +- { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 +-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 ++$as_echo "$archive_cmds_need_lc_F77" >&6; } + ;; + esac + fi + ;; + esac + +-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++$as_echo_n "checking dynamic linker characteristics... " >&6; } + library_names_spec= + libname_spec='lib$name' + soname_spec= +@@ -16137,8 +16356,8 @@ + dynamic_linker=no + ;; + esac +-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +-echo "${ECHO_T}$dynamic_linker" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++$as_echo "$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +@@ -16146,8 +16365,8 @@ + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" + fi + +-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++$as_echo_n "checking how to hardcode library paths into programs... " >&6; } + hardcode_action_F77= + if test -n "$hardcode_libdir_flag_spec_F77" || \ + test -n "$runpath_var_F77" || \ +@@ -16171,8 +16390,8 @@ + # directories. + hardcode_action_F77=unsupported + fi +-{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 +-echo "${ECHO_T}$hardcode_action_F77" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 ++$as_echo "$hardcode_action_F77" >&6; } + + if test "$hardcode_action_F77" = relink; then + # Fast installation is not supported +@@ -16677,10 +16896,10 @@ + lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' + + +-{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext +@@ -16695,11 +16914,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:16698: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16917: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:16702: \$? = $ac_status" >&5 ++ echo "$as_me:16921: \$? = $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. +@@ -16712,8 +16931,8 @@ + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } ++{ $as_echo "$as_me:$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 + lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" +@@ -16727,8 +16946,8 @@ + lt_prog_compiler_pic_GCJ= + lt_prog_compiler_static_GCJ= + +-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 + lt_prog_compiler_wl_GCJ='-Wl,' +@@ -16959,18 +17178,18 @@ + esac + fi + +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 ++$as_echo "$lt_prog_compiler_pic_GCJ" >&6; } + + # + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic_GCJ"; then + +-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 +-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 ++$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; } + if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_prog_compiler_pic_works_GCJ=no + ac_outfile=conftest.$ac_objext +@@ -16985,11 +17204,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:16988: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17207: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:16992: \$? = $ac_status" >&5 ++ echo "$as_me:17211: \$? = $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. +@@ -17002,8 +17221,8 @@ + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 ++$as_echo "$lt_prog_compiler_pic_works_GCJ" >&6; } + + if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then + case $lt_prog_compiler_pic_GCJ in +@@ -17030,10 +17249,10 @@ + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" +-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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_prog_compiler_static_works_GCJ+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_prog_compiler_static_works_GCJ=no + save_LDFLAGS="$LDFLAGS" +@@ -17058,8 +17277,8 @@ + LDFLAGS="$save_LDFLAGS" + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 +-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 ++$as_echo "$lt_prog_compiler_static_works_GCJ" >&6; } + + if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then + : +@@ -17068,10 +17287,10 @@ + fi + + +-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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_GCJ+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_c_o_GCJ=no + $rm -r conftest 2>/dev/null +@@ -17089,11 +17308,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:17092: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17311: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:17096: \$? = $ac_status" >&5 ++ echo "$as_me:17315: \$? = $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 +@@ -17115,34 +17334,34 @@ + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 ++$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; } + + + hard_links="nottested" + if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user +- { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no +- { echo "$as_me:$LINENO: result: $hard_links" >&5 +-echo "${ECHO_T}$hard_links" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 ++$as_echo "$hard_links" >&6; } + if test "$hard_links" = no; then +- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} ++ { $as_echo "$as_me:$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 + else + need_locks=no + fi + +-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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= + allow_undefined_flag_GCJ= +@@ -17571,18 +17790,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -17597,12 +17819,13 @@ + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi + else +- echo "$as_me: failed program was:" >&5 ++ $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 + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -17637,18 +17860,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -17663,12 +17889,13 @@ + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi + else +- echo "$as_me: failed program was:" >&5 ++ $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 + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -18121,8 +18348,8 @@ + esac + fi + +-{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 +-echo "${ECHO_T}$ld_shlibs_GCJ" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 ++$as_echo "$ld_shlibs_GCJ" >&6; } + test "$ld_shlibs_GCJ" = no && can_build_shared=no + + # +@@ -18142,15 +18369,15 @@ + # 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. +- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } 2>conftest.err; then + soname=conftest + lib=conftest +@@ -18168,7 +18395,7 @@ + if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 + (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + then + archive_cmds_need_lc_GCJ=no +@@ -18180,16 +18407,16 @@ + cat conftest.err 1>&5 + fi + $rm conftest* +- { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 +-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 ++$as_echo "$archive_cmds_need_lc_GCJ" >&6; } + ;; + esac + fi + ;; + esac + +-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++$as_echo_n "checking dynamic linker characteristics... " >&6; } + library_names_spec= + libname_spec='lib$name' + soname_spec= +@@ -18740,8 +18967,8 @@ + dynamic_linker=no + ;; + esac +-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +-echo "${ECHO_T}$dynamic_linker" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++$as_echo "$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +@@ -18749,8 +18976,8 @@ + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" + fi + +-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++$as_echo_n "checking how to hardcode library paths into programs... " >&6; } + hardcode_action_GCJ= + if test -n "$hardcode_libdir_flag_spec_GCJ" || \ + test -n "$runpath_var_GCJ" || \ +@@ -18774,8 +19001,8 @@ + # directories. + hardcode_action_GCJ=unsupported + fi +-{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 +-echo "${ECHO_T}$hardcode_action_GCJ" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 ++$as_echo "$hardcode_action_GCJ" >&6; } + + if test "$hardcode_action_GCJ" = relink; then + # Fast installation is not supported +@@ -19688,8 +19915,8 @@ + ;; + + *) +- { { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5 +-echo "$as_me: error: Unsupported tag name: $tagname" >&2;} ++ { { $as_echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5 ++$as_echo "$as_me: error: Unsupported tag name: $tagname" >&2;} + { (exit 1); exit 1; }; } + ;; + esac +@@ -19708,8 +19935,8 @@ + chmod +x "$ofile" + else + rm -f "${ofile}T" +- { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 +-echo "$as_me: error: unable to update list of available tagged configurations." >&2;} ++ { { $as_echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 ++$as_echo "$as_me: error: unable to update list of available tagged configurations." >&2;} + { (exit 1); exit 1; }; } + fi + fi +@@ -19746,8 +19973,8 @@ + + case "$am__api_version" in + 1.01234) +- { { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5 +-echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;} ++ { { $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; }; } + ;; + *) +@@ -19755,18 +19982,18 @@ + esac + + if test -n "0.35.0"; then +- { echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5 +-echo $ECHO_N "checking for intltool >= 0.35.0... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5 ++$as_echo_n "checking for intltool >= 0.35.0... " >&6; } + + INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` + INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in` + +- { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5 +-echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; } ++ { $as_echo "$as_me:$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" || +- { { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.0 or later." >&5 +-echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;} ++ { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.0 or later." >&5 ++$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;} + { (exit 1); exit 1; }; } + fi + +@@ -19813,10 +20040,10 @@ + # 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_path_XGETTEXT+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case $XGETTEXT in + [\\/]* | ?:[\\/]*) +@@ -19831,7 +20058,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -19843,20 +20070,20 @@ + fi + XGETTEXT=$ac_cv_path_XGETTEXT + if test -n "$XGETTEXT"; then +- { echo "$as_me:$LINENO: result: $XGETTEXT" >&5 +-echo "${ECHO_T}$XGETTEXT" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 ++$as_echo "$XGETTEXT" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_path_MSGMERGE+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case $MSGMERGE in + [\\/]* | ?:[\\/]*) +@@ -19871,7 +20098,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -19883,20 +20110,20 @@ + fi + MSGMERGE=$ac_cv_path_MSGMERGE + if test -n "$MSGMERGE"; then +- { echo "$as_me:$LINENO: result: $MSGMERGE" >&5 +-echo "${ECHO_T}$MSGMERGE" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5 ++$as_echo "$MSGMERGE" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_path_MSGFMT+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case $MSGFMT in + [\\/]* | ?:[\\/]*) +@@ -19911,7 +20138,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -19923,25 +20150,25 @@ + fi + MSGFMT=$ac_cv_path_MSGFMT + if test -n "$MSGFMT"; then +- { echo "$as_me:$LINENO: result: $MSGFMT" >&5 +-echo "${ECHO_T}$MSGFMT" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 ++$as_echo "$MSGFMT" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + + if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then +- { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 +-echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} ++ { { $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; }; } + 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 +- { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 +-echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} ++ { { $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; }; } + fi + +@@ -19955,10 +20182,10 @@ + + # Extract the first word of "perl", so it can be a program name with args. + set dummy perl; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case $INTLTOOL_PERL in + [\\/]* | ?:[\\/]*) +@@ -19973,7 +20200,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -19985,33 +20212,33 @@ + fi + INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL + if test -n "$INTLTOOL_PERL"; then +- { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5 +-echo "${ECHO_T}$INTLTOOL_PERL" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5 ++$as_echo "$INTLTOOL_PERL" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + + if test -z "$INTLTOOL_PERL"; then +- { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5 +-echo "$as_me: error: perl not found; required for intltool" >&2;} ++ { { $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; }; } + fi + if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then +- { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5 +-echo "$as_me: error: perl 5.x required for intltool" >&2;} ++ { { $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; }; } + fi + if test "x" != "xno-xml"; then +- { echo "$as_me:$LINENO: checking for XML::Parser" >&5 +-echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- { echo "$as_me:$LINENO: result: ok" >&5 +-echo "${ECHO_T}ok" >&6; } ++ { $as_echo "$as_me:$LINENO: result: ok" >&5 ++$as_echo "ok" >&6; } + else +- { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5 +-echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;} ++ { { $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; }; } + fi + fi +@@ -20044,29 +20271,32 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + DATADIRNAME=share + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + case $host in + *-*-solaris*) +- { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 +-echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -20119,32 +20349,36 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_func_bind_textdomain_codeset=yes + else +- echo "$as_me: failed program was:" >&5 ++ $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 +-{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 +-echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; } +-if test $ac_cv_func_bind_textdomain_codeset = yes; then ++{ $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 + DATADIRNAME=share + else + DATADIRNAME=lib +@@ -20157,6 +20391,7 @@ + esac + fi + ++rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +@@ -20204,8 +20439,8 @@ + for option in -Wno-sign-compare; do + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $option" +- { echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 +-echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 ++$as_echo_n "checking whether gcc understands $option... " >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -20227,20 +20462,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 + has_option=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + has_option=no +@@ -20248,8 +20484,8 @@ + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$SAVE_CFLAGS" +- { echo "$as_me:$LINENO: result: $has_option" >&5 +-echo "${ECHO_T}$has_option" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $has_option" >&5 ++$as_echo "$has_option" >&6; } + if test $has_option = yes; then + warning_flags="$warning_flags $option" + fi +@@ -20262,16 +20498,16 @@ + fi + ;; + *) +- { { echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5 +-echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;} ++ { { $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; }; } + ;; + esac + CFLAGS="$realsave_CFLAGS" +- { echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5 +-echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6; } +- { echo "$as_me:$LINENO: result: $warning_flags" >&5 +-echo "${ECHO_T}$warning_flags" >&6; } ++ { $as_echo "$as_me:$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 "$warning_flags" >&6; } + + # Check whether --enable-iso-c was given. + if test "${enable_iso_c+set}" = set; then +@@ -20281,8 +20517,8 @@ + fi + + +- { echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5 +-echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 + if test "x$GCC" = "xyes"; then +@@ -20296,8 +20532,8 @@ + esac + fi + fi +- { echo "$as_me:$LINENO: result: $complCFLAGS" >&5 +-echo "${ECHO_T}$complCFLAGS" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $complCFLAGS" >&5 ++$as_echo "$complCFLAGS" >&6; } + + WARN_CFLAGS="$warning_flags $complCFLAGS" + +@@ -20308,10 +20544,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) +@@ -20326,7 +20562,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -20338,11 +20574,11 @@ + fi + PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then +- { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +-echo "${ECHO_T}$PKG_CONFIG" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 ++$as_echo "$PKG_CONFIG" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -20351,10 +20587,10 @@ + 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) +@@ -20369,7 +20605,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -20381,11 +20617,11 @@ + fi + ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG + if test -n "$ac_pt_PKG_CONFIG"; then +- { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 ++$as_echo "$ac_pt_PKG_CONFIG" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + if test "x$ac_pt_PKG_CONFIG" = x; then +@@ -20393,12 +20629,8 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++{ $as_echo "$as_me:$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 + PKG_CONFIG=$ac_pt_PKG_CONFIG +@@ -20410,14 +20642,14 @@ + fi + if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 +- { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + PKG_CONFIG="" + fi + +@@ -20426,10 +20658,10 @@ + gdu_cv_version_required=0.3.2 + + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5 + ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + gdu_cv_have_gdu=yes + else +@@ -20439,8 +20671,8 @@ + if test "$gdu_cv_have_gdu" = "yes"; then + : + else +- { { echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5 +-echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;} ++ { { $as_echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5 ++$as_echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;} + { (exit 1); exit 1; }; } + fi + +@@ -20510,10 +20742,10 @@ + + # Extract the first word of "glib-genmarshal", so it can be a program name with args. + set dummy glib-genmarshal; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_path_GLIB_GENMARSHAL+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case $GLIB_GENMARSHAL in + [\\/]* | ?:[\\/]*) +@@ -20528,7 +20760,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -20540,11 +20772,11 @@ + fi + GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL + if test -n "$GLIB_GENMARSHAL"; then +- { echo "$as_me:$LINENO: result: $GLIB_GENMARSHAL" >&5 +-echo "${ECHO_T}$GLIB_GENMARSHAL" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $GLIB_GENMARSHAL" >&5 ++$as_echo "$GLIB_GENMARSHAL" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -20572,20 +20804,21 @@ + + for ac_header in locale.h + do +-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++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 +- { echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + fi +-ac_res=`eval echo '${'$as_ac_Header'}'` +- { echo "$as_me:$LINENO: result: $ac_res" >&5 +-echo "${ECHO_T}$ac_res" >&6; } ++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? +-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++{ $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 +@@ -20601,32 +20834,33 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 +- echo "$as_me: failed program was:" >&5 ++ $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 +-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++$as_echo "$ac_header_compiler" >&6; } + + # Is the header present? +-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++{ $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 +@@ -20640,69 +20874,73 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 +- echo "$as_me: failed program was:" >&5 ++ $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 +-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6; } ++{ $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: ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ { $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:* ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ { $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;} + + ;; + esac +-{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++{ $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + eval "$as_ac_Header=\$ac_header_preproc" + fi +-ac_res=`eval echo '${'$as_ac_Header'}'` +- { echo "$as_me:$LINENO: result: $ac_res" >&5 +-echo "${ECHO_T}$ac_res" >&6; } ++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 +-if test `eval echo '${'$as_ac_Header'}'` = yes; then ++as_val=`eval 'as_val=${'$as_ac_Header'} ++ $as_echo "$as_val"'` ++ if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -20710,10 +20948,10 @@ + done + + if test $ac_cv_header_locale_h = yes; then +- { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 +-echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 ++$as_echo_n "checking for LC_MESSAGES... " >&6; } + if test "${am_cv_val_LC_MESSAGES+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -20736,31 +20974,35 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + am_cv_val_LC_MESSAGES=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + fi +-{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 +-echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; } ++{ $as_echo "$as_me:$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 +@@ -20779,17 +21021,17 @@ + INTLLIBS= + + if test "${ac_cv_header_libintl_h+set}" = set; then +- { echo "$as_me:$LINENO: checking for libintl.h" >&5 +-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 +-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; } ++{ $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? +-{ echo "$as_me:$LINENO: checking libintl.h usability" >&5 +-echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; } ++{ $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 +@@ -20805,32 +21047,33 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 +- echo "$as_me: failed program was:" >&5 ++ $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 +-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++$as_echo "$ac_header_compiler" >&6; } + + # Is the header present? +-{ echo "$as_me:$LINENO: checking libintl.h presence" >&5 +-echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; } ++{ $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 +@@ -20844,76 +21087,77 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 +- echo "$as_me: failed program was:" >&5 ++ $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 +-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6; } ++{ $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: ) +- { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} ++ { $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:* ) +- { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} ++ { $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;} + + ;; + esac +-{ echo "$as_me:$LINENO: checking for libintl.h" >&5 +-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; } ++{ $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_cv_header_libintl_h=$ac_header_preproc + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 +-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 ++$as_echo "$ac_cv_header_libintl_h" >&6; } + + fi +-if test $ac_cv_header_libintl_h = yes; then ++if test "x$ac_cv_header_libintl_h" = x""yes; then + gt_cv_func_dgettext_libintl="no" + libintl_extra_libs="" + + # + # First check in libc + # +- { echo "$as_me:$LINENO: checking for ngettext in libc" >&5 +-echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -20938,38 +21182,42 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + gt_cv_func_ngettext_libc=yes + else +- echo "$as_me: failed program was:" >&5 ++ $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 + + fi +-{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 +-echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; } ++{ $as_echo "$as_me:$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 +- { echo "$as_me:$LINENO: checking for dgettext in libc" >&5 +-echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -20994,43 +21242,47 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + gt_cv_func_dgettext_libc=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + + fi +-{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 +-echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; } ++{ $as_echo "$as_me:$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=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -21083,35 +21335,42 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + eval "$as_ac_var=yes" + else +- echo "$as_me: failed program was:" >&5 ++ $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 echo '${'$as_ac_var'}'` +- { echo "$as_me:$LINENO: result: $ac_res" >&5 +-echo "${ECHO_T}$ac_res" >&6; } +-if test `eval echo '${'$as_ac_var'}'` = yes; then ++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 `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -21126,10 +21385,10 @@ + || test "$gt_cv_func_ngettext_libc" != "yes" \ + || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then + +- { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 +-echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $LIBS" +@@ -21161,37 +21420,41 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_intl_bindtextdomain=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 +-echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; } +-if test $ac_cv_lib_intl_bindtextdomain = yes; then +- { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 +-echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 ++$as_echo_n "checking for ngettext in -lintl... " >&6; } + if test "${ac_cv_lib_intl_ngettext+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $LIBS" +@@ -21223,37 +21486,41 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_intl_ngettext=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 +-echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; } +-if test $ac_cv_lib_intl_ngettext = yes; then +- { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 +-echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 ++$as_echo_n "checking for dgettext in -lintl... " >&6; } + if test "${ac_cv_lib_intl_dgettext+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $LIBS" +@@ -21285,33 +21552,37 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_intl_dgettext=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 +-echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; } +-if test $ac_cv_lib_intl_dgettext = yes; then ++{ $as_echo "$as_me:$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 + gt_cv_func_dgettext_libintl=yes + fi + +@@ -21321,14 +21592,14 @@ + + + if test "$gt_cv_func_dgettext_libintl" != "yes" ; then +- { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 +-echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; } +- { echo "$as_me:$LINENO: result: " >&5 +-echo "${ECHO_T}" >&6; } +- { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 +-echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 "" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl -liconv $LIBS" +@@ -21360,37 +21631,41 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_intl_ngettext=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 +-echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; } +-if test $ac_cv_lib_intl_ngettext = yes; then +- { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 +-echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 ++$as_echo_n "checking for dcgettext in -lintl... " >&6; } + if test "${ac_cv_lib_intl_dcgettext+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl -liconv $LIBS" +@@ -21422,33 +21697,37 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_intl_dcgettext=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 +-echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; } +-if test $ac_cv_lib_intl_dcgettext = yes; then ++{ $as_echo "$as_me:$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 + gt_cv_func_dgettext_libintl=yes + libintl_extra_libs=-liconv + else +@@ -21473,11 +21752,11 @@ + + for ac_func in bind_textdomain_codeset + do +-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -21530,35 +21809,42 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + eval "$as_ac_var=yes" + else +- echo "$as_me: failed program was:" >&5 ++ $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 echo '${'$as_ac_var'}'` +- { echo "$as_me:$LINENO: result: $ac_res" >&5 +-echo "${ECHO_T}$ac_res" >&6; } +-if test `eval echo '${'$as_ac_var'}'` = yes; then ++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 `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -21594,10 +21880,10 @@ + + # Extract the first word of "msgfmt", so it can be a program name with args. + set dummy msgfmt; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_path_MSGFMT+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case "$MSGFMT" in + /*) +@@ -21621,11 +21907,11 @@ + fi + MSGFMT="$ac_cv_path_MSGFMT" + if test "$MSGFMT" != "no"; then +- { echo "$as_me:$LINENO: result: $MSGFMT" >&5 +-echo "${ECHO_T}$MSGFMT" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 ++$as_echo "$MSGFMT" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + if test "$MSGFMT" != "no"; then + glib_save_LIBS="$LIBS" +@@ -21633,11 +21919,11 @@ + + for ac_func in dcgettext + do +-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -21690,43 +21976,50 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + eval "$as_ac_var=yes" + else +- echo "$as_me: failed program was:" >&5 ++ $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 echo '${'$as_ac_var'}'` +- { echo "$as_me:$LINENO: result: $ac_res" >&5 +-echo "${ECHO_T}$ac_res" >&6; } +-if test `eval echo '${'$as_ac_var'}'` = yes; then ++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 `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi + done + + MSGFMT_OPTS= +- { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 +-echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 ++$as_echo_n "checking if msgfmt accepts -c... " >&6; } + cat >conftest.foo <<_ACEOF + + msgid "" +@@ -21740,25 +22033,25 @@ + "Content-Transfer-Encoding: 8bit\n" + + _ACEOF +-if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5 ++if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5 + ($MSGFMT -c -o /dev/null conftest.foo) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +-else { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } ++else { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + echo "$as_me: failed input was:" >&5 + sed 's/^/| /' conftest.foo >&5 + fi + + # Extract the first word of "gmsgfmt", so it can be a program name with args. + set dummy gmsgfmt; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_path_GMSGFMT+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case $GMSGFMT in + [\\/]* | ?:[\\/]*) +@@ -21773,7 +22066,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -21786,20 +22079,20 @@ + fi + GMSGFMT=$ac_cv_path_GMSGFMT + if test -n "$GMSGFMT"; then +- { echo "$as_me:$LINENO: result: $GMSGFMT" >&5 +-echo "${ECHO_T}$GMSGFMT" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 ++$as_echo "$GMSGFMT" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_path_XGETTEXT+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case "$XGETTEXT" in + /*) +@@ -21823,11 +22116,11 @@ + fi + XGETTEXT="$ac_cv_path_XGETTEXT" + if test "$XGETTEXT" != ":"; then +- { echo "$as_me:$LINENO: result: $XGETTEXT" >&5 +-echo "${ECHO_T}$XGETTEXT" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 ++$as_echo "$XGETTEXT" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + cat >conftest.$ac_ext <<_ACEOF +@@ -21852,30 +22145,33 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + CATOBJEXT=.gmo + DATADIRNAME=share + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + case $host in + *-*-solaris*) +- { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 +-echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -21928,32 +22224,36 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_func_bind_textdomain_codeset=yes + else +- echo "$as_me: failed program was:" >&5 ++ $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 +-{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 +-echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; } +-if test $ac_cv_func_bind_textdomain_codeset = yes; then ++{ $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 + CATOBJEXT=.gmo + DATADIRNAME=share + else +@@ -21969,6 +22269,7 @@ + esac + fi + ++rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$glib_save_LIBS" +@@ -21994,8 +22295,8 @@ + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else +- { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 +-echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; } ++ { $as_echo "$as_me:$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 + fi +@@ -22027,8 +22328,8 @@ + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else +- { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 +-echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 + useit=no +@@ -22052,8 +22353,8 @@ + fi + done + LINGUAS=$NEW_LINGUAS +- { echo "$as_me:$LINENO: result: $LINGUAS" >&5 +-echo "${ECHO_T}$LINGUAS" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5 ++$as_echo "$LINGUAS" >&6; } + fi + + if test -n "$LINGUAS"; then +@@ -22122,17 +22423,17 @@ + + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for GLIB" >&5 +-echo $ECHO_N "checking for GLIB... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for GLIB" >&5 ++$as_echo_n "checking for GLIB... " >&6; } + + if test -n "$GLIB_CFLAGS"; then + pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gobject-2.0" 2>/dev/null` + else +@@ -22145,10 +22446,10 @@ + pkg_cv_GLIB_LIBS="$GLIB_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gobject-2.0" 2>/dev/null` + else +@@ -22175,7 +22476,7 @@ + # Put the nasty error message in config.log where it belongs + echo "$GLIB_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gobject-2.0) were not met: ++ { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gobject-2.0) were not met: + + $GLIB_PKG_ERRORS + +@@ -22186,7 +22487,7 @@ + and GLIB_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gobject-2.0) were not met: ++$as_echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gobject-2.0) were not met: + + $GLIB_PKG_ERRORS + +@@ -22199,7 +22500,9 @@ + " >&2;} + { (exit 1); exit 1; }; } + elif test $pkg_failed = untried; then +- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it ++ { { $as_echo "$as_me:$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. + +@@ -22209,7 +22512,7 @@ + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details." >&5 +-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++$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. + +@@ -22219,12 +22522,12 @@ + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { (exit 1); exit 1; }; }; } + else + GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS + GLIB_LIBS=$pkg_cv_GLIB_LIBS +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + : + fi + +@@ -22232,17 +22535,17 @@ + + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for HAL" >&5 +-echo $ECHO_N "checking for HAL... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for HAL" >&5 ++$as_echo_n "checking for HAL... " >&6; } + + if test -n "$HAL_CFLAGS"; then + pkg_cv_HAL_CFLAGS="$HAL_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= \$HAL_REQUIRED\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= \$HAL_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors "hal >= $HAL_REQUIRED") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "hal >= $HAL_REQUIRED" 2>/dev/null` + else +@@ -22255,10 +22558,10 @@ + pkg_cv_HAL_LIBS="$HAL_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= \$HAL_REQUIRED\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= \$HAL_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors "hal >= $HAL_REQUIRED") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "hal >= $HAL_REQUIRED" 2>/dev/null` + else +@@ -22285,7 +22588,7 @@ + # Put the nasty error message in config.log where it belongs + echo "$HAL_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (hal >= $HAL_REQUIRED) were not met: ++ { { $as_echo "$as_me:$LINENO: error: Package requirements (hal >= $HAL_REQUIRED) were not met: + + $HAL_PKG_ERRORS + +@@ -22296,7 +22599,7 @@ + and HAL_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (hal >= $HAL_REQUIRED) were not met: ++$as_echo "$as_me: error: Package requirements (hal >= $HAL_REQUIRED) were not met: + + $HAL_PKG_ERRORS + +@@ -22309,7 +22612,9 @@ + " >&2;} + { (exit 1); exit 1; }; } + elif test $pkg_failed = untried; then +- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it ++ { { $as_echo "$as_me:$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. + +@@ -22319,7 +22624,7 @@ + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details." >&5 +-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++$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. + +@@ -22329,12 +22634,12 @@ + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { (exit 1); exit 1; }; }; } + else + HAL_CFLAGS=$pkg_cv_HAL_CFLAGS + HAL_LIBS=$pkg_cv_HAL_LIBS +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + : + fi + +@@ -22342,17 +22647,17 @@ + + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for GSTREAMER" >&5 +-echo $ECHO_N "checking for GSTREAMER... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for GSTREAMER" >&5 ++$as_echo_n "checking for GSTREAMER... " >&6; } + + if test -n "$GSTREAMER_CFLAGS"; then + pkg_cv_GSTREAMER_CFLAGS="$GSTREAMER_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 >= \$GSTREAMER_REQUIRED\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 >= \$GSTREAMER_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors "gstreamer-0.10 >= $GSTREAMER_REQUIRED") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-0.10 >= $GSTREAMER_REQUIRED" 2>/dev/null` + else +@@ -22365,10 +22670,10 @@ + pkg_cv_GSTREAMER_LIBS="$GSTREAMER_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 >= \$GSTREAMER_REQUIRED\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 >= \$GSTREAMER_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors "gstreamer-0.10 >= $GSTREAMER_REQUIRED") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GSTREAMER_LIBS=`$PKG_CONFIG --libs "gstreamer-0.10 >= $GSTREAMER_REQUIRED" 2>/dev/null` + else +@@ -22395,7 +22700,7 @@ + # Put the nasty error message in config.log where it belongs + echo "$GSTREAMER_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (gstreamer-0.10 >= $GSTREAMER_REQUIRED) were not met: ++ { { $as_echo "$as_me:$LINENO: error: Package requirements (gstreamer-0.10 >= $GSTREAMER_REQUIRED) were not met: + + $GSTREAMER_PKG_ERRORS + +@@ -22406,7 +22711,7 @@ + and GSTREAMER_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (gstreamer-0.10 >= $GSTREAMER_REQUIRED) were not met: ++$as_echo "$as_me: error: Package requirements (gstreamer-0.10 >= $GSTREAMER_REQUIRED) were not met: + + $GSTREAMER_PKG_ERRORS + +@@ -22419,7 +22724,9 @@ + " >&2;} + { (exit 1); exit 1; }; } + elif test $pkg_failed = untried; then +- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it ++ { { $as_echo "$as_me:$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. + +@@ -22429,7 +22736,7 @@ + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details." >&5 +-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++$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. + +@@ -22439,12 +22746,12 @@ + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { (exit 1); exit 1; }; }; } + else + GSTREAMER_CFLAGS=$pkg_cv_GSTREAMER_CFLAGS + GSTREAMER_LIBS=$pkg_cv_GSTREAMER_LIBS +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + : + fi + +@@ -22452,14 +22759,14 @@ + + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for DBUS" >&5 +-echo $ECHO_N "checking for DBUS... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for DBUS" >&5 ++$as_echo_n "checking for DBUS... " >&6; } + + if test -n "$DBUS_CFLAGS"; then + pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + dbus-glib-1 >= \$DBUS_REQUIRED + dbus-1 >= \$DBUS_REQUIRED + gthread-2.0\"") >&5 +@@ -22468,7 +22775,7 @@ + dbus-1 >= $DBUS_REQUIRED + gthread-2.0") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags " + dbus-glib-1 >= $DBUS_REQUIRED +@@ -22484,7 +22791,7 @@ + pkg_cv_DBUS_LIBS="$DBUS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + dbus-glib-1 >= \$DBUS_REQUIRED + dbus-1 >= \$DBUS_REQUIRED + gthread-2.0\"") >&5 +@@ -22493,7 +22800,7 @@ + dbus-1 >= $DBUS_REQUIRED + gthread-2.0") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs " + dbus-glib-1 >= $DBUS_REQUIRED +@@ -22529,7 +22836,7 @@ + # Put the nasty error message in config.log where it belongs + echo "$DBUS_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements ( ++ { { $as_echo "$as_me:$LINENO: error: Package requirements ( + dbus-glib-1 >= $DBUS_REQUIRED + dbus-1 >= $DBUS_REQUIRED + gthread-2.0) were not met: +@@ -22543,7 +22850,7 @@ + and DBUS_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements ( ++$as_echo "$as_me: error: Package requirements ( + dbus-glib-1 >= $DBUS_REQUIRED + dbus-1 >= $DBUS_REQUIRED + gthread-2.0) were not met: +@@ -22559,7 +22866,9 @@ + " >&2;} + { (exit 1); exit 1; }; } + elif test $pkg_failed = untried; then +- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it ++ { { $as_echo "$as_me:$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. + +@@ -22569,7 +22878,7 @@ + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details." >&5 +-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++$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. + +@@ -22579,12 +22888,12 @@ + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { (exit 1); exit 1; }; }; } + else + DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS + DBUS_LIBS=$pkg_cv_DBUS_LIBS +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + : + fi + +@@ -22592,14 +22901,14 @@ + + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for GNOME" >&5 +-echo $ECHO_N "checking for GNOME... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for GNOME" >&5 ++$as_echo_n "checking for GNOME... " >&6; } + + if test -n "$GNOME_CFLAGS"; then + pkg_cv_GNOME_CFLAGS="$GNOME_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED + libglade-2.0 >= \$LIBGLADE_REQUIRED + libwnck-1.0 >= \$LIBWNCK_REQUIRED +@@ -22616,7 +22925,7 @@ + libpanelapplet-2.0 >= $LIBPANEL_REQUIRED + cairo >= $CAIRO_REQUIRED") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GNOME_CFLAGS=`$PKG_CONFIG --cflags " + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED +@@ -22636,7 +22945,7 @@ + pkg_cv_GNOME_LIBS="$GNOME_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED + libglade-2.0 >= \$LIBGLADE_REQUIRED + libwnck-1.0 >= \$LIBWNCK_REQUIRED +@@ -22653,7 +22962,7 @@ + libpanelapplet-2.0 >= $LIBPANEL_REQUIRED + cairo >= $CAIRO_REQUIRED") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GNOME_LIBS=`$PKG_CONFIG --libs " + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED +@@ -22701,7 +23010,7 @@ + # Put the nasty error message in config.log where it belongs + echo "$GNOME_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements ( ++ { { $as_echo "$as_me:$LINENO: error: Package requirements ( + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED + libglade-2.0 >= $LIBGLADE_REQUIRED + libwnck-1.0 >= $LIBWNCK_REQUIRED +@@ -22719,7 +23028,7 @@ + and GNOME_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements ( ++$as_echo "$as_me: error: Package requirements ( + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED + libglade-2.0 >= $LIBGLADE_REQUIRED + libwnck-1.0 >= $LIBWNCK_REQUIRED +@@ -22739,7 +23048,9 @@ + " >&2;} + { (exit 1); exit 1; }; } + elif test $pkg_failed = untried; then +- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it ++ { { $as_echo "$as_me:$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. + +@@ -22749,7 +23060,7 @@ + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details." >&5 +-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++$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. + +@@ -22759,12 +23070,12 @@ + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { (exit 1); exit 1; }; }; } + else + GNOME_CFLAGS=$pkg_cv_GNOME_CFLAGS + GNOME_LIBS=$pkg_cv_GNOME_LIBS +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + : + fi + +@@ -22772,21 +23083,21 @@ + + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for GDK" >&5 +-echo $ECHO_N "checking for GDK... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for GDK" >&5 ++$as_echo_n "checking for GDK... " >&6; } + + if test -n "$GDK_CFLAGS"; then + pkg_cv_GDK_CFLAGS="$GDK_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + gdk-2.0 >= \$GDK_REQUIRED + gdk-x11-2.0 >= \$GDK_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors " + gdk-2.0 >= $GDK_REQUIRED + gdk-x11-2.0 >= $GDK_REQUIRED") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GDK_CFLAGS=`$PKG_CONFIG --cflags " + gdk-2.0 >= $GDK_REQUIRED +@@ -22801,14 +23112,14 @@ + pkg_cv_GDK_LIBS="$GDK_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + gdk-2.0 >= \$GDK_REQUIRED + gdk-x11-2.0 >= \$GDK_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors " + gdk-2.0 >= $GDK_REQUIRED + gdk-x11-2.0 >= $GDK_REQUIRED") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GDK_LIBS=`$PKG_CONFIG --libs " + gdk-2.0 >= $GDK_REQUIRED +@@ -22841,7 +23152,7 @@ + # Put the nasty error message in config.log where it belongs + echo "$GDK_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements ( ++ { { $as_echo "$as_me:$LINENO: error: Package requirements ( + gdk-2.0 >= $GDK_REQUIRED + gdk-x11-2.0 >= $GDK_REQUIRED) were not met: + +@@ -22854,7 +23165,7 @@ + and GDK_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements ( ++$as_echo "$as_me: error: Package requirements ( + gdk-2.0 >= $GDK_REQUIRED + gdk-x11-2.0 >= $GDK_REQUIRED) were not met: + +@@ -22869,7 +23180,9 @@ + " >&2;} + { (exit 1); exit 1; }; } + elif test $pkg_failed = untried; then +- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it ++ { { $as_echo "$as_me:$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. + +@@ -22879,7 +23192,7 @@ + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details." >&5 +-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++$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. + +@@ -22889,12 +23202,12 @@ + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { (exit 1); exit 1; }; }; } + else + GDK_CFLAGS=$pkg_cv_GDK_CFLAGS + GDK_LIBS=$pkg_cv_GDK_LIBS +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + : + fi + +@@ -22902,21 +23215,21 @@ + + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for XRANDR" >&5 +-echo $ECHO_N "checking for XRANDR... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for XRANDR" >&5 ++$as_echo_n "checking for XRANDR... " >&6; } + + if test -n "$XRANDR_CFLAGS"; then + pkg_cv_XRANDR_CFLAGS="$XRANDR_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + xrandr >= \$XRANDR_REQUIRED + xrender x11\"") >&5 + ($PKG_CONFIG --exists --print-errors " + xrandr >= $XRANDR_REQUIRED + xrender x11") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_XRANDR_CFLAGS=`$PKG_CONFIG --cflags " + xrandr >= $XRANDR_REQUIRED +@@ -22931,14 +23244,14 @@ + pkg_cv_XRANDR_LIBS="$XRANDR_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + xrandr >= \$XRANDR_REQUIRED + xrender x11\"") >&5 + ($PKG_CONFIG --exists --print-errors " + xrandr >= $XRANDR_REQUIRED + xrender x11") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_XRANDR_LIBS=`$PKG_CONFIG --libs " + xrandr >= $XRANDR_REQUIRED +@@ -22971,7 +23284,7 @@ + # Put the nasty error message in config.log where it belongs + echo "$XRANDR_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements ( ++ { { $as_echo "$as_me:$LINENO: error: Package requirements ( + xrandr >= $XRANDR_REQUIRED + xrender x11) were not met: + +@@ -22984,7 +23297,7 @@ + and XRANDR_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements ( ++$as_echo "$as_me: error: Package requirements ( + xrandr >= $XRANDR_REQUIRED + xrender x11) were not met: + +@@ -22999,7 +23312,9 @@ + " >&2;} + { (exit 1); exit 1; }; } + elif test $pkg_failed = untried; then +- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it ++ { { $as_echo "$as_me:$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. + +@@ -23009,7 +23324,7 @@ + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details." >&5 +-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++$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. + +@@ -23019,12 +23334,12 @@ + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { (exit 1); exit 1; }; }; } + else + XRANDR_CFLAGS=$pkg_cv_XRANDR_CFLAGS + XRANDR_LIBS=$pkg_cv_XRANDR_LIBS +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + : + fi + +@@ -23032,10 +23347,10 @@ + + # Extract the first word of "gconftool-2", so it can be a program name with args. + set dummy gconftool-2; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_path_GCONFTOOL+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case $GCONFTOOL in + [\\/]* | ?:[\\/]*) +@@ -23050,7 +23365,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -23062,11 +23377,11 @@ + fi + GCONFTOOL=$ac_cv_path_GCONFTOOL + if test -n "$GCONFTOOL"; then +- { echo "$as_me:$LINENO: result: $GCONFTOOL" >&5 +-echo "${ECHO_T}$GCONFTOOL" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $GCONFTOOL" >&5 ++$as_echo "$GCONFTOOL" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -23085,8 +23400,8 @@ + + + +- { echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5 +-echo "${ECHO_T}Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; } ++ { $as_echo "$as_me:$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 + GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' +@@ -23100,15 +23415,15 @@ + + + +- { echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5 +-echo "${ECHO_T}Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; } ++ { $as_echo "$as_me:$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 + enableval=$enable_schemas_install; case ${enableval} in + yes|no) ;; +- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5 +-echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;} ++ *) { { $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; }; } ;; + esac + fi +@@ -23123,8 +23438,8 @@ + + + +-{ echo "$as_me:$LINENO: checking for X" >&5 +-echo $ECHO_N "checking for X... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for X" >&5 ++$as_echo_n "checking for X... " >&6; } + + + # Check whether --with-x was given. +@@ -23138,11 +23453,11 @@ + have_x=disabled + else + case $x_includes,$x_libraries in #( +- *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5 +-echo "$as_me: error: Cannot use X directory names containing '" >&2;} ++ *\'*) { { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + # One or both of the vars are not set, and there is no cached value. + ac_x_includes=no ac_x_libraries=no +@@ -23163,7 +23478,7 @@ + eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" + done + # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. +- for ac_extension in a so sl; do ++ for ac_extension in a so sl dylib la dll; do + if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && + test -f "$ac_im_libdir/libX11.$ac_extension"; then + ac_im_usrlibdir=$ac_im_libdir; break +@@ -23177,7 +23492,7 @@ + *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; + esac + case $ac_im_usrlibdir in +- /usr/lib | /lib) ;; ++ /usr/lib | /usr/lib64 | /lib | /lib64) ;; + *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; + esac + fi +@@ -23238,13 +23553,14 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 +@@ -23252,7 +23568,7 @@ + # We can compile using X headers with no special include directory. + ac_x_includes= + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + for ac_dir in $ac_x_header_dirs; do +@@ -23293,30 +23609,33 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + LIBS=$ac_save_LIBS + # We can link X programs with no special library path. + ac_x_libraries= + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + LIBS=$ac_save_LIBS +-for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` ++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! +- for ac_extension in a so sl; do ++ for ac_extension in a so sl dylib la dll; do + if test -r "$ac_dir/libX11.$ac_extension"; then + ac_x_libraries=$ac_dir + break 2 +@@ -23325,6 +23644,7 @@ + done + 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_x_libraries = no +@@ -23347,8 +23667,8 @@ + fi # $with_x != no + + if test "$have_x" != yes; then +- { echo "$as_me:$LINENO: result: $have_x" >&5 +-echo "${ECHO_T}$have_x" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $have_x" >&5 ++$as_echo "$have_x" >&6; } + no_x=yes + else + # If each of the values was on the command line, it overrides each guess. +@@ -23358,8 +23678,8 @@ + ac_cv_have_x="have_x=yes\ + ac_x_includes='$x_includes'\ + ac_x_libraries='$x_libraries'" +- { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 +-echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; } ++ { $as_echo "$as_me:$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 +@@ -23380,8 +23700,8 @@ + 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 . . . . +- { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 +-echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +@@ -23406,23 +23726,26 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + X_LIBS="$X_LIBS -R$x_libraries" + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + LIBS="$ac_xsave_LIBS -R $x_libraries" +@@ -23447,33 +23770,38 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + X_LIBS="$X_LIBS -R $x_libraries" + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- { echo "$as_me:$LINENO: result: neither works" >&5 +-echo "${ECHO_T}neither works" >&6; } ++ { $as_echo "$as_me:$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 + fi + ++rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + ac_c_werror_flag=$ac_xsave_c_werror_flag +@@ -23519,27 +23847,30 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + : + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 +-echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldnet $LIBS" +@@ -23571,41 +23902,45 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_dnet_dnet_ntoa=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +-echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; } +-if test $ac_cv_lib_dnet_dnet_ntoa = yes; then ++{ $as_echo "$as_me:$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 + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" + fi + + if test $ac_cv_lib_dnet_dnet_ntoa = no; then +- { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 +-echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldnet_stub $LIBS" +@@ -23637,39 +23972,44 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_dnet_stub_dnet_ntoa=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +-echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } +-if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then ++{ $as_echo "$as_me:$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 + 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 + LIBS="$ac_xsave_LIBS" +@@ -23682,10 +24022,10 @@ + # 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. +- { echo "$as_me:$LINENO: checking for gethostbyname" >&5 +-echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -23738,37 +24078,41 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_func_gethostbyname=yes + else +- echo "$as_me: failed program was:" >&5 ++ $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 +-{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 +-echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; } ++{ $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 +- { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 +-echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lnsl $LIBS" +@@ -23800,41 +24144,45 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_nsl_gethostbyname=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 +-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; } +-if test $ac_cv_lib_nsl_gethostbyname = yes; then ++{ $as_echo "$as_me:$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 + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" + fi + + if test $ac_cv_lib_nsl_gethostbyname = no; then +- { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 +-echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" +@@ -23866,33 +24214,37 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_bsd_gethostbyname=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 +-echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; } +-if test $ac_cv_lib_bsd_gethostbyname = yes; then ++{ $as_echo "$as_me:$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 + X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" + fi + +@@ -23906,10 +24258,10 @@ + # 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. +- { echo "$as_me:$LINENO: checking for connect" >&5 +-echo $ECHO_N "checking for connect... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -23962,37 +24314,41 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_func_connect=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_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 + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 +-echo "${ECHO_T}$ac_cv_func_connect" >&6; } ++{ $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 +- { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 +-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsocket $X_EXTRA_LIBS $LIBS" +@@ -24024,43 +24380,47 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_socket_connect=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 +-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; } +-if test $ac_cv_lib_socket_connect = yes; then ++{ $as_echo "$as_me:$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 + X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" + fi + + fi + + # Guillermo Gomez says -lposix is necessary on A/UX. +- { echo "$as_me:$LINENO: checking for remove" >&5 +-echo $ECHO_N "checking for remove... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -24113,37 +24473,41 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_func_remove=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_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 + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 +-echo "${ECHO_T}$ac_cv_func_remove" >&6; } ++{ $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 +- { echo "$as_me:$LINENO: checking for remove in -lposix" >&5 +-echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lposix $LIBS" +@@ -24175,43 +24539,47 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_posix_remove=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 +-echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; } +-if test $ac_cv_lib_posix_remove = yes; then ++{ $as_echo "$as_me:$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 + X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" + fi + + fi + + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. +- { echo "$as_me:$LINENO: checking for shmat" >&5 +-echo $ECHO_N "checking for shmat... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -24264,37 +24632,41 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_func_shmat=yes + else +- echo "$as_me: failed program was:" >&5 ++ $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 +-{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 +-echo "${ECHO_T}$ac_cv_func_shmat" >&6; } ++{ $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 +- { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 +-echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; } ++ { $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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lipc $LIBS" +@@ -24326,33 +24698,37 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_ipc_shmat=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 +-echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; } +-if test $ac_cv_lib_ipc_shmat = yes; then ++{ $as_echo "$as_me:$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 + X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" + fi + +@@ -24368,10 +24744,10 @@ + # 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 +- { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 +-echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$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 +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lICE $X_EXTRA_LIBS $LIBS" +@@ -24403,33 +24779,37 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_ICE_IceConnectionNumber=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +-echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; } +-if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then ++{ $as_echo "$as_me:$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 + X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" + fi + +@@ -24470,28 +24850,28 @@ + enable_policykit=no + fi + +- +-{ echo "$as_me:$LINENO: checking whether to support PolicyKit" >&5 +-echo $ECHO_N "checking whether to support PolicyKit... $ECHO_C" >&6; } ++enable_policykit=no ++{ $as_echo "$as_me:$LINENO: checking whether to support PolicyKit" >&5 ++$as_echo_n "checking whether to support PolicyKit... " >&6; } + have_polkit=no + if test x$enable_policykit = xyes ; then + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for POLKIT" >&5 +-echo $ECHO_N "checking for POLKIT... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for POLKIT" >&5 ++$as_echo_n "checking for POLKIT... " >&6; } + + if test -n "$POLKIT_CFLAGS"; then + pkg_cv_POLKIT_CFLAGS="$POLKIT_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\ + polkit-grant >= \$POLKIT_GNOME_REQUIRED\\ + polkit-dbus >= \$POLKIT_GNOME_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors "\ + polkit-grant >= $POLKIT_GNOME_REQUIRED\ + polkit-dbus >= $POLKIT_GNOME_REQUIRED") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_POLKIT_CFLAGS=`$PKG_CONFIG --cflags "\ + polkit-grant >= $POLKIT_GNOME_REQUIRED\ +@@ -24506,14 +24886,14 @@ + pkg_cv_POLKIT_LIBS="$POLKIT_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\ + polkit-grant >= \$POLKIT_GNOME_REQUIRED\\ + polkit-dbus >= \$POLKIT_GNOME_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors "\ + polkit-grant >= $POLKIT_GNOME_REQUIRED\ + polkit-dbus >= $POLKIT_GNOME_REQUIRED") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_POLKIT_LIBS=`$PKG_CONFIG --libs "\ + polkit-grant >= $POLKIT_GNOME_REQUIRED\ +@@ -24546,7 +24926,7 @@ + # Put the nasty error message in config.log where it belongs + echo "$POLKIT_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (\ ++ { { $as_echo "$as_me:$LINENO: error: Package requirements (\ + polkit-grant >= $POLKIT_GNOME_REQUIRED\ + polkit-dbus >= $POLKIT_GNOME_REQUIRED) were not met: + +@@ -24559,7 +24939,7 @@ + and POLKIT_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (\ ++$as_echo "$as_me: error: Package requirements (\ + polkit-grant >= $POLKIT_GNOME_REQUIRED\ + polkit-dbus >= $POLKIT_GNOME_REQUIRED) were not met: + +@@ -24574,7 +24954,9 @@ + " >&2;} + { (exit 1); exit 1; }; } + elif test $pkg_failed = untried; then +- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it ++ { { $as_echo "$as_me:$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. + +@@ -24584,7 +24966,7 @@ + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details." >&5 +-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++$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. + +@@ -24594,12 +24976,12 @@ + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { (exit 1); exit 1; }; }; } + else + POLKIT_CFLAGS=$pkg_cv_POLKIT_CFLAGS + POLKIT_LIBS=$pkg_cv_POLKIT_LIBS +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + : + fi + +@@ -24610,11 +24992,11 @@ + #define HAVE_POLKIT 1 + _ACEOF + +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + # Check whether --enable-checkfg was given. +@@ -24625,8 +25007,8 @@ + fi + + +-{ echo "$as_me:$LINENO: checking whether to use check-foreground-console" >&5 +-echo $ECHO_N "checking whether to use check-foreground-console... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking whether to use check-foreground-console" >&5 ++$as_echo_n "checking whether to use check-foreground-console... " >&6; } + have_checkfg=no + if test x$enable_checkfg = xyes ; then + have_checkfg=yes +@@ -24635,11 +25017,11 @@ + #define HAVE_CHECK_FG 1 + _ACEOF + +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + # Check whether --enable-xevents was given. +@@ -24650,8 +25032,8 @@ + fi + + +-{ echo "$as_me:$LINENO: checking whether to support xevents" >&5 +-echo $ECHO_N "checking whether to support xevents... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking whether to support xevents" >&5 ++$as_echo_n "checking whether to support xevents... " >&6; } + have_xevents=no + if test x$enable_xevents = xyes ; then + have_xevents=yes +@@ -24660,11 +25042,11 @@ + #define HAVE_XEVENTS 1 + _ACEOF + +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + # Check whether --enable-tests was given. +@@ -24675,8 +25057,8 @@ + fi + + +-{ echo "$as_me:$LINENO: checking whether to support tests" >&5 +-echo $ECHO_N "checking whether to support tests... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking whether to support tests" >&5 ++$as_echo_n "checking whether to support tests... " >&6; } + have_tests=no + if test x$enable_tests = xyes ; then + have_tests=yes +@@ -24685,11 +25067,11 @@ + #define HAVE_TESTS 1 + _ACEOF + +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + if test $have_tests = yes; then + HAVE_TESTS_TRUE= +@@ -24708,54 +25090,12 @@ + fi + + +-{ echo "$as_me:$LINENO: checking whether to support gconf defaults" >&5 +-echo $ECHO_N "checking whether to support gconf defaults... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking whether to support gconf defaults" >&5 ++$as_echo_n "checking whether to support gconf defaults... " >&6; } + have_gconfdefaults=no + if test x$enable_gconfdefaults = xyes ; then + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for POLKIT_GNOME" >&5 +-echo $ECHO_N "checking for POLKIT_GNOME... $ECHO_C" >&6; } +- +-if test -n "$POLKIT_GNOME_CFLAGS"; then +- pkg_cv_POLKIT_GNOME_CFLAGS="$POLKIT_GNOME_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" +- polkit-gnome >= \$POLKIT_GNOME_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors " +- polkit-gnome >= $POLKIT_GNOME_REQUIRED") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- pkg_cv_POLKIT_GNOME_CFLAGS=`$PKG_CONFIG --cflags " +- polkit-gnome >= $POLKIT_GNOME_REQUIRED" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +-if test -n "$POLKIT_GNOME_LIBS"; then +- pkg_cv_POLKIT_GNOME_LIBS="$POLKIT_GNOME_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" +- polkit-gnome >= \$POLKIT_GNOME_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors " +- polkit-gnome >= $POLKIT_GNOME_REQUIRED") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- pkg_cv_POLKIT_GNOME_LIBS=`$PKG_CONFIG --libs " +- polkit-gnome >= $POLKIT_GNOME_REQUIRED" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +- + + + if test $pkg_failed = yes; then +@@ -24775,7 +25115,7 @@ + # Put the nasty error message in config.log where it belongs + echo "$POLKIT_GNOME_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements ( ++ { { $as_echo "$as_me:$LINENO: error: Package requirements ( + polkit-gnome >= $POLKIT_GNOME_REQUIRED) were not met: + + $POLKIT_GNOME_PKG_ERRORS +@@ -24787,7 +25127,7 @@ + and POLKIT_GNOME_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements ( ++$as_echo "$as_me: error: Package requirements ( + polkit-gnome >= $POLKIT_GNOME_REQUIRED) were not met: + + $POLKIT_GNOME_PKG_ERRORS +@@ -24801,7 +25141,9 @@ + " >&2;} + { (exit 1); exit 1; }; } + elif test $pkg_failed = untried; then +- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it ++ { { $as_echo "$as_me:$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. + +@@ -24811,7 +25153,7 @@ + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details." >&5 +-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++$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. + +@@ -24821,12 +25163,12 @@ + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { (exit 1); exit 1; }; }; } + else + POLKIT_GNOME_CFLAGS=$pkg_cv_POLKIT_GNOME_CFLAGS + POLKIT_GNOME_LIBS=$pkg_cv_POLKIT_GNOME_LIBS +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + : + fi + +@@ -24837,11 +25179,11 @@ + #define HAVE_GCONF_DEFAULTS 1 + _ACEOF + +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + if test $have_gconfdefaults = yes; then + HAVE_GCONF_DEFAULTS_TRUE= +@@ -24860,8 +25202,8 @@ + fi + + +-{ echo "$as_me:$LINENO: checking whether to build applet support" >&5 +-echo $ECHO_N "checking whether to build applet support... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking whether to build applet support" >&5 ++$as_echo_n "checking whether to build applet support... " >&6; } + have_applets=no + if test x$enable_applets = xyes ; then + have_applets=yes +@@ -24870,11 +25212,11 @@ + #define HAVE_APPLETS 1 + _ACEOF + +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + if test $have_applets = yes; then + HAVE_APPLETS_TRUE= +@@ -24895,10 +25237,10 @@ + + # Extract the first word of "xmlto", so it can be a program name with args. + set dummy xmlto; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_path_XMLTO+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case $XMLTO in + [\\/]* | ?:[\\/]*) +@@ -24913,7 +25255,7 @@ + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -24926,16 +25268,16 @@ + fi + XMLTO=$ac_cv_path_XMLTO + if test -n "$XMLTO"; then +- { echo "$as_me:$LINENO: result: $XMLTO" >&5 +-echo "${ECHO_T}$XMLTO" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $XMLTO" >&5 ++$as_echo "$XMLTO" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +-{ echo "$as_me:$LINENO: checking whether to build DocBook documentation" >&5 +-echo $ECHO_N "checking whether to build DocBook documentation... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$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 + else +@@ -24950,8 +25292,8 @@ + fi + if test x$enable_docbook_docs = xyes; then + if test x$have_docbook = xno; then +- { { echo "$as_me:$LINENO: error: Building DocBook docs explicitly required, but DocBook not found" >&5 +-echo "$as_me: error: Building DocBook docs explicitly required, but DocBook not found" >&2;} ++ { { $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; }; } + fi + fi +@@ -24963,8 +25305,8 @@ + DOCBOOK_DOCS_ENABLED_FALSE= + fi + +-{ echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++{ $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + + + # Check whether --with-dbus-services was given. +@@ -24985,17 +25327,17 @@ + have_libnotify=yes + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for LIBNOTIFY" >&5 +-echo $ECHO_N "checking for LIBNOTIFY... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for LIBNOTIFY" >&5 ++$as_echo_n "checking for LIBNOTIFY... " >&6; } + + if test -n "$LIBNOTIFY_CFLAGS"; then + pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= $LIBNOTIFY_REQUIRED" 2>/dev/null` + else +@@ -25008,10 +25350,10 @@ + pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= $LIBNOTIFY_REQUIRED" 2>/dev/null` + else +@@ -25038,7 +25380,7 @@ + # Put the nasty error message in config.log where it belongs + echo "$LIBNOTIFY_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (libnotify >= $LIBNOTIFY_REQUIRED) were not met: ++ { { $as_echo "$as_me:$LINENO: error: Package requirements (libnotify >= $LIBNOTIFY_REQUIRED) were not met: + + $LIBNOTIFY_PKG_ERRORS + +@@ -25049,7 +25391,7 @@ + and LIBNOTIFY_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (libnotify >= $LIBNOTIFY_REQUIRED) were not met: ++$as_echo "$as_me: error: Package requirements (libnotify >= $LIBNOTIFY_REQUIRED) were not met: + + $LIBNOTIFY_PKG_ERRORS + +@@ -25062,7 +25404,9 @@ + " >&2;} + { (exit 1); exit 1; }; } + elif test $pkg_failed = untried; then +- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it ++ { { $as_echo "$as_me:$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. + +@@ -25072,7 +25416,7 @@ + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details." >&5 +-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++$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. + +@@ -25082,12 +25426,12 @@ + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { (exit 1); exit 1; }; }; } + else + LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS + LIBNOTIFY_LIBS=$pkg_cv_LIBNOTIFY_LIBS +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + : + fi + +@@ -25113,17 +25457,17 @@ + have_unique=yes + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for UNIQUE" >&5 +-echo $ECHO_N "checking for UNIQUE... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for UNIQUE" >&5 ++$as_echo_n "checking for UNIQUE... " >&6; } + + if test -n "$UNIQUE_CFLAGS"; then + pkg_cv_UNIQUE_CFLAGS="$UNIQUE_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"unique-1.0 >= \$UNIQUE_REQUIRED\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"unique-1.0 >= \$UNIQUE_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors "unique-1.0 >= $UNIQUE_REQUIRED") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_UNIQUE_CFLAGS=`$PKG_CONFIG --cflags "unique-1.0 >= $UNIQUE_REQUIRED" 2>/dev/null` + else +@@ -25136,10 +25480,10 @@ + pkg_cv_UNIQUE_LIBS="$UNIQUE_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"unique-1.0 >= \$UNIQUE_REQUIRED\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"unique-1.0 >= \$UNIQUE_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors "unique-1.0 >= $UNIQUE_REQUIRED") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_UNIQUE_LIBS=`$PKG_CONFIG --libs "unique-1.0 >= $UNIQUE_REQUIRED" 2>/dev/null` + else +@@ -25166,7 +25510,7 @@ + # Put the nasty error message in config.log where it belongs + echo "$UNIQUE_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (unique-1.0 >= $UNIQUE_REQUIRED) were not met: ++ { { $as_echo "$as_me:$LINENO: error: Package requirements (unique-1.0 >= $UNIQUE_REQUIRED) were not met: + + $UNIQUE_PKG_ERRORS + +@@ -25177,7 +25521,7 @@ + and UNIQUE_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (unique-1.0 >= $UNIQUE_REQUIRED) were not met: ++$as_echo "$as_me: error: Package requirements (unique-1.0 >= $UNIQUE_REQUIRED) were not met: + + $UNIQUE_PKG_ERRORS + +@@ -25190,7 +25534,9 @@ + " >&2;} + { (exit 1); exit 1; }; } + elif test $pkg_failed = untried; then +- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it ++ { { $as_echo "$as_me:$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. + +@@ -25200,7 +25546,7 @@ + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details." >&5 +-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++$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. + +@@ -25210,12 +25556,12 @@ + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { (exit 1); exit 1; }; }; } + else + UNIQUE_CFLAGS=$pkg_cv_UNIQUE_CFLAGS + UNIQUE_LIBS=$pkg_cv_UNIQUE_LIBS +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + : + fi + +@@ -25296,28 +25642,28 @@ + no) ;; + + /*) +- { echo "$as_me:$LINENO: checking for DPMS headers" >&5 +-echo $ECHO_N "checking for DPMS headers... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for DPMS headers" >&5 ++$as_echo_n "checking for DPMS headers... " >&6; } + d=$with_dpms/include + if test -d $d; then + X_CFLAGS="-I$d $X_CFLAGS" +- { echo "$as_me:$LINENO: result: $d" >&5 +-echo "${ECHO_T}$d" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $d" >&5 ++$as_echo "$d" >&6; } + else +- { echo "$as_me:$LINENO: result: not found ($d: no such directory)" >&5 +-echo "${ECHO_T}not found ($d: no such directory)" >&6; } ++ { $as_echo "$as_me:$LINENO: result: not found ($d: no such directory)" >&5 ++$as_echo "not found ($d: no such directory)" >&6; } + fi + +- { echo "$as_me:$LINENO: checking for DPMS libs" >&5 +-echo $ECHO_N "checking for DPMS libs... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for DPMS libs" >&5 ++$as_echo_n "checking for DPMS libs... " >&6; } + d=$with_dpms/lib + if test -d $d; then + X_LIBS="-L$d $X_LIBS" +- { echo "$as_me:$LINENO: result: $d" >&5 +-echo "${ECHO_T}$d" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $d" >&5 ++$as_echo "$d" >&6; } + else +- { echo "$as_me:$LINENO: result: not found ($d: no such directory)" >&5 +-echo "${ECHO_T}not found ($d: no such directory)" >&6; } ++ { $as_echo "$as_me:$LINENO: result: not found ($d: no such directory)" >&5 ++$as_echo "not found ($d: no such directory)" >&6; } + fi + + # replace the directory string with "yes". +@@ -25344,10 +25690,10 @@ + CPPFLAGS="$CPPFLAGS -I$includedir" + fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS" +- { echo "$as_me:$LINENO: checking for X11/extensions/dpms.h" >&5 +-echo $ECHO_N "checking for X11/extensions/dpms.h... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for X11/extensions/dpms.h" >&5 ++$as_echo_n "checking for X11/extensions/dpms.h... " >&6; } + if test "${ac_cv_header_X11_extensions_dpms_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -25366,20 +25712,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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_dpms_h=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_X11_extensions_dpms_h=no +@@ -25387,9 +25734,9 @@ + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_dpms_h" >&5 +-echo "${ECHO_T}$ac_cv_header_X11_extensions_dpms_h" >&6; } +-if test $ac_cv_header_X11_extensions_dpms_h = yes; then ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_dpms_h" >&5 ++$as_echo "$ac_cv_header_X11_extensions_dpms_h" >&6; } ++if test "x$ac_cv_header_X11_extensions_dpms_h" = x""yes; then + have_dpms=yes + fi + +@@ -25418,10 +25765,10 @@ + # note: $X_LIBS includes $x_libraries + LDFLAGS="$LDFLAGS $ALL_X_LIBS" + +- { echo "$as_me:$LINENO: checking for DPMSInfo in -lXext" >&5 +-echo $ECHO_N "checking for DPMSInfo in -lXext... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for DPMSInfo in -lXext" >&5 ++$as_echo_n "checking for DPMSInfo in -lXext... " >&6; } + if test "${ac_cv_lib_Xext_DPMSInfo+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lXext -lXext -lX11 $LIBS" +@@ -25453,33 +25800,37 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_Xext_DPMSInfo=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_Xext_DPMSInfo=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 +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_DPMSInfo" >&5 +-echo "${ECHO_T}$ac_cv_lib_Xext_DPMSInfo" >&6; } +-if test $ac_cv_lib_Xext_DPMSInfo = yes; then ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_DPMSInfo" >&5 ++$as_echo "$ac_cv_lib_Xext_DPMSInfo" >&6; } ++if test "x$ac_cv_lib_Xext_DPMSInfo" = x""yes; then + have_dpms=yes + else + true +@@ -25509,10 +25860,10 @@ + # note: $X_LIBS includes $x_libraries + LDFLAGS="$LDFLAGS $ALL_X_LIBS" + +- { echo "$as_me:$LINENO: checking for DPMSInfo in -lXdpms" >&5 +-echo $ECHO_N "checking for DPMSInfo in -lXdpms... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for DPMSInfo in -lXdpms" >&5 ++$as_echo_n "checking for DPMSInfo in -lXdpms... " >&6; } + if test "${ac_cv_lib_Xdpms_DPMSInfo+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lXdpms -lXext -lX11 $LIBS" +@@ -25544,33 +25895,37 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_Xdpms_DPMSInfo=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_Xdpms_DPMSInfo=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 +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xdpms_DPMSInfo" >&5 +-echo "${ECHO_T}$ac_cv_lib_Xdpms_DPMSInfo" >&6; } +-if test $ac_cv_lib_Xdpms_DPMSInfo = yes; then ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xdpms_DPMSInfo" >&5 ++$as_echo "$ac_cv_lib_Xdpms_DPMSInfo" >&6; } ++if test "x$ac_cv_lib_Xdpms_DPMSInfo" = x""yes; then + have_dpms=yes; XDPMS_LIBS="-lXdpms" + else + true +@@ -25599,12 +25954,12 @@ + exit 1 + fi + +-{ echo "$as_me:$LINENO: checking for Solaris kstat" >&5 +-echo $ECHO_N "checking for Solaris kstat... $ECHO_C" >&6; } +-{ echo "$as_me:$LINENO: checking for kstat_open in -lkstat" >&5 +-echo $ECHO_N "checking for kstat_open in -lkstat... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for Solaris kstat" >&5 ++$as_echo_n "checking for Solaris kstat... " >&6; } ++{ $as_echo "$as_me:$LINENO: checking for kstat_open in -lkstat" >&5 ++$as_echo_n "checking for kstat_open in -lkstat... " >&6; } + if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lkstat $LIBS" +@@ -25636,33 +25991,37 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && +- $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_kstat_kstat_open=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_kstat_kstat_open=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 +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_kstat_kstat_open" >&5 +-echo "${ECHO_T}$ac_cv_lib_kstat_kstat_open" >&6; } +-if test $ac_cv_lib_kstat_kstat_open = yes; then ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kstat_kstat_open" >&5 ++$as_echo "$ac_cv_lib_kstat_kstat_open" >&6; } ++if test "x$ac_cv_lib_kstat_kstat_open" = x""yes; then + + + cat >>confdefs.h <<\_ACEOF +@@ -25677,10 +26036,10 @@ + + # Extract the first word of "docbook2man", so it can be a program name with args. + set dummy docbook2man; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_path_DOCBOOK2MAN+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case $DOCBOOK2MAN in + [\\/]* | ?:[\\/]*) +@@ -25695,7 +26054,7 @@ + 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_DOCBOOK2MAN="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -25708,17 +26067,17 @@ + fi + DOCBOOK2MAN=$ac_cv_path_DOCBOOK2MAN + if test -n "$DOCBOOK2MAN"; then +- { echo "$as_me:$LINENO: result: $DOCBOOK2MAN" >&5 +-echo "${ECHO_T}$DOCBOOK2MAN" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $DOCBOOK2MAN" >&5 ++$as_echo "$DOCBOOK2MAN" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + + if test "$DOCBOOK2MAN" = "no" ; then +- { echo "$as_me:$LINENO: WARNING: docbook2man not found, will not be able to build man documentation" >&5 +-echo "$as_me: WARNING: docbook2man not found, will not be able to build man documentation" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: docbook2man not found, will not be able to build man documentation" >&5 ++$as_echo "$as_me: WARNING: docbook2man not found, will not be able to build man documentation" >&2;} + fi + if test "$DOCBOOK2MAN" != "no"; then + HAVE_DOCBOOK2MAN_TRUE= +@@ -25744,11 +26103,11 @@ + + fi + +-{ echo "$as_me:$LINENO: checking for more warnings" >&5 +-echo $ECHO_N "checking for more warnings... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for more warnings" >&5 ++$as_echo_n "checking for more warnings... " >&6; } + if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + CFLAGS="\ + -Wall \ + -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \ +@@ -25759,8 +26118,8 @@ + for option in -Wno-strict-aliasing -Wno-sign-compare; do + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $option" +- { echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 +-echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 ++$as_echo_n "checking whether gcc understands $option... " >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -25782,20 +26141,21 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++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 +- echo "$as_me:$LINENO: \$? = $ac_status" >&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 + has_option=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + has_option=no +@@ -25805,15 +26165,15 @@ + if test $has_option = no; then + CFLAGS="$SAVE_CFLAGS" + fi +- { echo "$as_me:$LINENO: result: $has_option" >&5 +-echo "${ECHO_T}$has_option" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $has_option" >&5 ++$as_echo "$has_option" >&6; } + unset has_option + unset SAVE_CFLAGS + done + unset option + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + ac_config_files="$ac_config_files Makefile src/Makefile src/dbus/Makefile applets/Makefile applets/brightness/Makefile applets/inhibit/Makefile libhal-glib/Makefile libdbus-glib/Makefile libidletime/Makefile libunique/Makefile docs/Makefile man/Makefile help/Makefile po/Makefile.in tools/Makefile test/Makefile data/Makefile data/gnome-power-manager.desktop.in data/gnome-power-preferences.desktop.in data/gnome-power-statistics.desktop.in data/sounds/Makefile data/icons/Makefile data/icons/16x16/Makefile data/icons/16x16/actions/Makefile data/icons/16x16/apps/Makefile data/icons/16x16/status/Makefile data/icons/22x22/Makefile data/icons/22x22/actions/Makefile data/icons/22x22/apps/Makefile data/icons/22x22/status/Makefile data/icons/24x24/Makefile data/icons/24x24/actions/Makefile data/icons/24x24/apps/Makefile data/icons/24x24/status/Makefile data/icons/48x48/Makefile data/icons/48x48/actions/Makefile data/icons/48x48/apps/Makefile data/icons/48x48/status/Makefile data/icons/scalable/Makefile data/icons/scalable/actions/Makefile data/icons/scalable/apps/Makefile data/icons/scalable/status/Makefile" +@@ -25846,11 +26206,12 @@ + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( +- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; ++ *_cv_*) { $as_echo "$as_me:$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 ;; + esac ;; + esac +@@ -25883,12 +26244,12 @@ + if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + test "x$cache_file" != "x/dev/null" && +- { echo "$as_me:$LINENO: updating cache $cache_file" >&5 +-echo "$as_me: updating cache $cache_file" >&6;} ++ { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 +-echo "$as_me: not updating unwritable cache $cache_file" >&6;} ++ { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -25904,7 +26265,7 @@ + for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' +- ac_i=`echo "$ac_i" | sed "$ac_script"` ++ 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" +@@ -25916,23 +26277,23 @@ + + + if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"AMDEP\" was never defined. ++$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. ++$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; }; } + fi + if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. ++$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi +@@ -25941,82 +26302,83 @@ + + + if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"ENABLE_SK\" was never defined. ++$as_echo "$as_me: error: conditional \"ENABLE_SK\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. ++$as_echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. ++$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; }; } + fi + if test -z "${HAVE_TESTS_TRUE}" && test -z "${HAVE_TESTS_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"HAVE_TESTS\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_TESTS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"HAVE_TESTS\" was never defined. ++$as_echo "$as_me: error: conditional \"HAVE_TESTS\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_GCONF_DEFAULTS_TRUE}" && test -z "${HAVE_GCONF_DEFAULTS_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"HAVE_GCONF_DEFAULTS\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GCONF_DEFAULTS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"HAVE_GCONF_DEFAULTS\" was never defined. ++$as_echo "$as_me: error: conditional \"HAVE_GCONF_DEFAULTS\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_APPLETS_TRUE}" && test -z "${HAVE_APPLETS_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"HAVE_APPLETS\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_APPLETS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"HAVE_APPLETS\" was never defined. ++$as_echo "$as_me: error: conditional \"HAVE_APPLETS\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${DOCBOOK_DOCS_ENABLED_TRUE}" && test -z "${DOCBOOK_DOCS_ENABLED_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"DOCBOOK_DOCS_ENABLED\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"DOCBOOK_DOCS_ENABLED\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"DOCBOOK_DOCS_ENABLED\" was never defined. ++$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; }; } + fi + if test -z "${HAVE_LIBNOTIFY_TRUE}" && test -z "${HAVE_LIBNOTIFY_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"HAVE_LIBNOTIFY\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_LIBNOTIFY\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"HAVE_LIBNOTIFY\" was never defined. ++$as_echo "$as_me: error: conditional \"HAVE_LIBNOTIFY\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_UNIQUE_TRUE}" && test -z "${HAVE_UNIQUE_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"HAVE_UNIQUE\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_UNIQUE\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"HAVE_UNIQUE\" was never defined. ++$as_echo "$as_me: error: conditional \"HAVE_UNIQUE\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_DOCBOOK2MAN_TRUE}" && test -z "${HAVE_DOCBOOK2MAN_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"HAVE_DOCBOOK2MAN\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_DOCBOOK2MAN\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"HAVE_DOCBOOK2MAN\" was never defined. ++$as_echo "$as_me: error: conditional \"HAVE_DOCBOOK2MAN\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + + : ${CONFIG_STATUS=./config.status} ++ac_write_fail=0 + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +-echo "$as_me: creating $CONFIG_STATUS" >&6;} +-cat >$CONFIG_STATUS <<_ACEOF ++{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 ++$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} ++cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + #! $SHELL + # Generated by $as_me. + # Run this file to recreate the current configuration. +@@ -26029,7 +26391,7 @@ + SHELL=\${CONFIG_SHELL-$SHELL} + _ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + ## --------------------- ## + ## M4sh Initialization. ## + ## --------------------- ## +@@ -26039,7 +26401,7 @@ + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # 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 +@@ -26061,17 +26423,45 @@ + as_cr_digits='0123456789' + as_cr_alnum=$as_cr_Letters$as_cr_digits + +-# The user is always right. +-if test "${PATH_SEPARATOR+set}" != set; then +- echo "#! /bin/sh" >conf$$.sh +- echo "exit 0" >>conf$$.sh +- chmod +x conf$$.sh +- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then +- PATH_SEPARATOR=';' ++as_nl=' ++' ++export as_nl ++# Printing a long string crashes Solaris 7 /usr/bin/printf. ++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 ++ as_echo='printf %s\n' ++ as_echo_n='printf %s' ++else ++ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then ++ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' ++ as_echo_n='/usr/ucb/echo -n' + else +- PATH_SEPARATOR=: ++ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' ++ as_echo_n_body='eval ++ arg=$1; ++ case $arg in ++ *"$as_nl"*) ++ expr "X$arg" : "X\\(.*\\)$as_nl"; ++ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; ++ esac; ++ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" ++ ' ++ export as_echo_n_body ++ as_echo_n='sh -c $as_echo_n_body as_echo' + fi +- rm -f conf$$.sh ++ export as_echo_body ++ as_echo='sh -c $as_echo_body as_echo' ++fi ++ ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ PATH_SEPARATOR=: ++ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { ++ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || ++ PATH_SEPARATOR=';' ++ } + fi + + # Support unset when possible. +@@ -26087,8 +26477,6 @@ + # there to prevent editors from complaining about space-tab. + # (If _AS_PATH_WALK were called with IFS unset, it would disable word + # splitting by setting IFS to empty value.) +-as_nl=' +-' + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +@@ -26111,7 +26499,7 @@ + as_myself=$0 + fi + if test ! -f "$as_myself"; then +- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } + fi + +@@ -26124,17 +26512,10 @@ + PS4='+ ' + + # NLS nuisances. +-for as_var in \ +- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ +- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ +- LC_TELEPHONE LC_TIME +-do +- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then +- eval $as_var=C; export $as_var +- else +- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +- fi +-done ++LC_ALL=C ++export LC_ALL ++LANGUAGE=C ++export LANGUAGE + + # Required to use basename. + if expr a : '\(a\)' >/dev/null 2>&1 && +@@ -26156,7 +26537,7 @@ + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +-echo X/"$0" | ++$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q +@@ -26207,7 +26588,7 @@ + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || +- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 ++ { $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 +@@ -26235,7 +26616,6 @@ + *) + ECHO_N='-n';; + esac +- + if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +@@ -26248,19 +26628,22 @@ + rm -f conf$$.dir/conf$$.file + else + rm -f conf$$.dir +- mkdir conf$$.dir ++ mkdir conf$$.dir 2>/dev/null + fi +-echo >conf$$.file +-if ln -s conf$$.file conf$$ 2>/dev/null; then +- as_ln_s='ln -s' +- # ... but there are two gotchas: +- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. +- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -p'. +- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || ++if (echo >conf$$.file) 2>/dev/null; then ++ if ln -s conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s='ln -s' ++ # ... but there are two gotchas: ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. ++ # In both cases, we have to default to `cp -p'. ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || ++ as_ln_s='cp -p' ++ elif ln conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s=ln ++ else + as_ln_s='cp -p' +-elif ln conf$$.file conf$$ 2>/dev/null; then +- as_ln_s=ln ++ fi + else + as_ln_s='cp -p' + fi +@@ -26285,10 +26668,10 @@ + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then +- test -d "$1/."; ++ test -d "$1/."; + else + case $1 in +- -*)set "./$1";; ++ -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi +@@ -26311,7 +26694,7 @@ + # values after options handling. + ac_log=" + This file was extended by gnome-power-manager $as_me 2.24.0, which was +-generated by GNU Autoconf 2.61. Invocation command line was ++generated by GNU Autoconf 2.63. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -26324,7 +26707,16 @@ + + _ACEOF + +-cat >>$CONFIG_STATUS <<_ACEOF ++case $ac_config_files in *" ++"*) set x $ac_config_files; shift; ac_config_files=$*;; ++esac ++ ++case $ac_config_headers in *" ++"*) set x $ac_config_headers; shift; ac_config_headers=$*;; ++esac ++ ++ ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + # Files that config.status was made for. + config_files="$ac_config_files" + config_headers="$ac_config_headers" +@@ -26332,22 +26724,23 @@ + + _ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + ac_cs_usage="\ + \`$as_me' instantiates files from templates according to the + current configuration. + +-Usage: $0 [OPTIONS] [FILE]... ++Usage: $0 [OPTION]... [FILE]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit +- -q, --quiet do not print progress messages ++ -q, --quiet, --silent ++ do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions +- --file=FILE[:TEMPLATE] +- instantiate the configuration file FILE +- --header=FILE[:TEMPLATE] +- instantiate the configuration header FILE ++ --file=FILE[:TEMPLATE] ++ instantiate the configuration file FILE ++ --header=FILE[:TEMPLATE] ++ instantiate the configuration header FILE + + Configuration files: + $config_files +@@ -26361,13 +26754,13 @@ + Report bugs to <bug-autoconf@gnu.org>." + + _ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_version="\\ + gnome-power-manager config.status 2.24.0 +-configured by $0, generated by GNU Autoconf 2.61, +- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" ++configured by $0, generated by GNU Autoconf 2.63, ++ with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" + +-Copyright (C) 2006 Free Software Foundation, Inc. ++Copyright (C) 2008 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." + +@@ -26375,11 +26768,12 @@ + srcdir='$srcdir' + INSTALL='$INSTALL' + MKDIR_P='$MKDIR_P' ++AWK='$AWK' ++test -n "\$AWK" || AWK=awk + _ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF +-# If no file are specified by the user, then we need to provide default +-# value. By we need to know if files were specified by the user. ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++# The default lists apply if the user does not specify any file. + ac_need_defaults=: + while test $# != 0 + do +@@ -26401,30 +26795,36 @@ + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) +- echo "$ac_cs_version"; exit ;; ++ $as_echo "$ac_cs_version"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift +- CONFIG_FILES="$CONFIG_FILES $ac_optarg" ++ case $ac_optarg in ++ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ esac ++ CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + $ac_shift +- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ++ case $ac_optarg in ++ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ esac ++ CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header +- { echo "$as_me: error: ambiguous option: $1 ++ { $as_echo "$as_me: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; };; + --help | --hel | -h ) +- echo "$ac_cs_usage"; exit ;; ++ $as_echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. +- -*) { echo "$as_me: error: unrecognized option: $1 ++ -*) { $as_echo "$as_me: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } ;; + +@@ -26443,27 +26843,29 @@ + fi + + _ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + if \$ac_cs_recheck; then +- echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 +- CONFIG_SHELL=$SHELL ++ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion ++ shift ++ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 ++ CONFIG_SHELL='$SHELL' + export CONFIG_SHELL +- exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion ++ exec "\$@" + fi + + _ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + exec 5>>config.log + { + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX + ## Running $as_me. ## + _ASBOX +- echo "$ac_log" ++ $as_echo "$ac_log" + } >&5 + + _ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + # + # INIT-COMMANDS + # +@@ -26475,7 +26877,7 @@ + + _ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + + # Handling of arguments. + for ac_config_target in $ac_config_targets +@@ -26529,8 +26931,8 @@ + "data/icons/scalable/status/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/scalable/status/Makefile" ;; + "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; + +- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +-echo "$as_me: error: invalid argument: $ac_config_target" >&2;} ++ *) { { $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; }; };; + esac + done +@@ -26571,375 +26973,144 @@ + (umask 077 && mkdir "$tmp") + } || + { +- echo "$me: cannot create a temporary directory in ." >&2 ++ $as_echo "$as_me: cannot create a temporary directory in ." >&2 + { (exit 1); exit 1; } + } + +-# +-# Set up the sed scripts for CONFIG_FILES section. +-# +- +-# No need to generate the scripts if there are no CONFIG_FILES. +-# This happens for instance when ./config.status config.h ++# Set up the scripts for CONFIG_FILES section. ++# No need to generate them if there are no CONFIG_FILES. ++# This happens for instance with `./config.status config.h'. + if test -n "$CONFIG_FILES"; then + +-_ACEOF +- +- +- +-ac_delim='%!_!# ' +-for ac_last_try in false false false false false :; do +- cat >conf$$subs.sed <<_ACEOF +-SHELL!$SHELL$ac_delim +-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim +-PACKAGE_NAME!$PACKAGE_NAME$ac_delim +-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim +-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim +-PACKAGE_STRING!$PACKAGE_STRING$ac_delim +-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim +-exec_prefix!$exec_prefix$ac_delim +-prefix!$prefix$ac_delim +-program_transform_name!$program_transform_name$ac_delim +-bindir!$bindir$ac_delim +-sbindir!$sbindir$ac_delim +-libexecdir!$libexecdir$ac_delim +-datarootdir!$datarootdir$ac_delim +-datadir!$datadir$ac_delim +-sysconfdir!$sysconfdir$ac_delim +-sharedstatedir!$sharedstatedir$ac_delim +-localstatedir!$localstatedir$ac_delim +-includedir!$includedir$ac_delim +-oldincludedir!$oldincludedir$ac_delim +-docdir!$docdir$ac_delim +-infodir!$infodir$ac_delim +-htmldir!$htmldir$ac_delim +-dvidir!$dvidir$ac_delim +-pdfdir!$pdfdir$ac_delim +-psdir!$psdir$ac_delim +-libdir!$libdir$ac_delim +-localedir!$localedir$ac_delim +-mandir!$mandir$ac_delim +-DEFS!$DEFS$ac_delim +-ECHO_C!$ECHO_C$ac_delim +-ECHO_N!$ECHO_N$ac_delim +-ECHO_T!$ECHO_T$ac_delim +-LIBS!$LIBS$ac_delim +-build_alias!$build_alias$ac_delim +-host_alias!$host_alias$ac_delim +-target_alias!$target_alias$ac_delim +-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim +-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim +-INSTALL_DATA!$INSTALL_DATA$ac_delim +-am__isrc!$am__isrc$ac_delim +-CYGPATH_W!$CYGPATH_W$ac_delim +-PACKAGE!$PACKAGE$ac_delim +-VERSION!$VERSION$ac_delim +-ACLOCAL!$ACLOCAL$ac_delim +-AUTOCONF!$AUTOCONF$ac_delim +-AUTOMAKE!$AUTOMAKE$ac_delim +-AUTOHEADER!$AUTOHEADER$ac_delim +-MAKEINFO!$MAKEINFO$ac_delim +-install_sh!$install_sh$ac_delim +-STRIP!$STRIP$ac_delim +-INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim +-mkdir_p!$mkdir_p$ac_delim +-AWK!$AWK$ac_delim +-SET_MAKE!$SET_MAKE$ac_delim +-am__leading_dot!$am__leading_dot$ac_delim +-AMTAR!$AMTAR$ac_delim +-am__tar!$am__tar$ac_delim +-am__untar!$am__untar$ac_delim +-CC!$CC$ac_delim +-CFLAGS!$CFLAGS$ac_delim +-LDFLAGS!$LDFLAGS$ac_delim +-CPPFLAGS!$CPPFLAGS$ac_delim +-ac_ct_CC!$ac_ct_CC$ac_delim +-EXEEXT!$EXEEXT$ac_delim +-OBJEXT!$OBJEXT$ac_delim +-DEPDIR!$DEPDIR$ac_delim +-am__include!$am__include$ac_delim +-am__quote!$am__quote$ac_delim +-AMDEP_TRUE!$AMDEP_TRUE$ac_delim +-AMDEP_FALSE!$AMDEP_FALSE$ac_delim +-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim +-CCDEPMODE!$CCDEPMODE$ac_delim +-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim +-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim +-build!$build$ac_delim +-build_cpu!$build_cpu$ac_delim +-build_vendor!$build_vendor$ac_delim +-build_os!$build_os$ac_delim +-host!$host$ac_delim +-host_cpu!$host_cpu$ac_delim +-host_vendor!$host_vendor$ac_delim +-host_os!$host_os$ac_delim +-SED!$SED$ac_delim +-GREP!$GREP$ac_delim +-EGREP!$EGREP$ac_delim +-LN_S!$LN_S$ac_delim +-ECHO!$ECHO$ac_delim +-AR!$AR$ac_delim +-RANLIB!$RANLIB$ac_delim +-CPP!$CPP$ac_delim +-CXX!$CXX$ac_delim +-CXXFLAGS!$CXXFLAGS$ac_delim +-ac_ct_CXX!$ac_ct_CXX$ac_delim +-CXXDEPMODE!$CXXDEPMODE$ac_delim +-am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim +-am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim +-_ACEOF +- +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +- break +- elif $ac_last_try; then +- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } +- else +- ac_delim="$ac_delim!$ac_delim _$ac_delim!! " +- fi +-done + +-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +-if test -n "$ac_eof"; then +- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` +- ac_eof=`expr $ac_eof + 1` ++ac_cr=' ' ++ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` ++if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then ++ ac_cs_awk_cr='\\r' ++else ++ ac_cs_awk_cr=$ac_cr + fi + +-cat >>$CONFIG_STATUS <<_ACEOF +-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof +-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +-_ACEOF +-sed ' +-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +-s/^/s,@/; s/!/@,|#_!!_#|/ +-:n +-t n +-s/'"$ac_delim"'$/,g/; t +-s/$/\\/; p +-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +-' >>$CONFIG_STATUS <conf$$subs.sed +-rm -f conf$$subs.sed +-cat >>$CONFIG_STATUS <<_ACEOF +-CEOF$ac_eof ++echo 'BEGIN {' >"$tmp/subs1.awk" && + _ACEOF + + ++{ ++ echo "cat >conf$$subs.awk <<_ACEOF" && ++ 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; }; } ++ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do +- cat >conf$$subs.sed <<_ACEOF +-CXXCPP!$CXXCPP$ac_delim +-F77!$F77$ac_delim +-FFLAGS!$FFLAGS$ac_delim +-ac_ct_F77!$ac_ct_F77$ac_delim +-LIBTOOL!$LIBTOOL$ac_delim +-INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim +-INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim +-INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim +-INTLTOOL_PROP_RULE!$INTLTOOL_PROP_RULE$ac_delim +-INTLTOOL_OAF_RULE!$INTLTOOL_OAF_RULE$ac_delim +-INTLTOOL_PONG_RULE!$INTLTOOL_PONG_RULE$ac_delim +-INTLTOOL_SERVER_RULE!$INTLTOOL_SERVER_RULE$ac_delim +-INTLTOOL_SHEET_RULE!$INTLTOOL_SHEET_RULE$ac_delim +-INTLTOOL_SOUNDLIST_RULE!$INTLTOOL_SOUNDLIST_RULE$ac_delim +-INTLTOOL_UI_RULE!$INTLTOOL_UI_RULE$ac_delim +-INTLTOOL_XAM_RULE!$INTLTOOL_XAM_RULE$ac_delim +-INTLTOOL_KBD_RULE!$INTLTOOL_KBD_RULE$ac_delim +-INTLTOOL_XML_RULE!$INTLTOOL_XML_RULE$ac_delim +-INTLTOOL_XML_NOMERGE_RULE!$INTLTOOL_XML_NOMERGE_RULE$ac_delim +-INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE$ac_delim +-INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim +-INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim +-INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim +-INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim +-XGETTEXT!$XGETTEXT$ac_delim +-MSGMERGE!$MSGMERGE$ac_delim +-MSGFMT!$MSGFMT$ac_delim +-INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim +-INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim +-INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim +-INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim +-ALL_LINGUAS!$ALL_LINGUAS$ac_delim +-DATADIRNAME!$DATADIRNAME$ac_delim +-WARN_CFLAGS!$WARN_CFLAGS$ac_delim +-PKG_CONFIG!$PKG_CONFIG$ac_delim +-HELP_DIR!$HELP_DIR$ac_delim +-OMF_DIR!$OMF_DIR$ac_delim +-DOC_USER_FORMATS!$DOC_USER_FORMATS$ac_delim +-ENABLE_SK_TRUE!$ENABLE_SK_TRUE$ac_delim +-ENABLE_SK_FALSE!$ENABLE_SK_FALSE$ac_delim +-DISTCHECK_CONFIGURE_FLAGS!$DISTCHECK_CONFIGURE_FLAGS$ac_delim +-HAVE_GNOME_DOC_UTILS_TRUE!$HAVE_GNOME_DOC_UTILS_TRUE$ac_delim +-HAVE_GNOME_DOC_UTILS_FALSE!$HAVE_GNOME_DOC_UTILS_FALSE$ac_delim +-GLIB_GENMARSHAL!$GLIB_GENMARSHAL$ac_delim +-GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim +-USE_NLS!$USE_NLS$ac_delim +-MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim +-GMSGFMT!$GMSGFMT$ac_delim +-CATALOGS!$CATALOGS$ac_delim +-CATOBJEXT!$CATOBJEXT$ac_delim +-GMOFILES!$GMOFILES$ac_delim +-INSTOBJEXT!$INSTOBJEXT$ac_delim +-INTLLIBS!$INTLLIBS$ac_delim +-PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim +-PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim +-POFILES!$POFILES$ac_delim +-POSUB!$POSUB$ac_delim +-MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim +-GLIB_REQUIRED!$GLIB_REQUIRED$ac_delim +-GTK_REQUIRED!$GTK_REQUIRED$ac_delim +-GDK_REQUIRED!$GDK_REQUIRED$ac_delim +-LIBGNOME_REQUIRED!$LIBGNOME_REQUIRED$ac_delim +-LIBGNOMEUI_REQUIRED!$LIBGNOMEUI_REQUIRED$ac_delim +-HAL_REQUIRED!$HAL_REQUIRED$ac_delim +-DBUS_REQUIRED!$DBUS_REQUIRED$ac_delim +-LIBGLADE_REQUIRED!$LIBGLADE_REQUIRED$ac_delim +-LIBNOTIFY_REQUIRED!$LIBNOTIFY_REQUIRED$ac_delim +-LIBWNCK_REQUIRED!$LIBWNCK_REQUIRED$ac_delim +-CAIRO_REQUIRED!$CAIRO_REQUIRED$ac_delim +-UNIQUE_REQUIRED!$UNIQUE_REQUIRED$ac_delim +-LIBPANEL_REQUIRED!$LIBPANEL_REQUIRED$ac_delim +-GSTREAMER_REQUIRED!$GSTREAMER_REQUIRED$ac_delim +-XRANDR_REQUIRED!$XRANDR_REQUIRED$ac_delim +-POLKIT_GNOME_REQUIRED!$POLKIT_GNOME_REQUIRED$ac_delim +-GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim +-GLIB_LIBS!$GLIB_LIBS$ac_delim +-HAL_CFLAGS!$HAL_CFLAGS$ac_delim +-HAL_LIBS!$HAL_LIBS$ac_delim +-GSTREAMER_CFLAGS!$GSTREAMER_CFLAGS$ac_delim +-GSTREAMER_LIBS!$GSTREAMER_LIBS$ac_delim +-DBUS_CFLAGS!$DBUS_CFLAGS$ac_delim +-DBUS_LIBS!$DBUS_LIBS$ac_delim +-GNOME_CFLAGS!$GNOME_CFLAGS$ac_delim +-GNOME_LIBS!$GNOME_LIBS$ac_delim +-GDK_CFLAGS!$GDK_CFLAGS$ac_delim +-GDK_LIBS!$GDK_LIBS$ac_delim +-XRANDR_CFLAGS!$XRANDR_CFLAGS$ac_delim +-XRANDR_LIBS!$XRANDR_LIBS$ac_delim +-GCONFTOOL!$GCONFTOOL$ac_delim +-GCONF_SCHEMA_CONFIG_SOURCE!$GCONF_SCHEMA_CONFIG_SOURCE$ac_delim +-GCONF_SCHEMA_FILE_DIR!$GCONF_SCHEMA_FILE_DIR$ac_delim +-GCONF_SCHEMAS_INSTALL_TRUE!$GCONF_SCHEMAS_INSTALL_TRUE$ac_delim +-GCONF_SCHEMAS_INSTALL_FALSE!$GCONF_SCHEMAS_INSTALL_FALSE$ac_delim +-XMKMF!$XMKMF$ac_delim +-X_CFLAGS!$X_CFLAGS$ac_delim +-X_PRE_LIBS!$X_PRE_LIBS$ac_delim +-X_LIBS!$X_LIBS$ac_delim +-_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; }; } + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then ++ 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 +- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} ++ { { $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; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi + done ++rm -f conf$$subs.sh + +-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +-if test -n "$ac_eof"; then +- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` +- ac_eof=`expr $ac_eof + 1` +-fi +- +-cat >>$CONFIG_STATUS <<_ACEOF +-cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof +-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +-_ACEOF +-sed ' +-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +-s/^/s,@/; s/!/@,|#_!!_#|/ +-:n +-t n +-s/'"$ac_delim"'$/,g/; t +-s/$/\\/; p +-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +-' >>$CONFIG_STATUS <conf$$subs.sed +-rm -f conf$$subs.sed +-cat >>$CONFIG_STATUS <<_ACEOF +-CEOF$ac_eof ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++cat >>"\$tmp/subs1.awk" <<\\_ACAWK && + _ACEOF ++sed -n ' ++h ++s/^/S["/; s/!.*/"]=/ ++p ++g ++s/^[^!]*!// ++:repl ++t repl ++s/'"$ac_delim"'$// ++t delim ++:nl ++h ++s/\(.\{148\}\).*/\1/ ++t more1 ++s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ ++p ++n ++b repl ++:more1 ++s/["\\]/\\&/g; s/^/"/; s/$/"\\/ ++p ++g ++s/.\{148\}// ++t nl ++:delim ++h ++s/\(.\{148\}\).*/\1/ ++t more2 ++s/["\\]/\\&/g; s/^/"/; s/$/"/ ++p ++b ++:more2 ++s/["\\]/\\&/g; s/^/"/; s/$/"\\/ ++p ++g ++s/.\{148\}// ++t delim ++' <conf$$subs.awk | sed ' ++/^[^""]/{ ++ N ++ s/\n// ++} ++' >>$CONFIG_STATUS || ac_write_fail=1 ++rm -f conf$$subs.awk ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++_ACAWK ++cat >>"\$tmp/subs1.awk" <<_ACAWK && ++ for (key in S) S_is_set[key] = 1 ++ FS = "" ++ ++} ++{ ++ line = $ 0 ++ nfields = split(line, field, "@") ++ substed = 0 ++ len = length(field[1]) ++ for (i = 2; i < nfields; i++) { ++ key = field[i] ++ keylen = length(key) ++ if (S_is_set[key]) { ++ value = S[key] ++ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) ++ len += length(value) + length(field[++i]) ++ substed = 1 ++ } else ++ len += 1 + keylen ++ } + ++ print line ++} + +-ac_delim='%!_!# ' +-for ac_last_try in false false false false false :; do +- cat >conf$$subs.sed <<_ACEOF +-X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim +-SYSCONFDIR!$SYSCONFDIR$ac_delim +-DATADIR!$DATADIR$ac_delim +-BINDIR!$BINDIR$ac_delim +-SBINDIR!$SBINDIR$ac_delim +-DOCDIR!$DOCDIR$ac_delim +-POLKIT_CFLAGS!$POLKIT_CFLAGS$ac_delim +-POLKIT_LIBS!$POLKIT_LIBS$ac_delim +-HAVE_TESTS_TRUE!$HAVE_TESTS_TRUE$ac_delim +-HAVE_TESTS_FALSE!$HAVE_TESTS_FALSE$ac_delim +-POLKIT_GNOME_CFLAGS!$POLKIT_GNOME_CFLAGS$ac_delim +-POLKIT_GNOME_LIBS!$POLKIT_GNOME_LIBS$ac_delim +-HAVE_GCONF_DEFAULTS_TRUE!$HAVE_GCONF_DEFAULTS_TRUE$ac_delim +-HAVE_GCONF_DEFAULTS_FALSE!$HAVE_GCONF_DEFAULTS_FALSE$ac_delim +-HAVE_APPLETS_TRUE!$HAVE_APPLETS_TRUE$ac_delim +-HAVE_APPLETS_FALSE!$HAVE_APPLETS_FALSE$ac_delim +-XMLTO!$XMLTO$ac_delim +-DOCBOOK_DOCS_ENABLED_TRUE!$DOCBOOK_DOCS_ENABLED_TRUE$ac_delim +-DOCBOOK_DOCS_ENABLED_FALSE!$DOCBOOK_DOCS_ENABLED_FALSE$ac_delim +-DBUS_SERVICES_DIR!$DBUS_SERVICES_DIR$ac_delim +-LIBNOTIFY_CFLAGS!$LIBNOTIFY_CFLAGS$ac_delim +-LIBNOTIFY_LIBS!$LIBNOTIFY_LIBS$ac_delim +-HAVE_LIBNOTIFY_TRUE!$HAVE_LIBNOTIFY_TRUE$ac_delim +-HAVE_LIBNOTIFY_FALSE!$HAVE_LIBNOTIFY_FALSE$ac_delim +-UNIQUE_CFLAGS!$UNIQUE_CFLAGS$ac_delim +-UNIQUE_LIBS!$UNIQUE_LIBS$ac_delim +-HAVE_UNIQUE_TRUE!$HAVE_UNIQUE_TRUE$ac_delim +-HAVE_UNIQUE_FALSE!$HAVE_UNIQUE_FALSE$ac_delim +-GPM_EXTRA_LIBS!$GPM_EXTRA_LIBS$ac_delim +-DOCBOOK2MAN!$DOCBOOK2MAN$ac_delim +-HAVE_DOCBOOK2MAN_TRUE!$HAVE_DOCBOOK2MAN_TRUE$ac_delim +-HAVE_DOCBOOK2MAN_FALSE!$HAVE_DOCBOOK2MAN_FALSE$ac_delim +-LIBOBJS!$LIBOBJS$ac_delim +-LTLIBOBJS!$LTLIBOBJS$ac_delim ++_ACAWK + _ACEOF +- +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 34; then +- break +- elif $ac_last_try; then +- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then ++ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" ++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; }; } +- else +- ac_delim="$ac_delim!$ac_delim _$ac_delim!! " +- fi +-done +- +-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +-if test -n "$ac_eof"; then +- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` +- ac_eof=`expr $ac_eof + 1` +-fi +- +-cat >>$CONFIG_STATUS <<_ACEOF +-cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof +-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end +-_ACEOF +-sed ' +-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +-s/^/s,@/; s/!/@,|#_!!_#|/ +-:n +-t n +-s/'"$ac_delim"'$/,g/; t +-s/$/\\/; p +-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +-' >>$CONFIG_STATUS <conf$$subs.sed +-rm -f conf$$subs.sed +-cat >>$CONFIG_STATUS <<_ACEOF +-:end +-s/|#_!!_#|//g +-CEOF$ac_eof + _ACEOF + +- + # VPATH may cause trouble with some makes, so we remove $(srcdir), + # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and + # trailing colons and then remove the whole line if VPATH becomes empty +@@ -26955,19 +27126,133 @@ + }' + fi + +-cat >>$CONFIG_STATUS <<\_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + fi # test -n "$CONFIG_FILES" + ++# Set up the scripts for CONFIG_HEADERS section. ++# No need to generate them if there are no CONFIG_HEADERS. ++# This happens for instance with `./config.status Makefile'. ++if test -n "$CONFIG_HEADERS"; then ++cat >"$tmp/defines.awk" <<\_ACAWK || ++BEGIN { ++_ACEOF ++ ++# Transform confdefs.h into an awk script `defines.awk', embedded as ++# here-document in config.status, that substitutes the proper values into ++# config.h.in to produce config.h. ++ ++# Create a delimiter string that does not exist in confdefs.h, to ease ++# handling of long lines. ++ac_delim='%!_!# ' ++for ac_last_try in false false :; do ++ ac_t=`sed -n "/$ac_delim/p" confdefs.h` ++ 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; }; } ++ else ++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " ++ fi ++done ++ ++# For the awk script, D is an array of macro values keyed by name, ++# likewise P contains macro parameters if any. Preserve backslash ++# newline sequences. ++ ++ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* ++sed -n ' ++s/.\{148\}/&'"$ac_delim"'/g ++t rset ++:rset ++s/^[ ]*#[ ]*define[ ][ ]*/ / ++t def ++d ++:def ++s/\\$// ++t bsnl ++s/["\\]/\\&/g ++s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ ++D["\1"]=" \3"/p ++s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p ++d ++:bsnl ++s/["\\]/\\&/g ++s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ ++D["\1"]=" \3\\\\\\n"\\/p ++t cont ++s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p ++t cont ++d ++:cont ++n ++s/.\{148\}/&'"$ac_delim"'/g ++t clear ++:clear ++s/\\$// ++t bsnlc ++s/["\\]/\\&/g; s/^/"/; s/$/"/p ++d ++:bsnlc ++s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p ++b cont ++' <confdefs.h | sed ' ++s/'"$ac_delim"'/"\\\ ++"/g' >>$CONFIG_STATUS || ac_write_fail=1 ++ ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ for (key in D) D_is_set[key] = 1 ++ FS = "" ++} ++/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { ++ line = \$ 0 ++ split(line, arg, " ") ++ if (arg[1] == "#") { ++ defundef = arg[2] ++ mac1 = arg[3] ++ } else { ++ defundef = substr(arg[1], 2) ++ mac1 = arg[2] ++ } ++ split(mac1, mac2, "(") #) ++ macro = mac2[1] ++ prefix = substr(line, 1, index(line, defundef) - 1) ++ if (D_is_set[macro]) { ++ # Preserve the white space surrounding the "#". ++ print prefix "define", macro P[macro] D[macro] ++ next ++ } else { ++ # Replace #undef with comments. This is necessary, for example, ++ # in the case of _POSIX_SOURCE, which is predefined and required ++ # on some systems where configure will not decide to define it. ++ if (defundef == "undef") { ++ print "/*", prefix defundef, macro, "*/" ++ next ++ } ++ } ++} ++{ print } ++_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; }; } ++fi # test -n "$CONFIG_HEADERS" ++ + +-for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS ++eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" ++shift ++for ac_tag + do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; +- :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 +-echo "$as_me: error: Invalid tag $ac_tag." >&2;} ++ :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; }; };; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; +@@ -26996,26 +27281,38 @@ + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || +- { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +-echo "$as_me: error: cannot find input file: $ac_f" >&2;} ++ { { $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; }; };; + esac +- ac_file_inputs="$ac_file_inputs $ac_f" ++ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac ++ ac_file_inputs="$ac_file_inputs '$ac_f'" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ +- configure_input="Generated from "`IFS=: +- echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." ++ configure_input='Generated from '` ++ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' ++ `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" +- { echo "$as_me:$LINENO: creating $ac_file" >&5 +-echo "$as_me: creating $ac_file" >&6;} ++ { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 ++$as_echo "$as_me: creating $ac_file" >&6;} + fi ++ # Neutralize special characters interpreted by sed in replacement strings. ++ case $configure_input in #( ++ *\&* | *\|* | *\\* ) ++ ac_sed_conf_input=`$as_echo "$configure_input" | ++ sed 's/[\\\\&|]/\\\\&/g'`;; #( ++ *) ac_sed_conf_input=$configure_input;; ++ esac + + case $ac_tag in +- *:-:* | *:-) cat >"$tmp/stdin";; ++ *:-:* | *:-) 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; }; } ;; + esac + ;; + esac +@@ -27025,7 +27322,7 @@ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +-echo X"$ac_file" | ++$as_echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -27051,7 +27348,7 @@ + as_dirs= + while :; do + case $as_dir in #( +- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( ++ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" +@@ -27060,7 +27357,7 @@ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +-echo X"$as_dir" | ++$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -27081,17 +27378,17 @@ + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +-echo "$as_me: error: cannot create directory $as_dir" >&2;} ++ } || 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; }; }; } + ac_builddir=. + + case "$ac_dir" in + .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) +- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` ++ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. +- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` ++ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; +@@ -27136,12 +27433,13 @@ + esac + _ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + # 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= + +-case `sed -n '/datarootdir/ { ++ac_sed_dataroot=' ++/datarootdir/ { + p + q + } +@@ -27150,13 +27448,14 @@ + /@infodir@/p + /@localedir@/p + /@mandir@/p +-' $ac_file_inputs` in ++' ++case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in + *datarootdir*) ac_datarootdir_seen=yes;; + *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) +- { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} ++ { $as_echo "$as_me:$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 ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g +@@ -27170,15 +27469,16 @@ + # Neutralize VPATH when `$srcdir' = `.'. + # Shell code in configure.ac might set extrasub. + # FIXME: do we really want to maintain this feature? +-cat >>$CONFIG_STATUS <<_ACEOF +- sed "$ac_vpsub ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ac_sed_extra="$ac_vpsub + $extrasub + _ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + :t + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b +-s&@configure_input@&$configure_input&;t t ++s|@configure_input@|$ac_sed_conf_input|;t t + s&@top_builddir@&$ac_top_builddir_sub&;t t ++s&@top_build_prefix@&$ac_top_build_prefix&;t t + s&@srcdir@&$ac_srcdir&;t t + s&@abs_srcdir@&$ac_abs_srcdir&;t t + s&@top_srcdir@&$ac_top_srcdir&;t t +@@ -27189,121 +27489,60 @@ + s&@INSTALL@&$ac_INSTALL&;t t + s&@MKDIR_P@&$ac_MKDIR_P&;t t + $ac_datarootdir_hack +-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out ++" ++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; }; } + + 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"; } && +- { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' + which seems to be undefined. Please make sure it is defined." >&5 +-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++$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;} + + rm -f "$tmp/stdin" + case $ac_file in +- -) cat "$tmp/out"; rm -f "$tmp/out";; +- *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; +- esac ++ -) 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; }; } + ;; + :H) + # + # CONFIG_HEADER + # +-_ACEOF +- +-# Transform confdefs.h into a sed script `conftest.defines', that +-# substitutes the proper values into config.h.in to produce config.h. +-rm -f conftest.defines conftest.tail +-# First, append a space to every undef/define line, to ease matching. +-echo 's/$/ /' >conftest.defines +-# Then, protect against being on the right side of a sed subst, or in +-# an unquoted here document, in config.status. If some macros were +-# called several times there might be several #defines for the same +-# symbol, which is useless. But do not sort them, since the last +-# AC_DEFINE must be honored. +-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where +-# NAME is the cpp macro being defined, VALUE is the value it is being given. +-# PARAMS is the parameter list in the macro definition--in most cases, it's +-# just an empty string. +-ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' +-ac_dB='\\)[ (].*,\\1define\\2' +-ac_dC=' ' +-ac_dD=' ,' +- +-uniq confdefs.h | +- sed -n ' +- t rset +- :rset +- s/^[ ]*#[ ]*define[ ][ ]*// +- t ok +- d +- :ok +- s/[\\&,]/\\&/g +- s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p +- s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p +- ' >>conftest.defines +- +-# Remove the space that was appended to ease matching. +-# Then replace #undef with comments. This is necessary, for +-# example, in the case of _POSIX_SOURCE, which is predefined and required +-# on some systems where configure will not decide to define it. +-# (The regexp can be short, since the line contains either #define or #undef.) +-echo 's/ $// +-s,^[ #]*u.*,/* & */,' >>conftest.defines +- +-# Break up conftest.defines: +-ac_max_sed_lines=50 +- +-# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" +-# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" +-# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" +-# et cetera. +-ac_in='$ac_file_inputs' +-ac_out='"$tmp/out1"' +-ac_nxt='"$tmp/out2"' +- +-while : +-do +- # Write a here document: +- cat >>$CONFIG_STATUS <<_ACEOF +- # First, check the format of the line: +- cat >"\$tmp/defines.sed" <<\\CEOF +-/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def +-/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def +-b +-:def +-_ACEOF +- sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS +- echo 'CEOF +- sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS +- ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in +- sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail +- grep . conftest.tail >/dev/null || break +- rm -f conftest.defines +- mv conftest.tail conftest.defines +-done +-rm -f conftest.defines conftest.tail +- +-echo "ac_result=$ac_in" >>$CONFIG_STATUS +-cat >>$CONFIG_STATUS <<\_ACEOF + if test x"$ac_file" != x-; then +- echo "/* $configure_input */" >"$tmp/config.h" +- cat "$ac_result" >>"$tmp/config.h" +- if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then +- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 +-echo "$as_me: $ac_file is unchanged" >&6;} ++ { ++ $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; }; } ++ 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: $ac_file is unchanged" >&6;} + else +- rm -f $ac_file +- mv "$tmp/config.h" $ac_file ++ 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; }; } + fi + else +- echo "/* $configure_input */" +- cat "$ac_result" ++ $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; }; } + fi +- rm -f "$tmp/out12" +-# Compute $ac_file's index in $config_headers. +-_am_arg=$ac_file ++# Compute "$ac_file"'s index in $config_headers. ++_am_arg="$ac_file" + _am_stamp_count=1 + for _am_header in $config_headers :; do + case $_am_header in +@@ -27318,7 +27557,7 @@ + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +-echo X"$_am_arg" | ++$as_echo X"$_am_arg" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -27338,8 +27577,8 @@ + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; + +- :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 +-echo "$as_me: executing $ac_file commands" >&6;} ++ :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 ++$as_echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac + +@@ -27361,7 +27600,7 @@ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| . 2>/dev/null || +-echo X"$mf" | ++$as_echo X"$mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -27405,7 +27644,7 @@ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| . 2>/dev/null || +-echo X"$file" | ++$as_echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -27431,7 +27670,7 @@ + as_dirs= + while :; do + case $as_dir in #( +- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( ++ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" +@@ -27440,7 +27679,7 @@ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +-echo X"$as_dir" | ++$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -27461,8 +27700,8 @@ + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +-echo "$as_me: error: cannot create directory $as_dir" >&2;} ++ } || 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; }; }; } + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" +@@ -27499,8 +27738,8 @@ + "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES" + + if test ! -f "po/Makefile"; then +- { { echo "$as_me:$LINENO: error: po/Makefile is not ready." >&5 +-echo "$as_me: error: po/Makefile is not ready." >&2;} ++ { { $as_echo "$as_me:$LINENO: error: po/Makefile is not ready." >&5 ++$as_echo "$as_me: error: po/Makefile is not ready." >&2;} + { (exit 1); exit 1; }; } + fi + mv "po/Makefile" "po/Makefile.tmp" +@@ -27522,6 +27761,11 @@ + 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; }; } ++ + + # configure is writing to config.log, and then calls config.status. + # config.status does its own redirection, appending to config.log. +@@ -27543,6 +27787,10 @@ + # would make configure fail if this is the last instruction. + $ac_cs_success || { (exit 1); exit 1; } + 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: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} ++fi + + + echo " +--- gnome-power-manager-2.24.0old/src/gpm-prefs-core.c 2008-09-04 12:05:15.000000000 +0200 ++++ gnome-power-manager-2.24.0/src/gpm-prefs-core.c 2008-10-02 14:56:41.000000000 +0200 +@@ -45,9 +45,7 @@ + #include "gpm-screensaver.h" + #include "gpm-prefs-server.h" + +-#ifdef HAVE_GCONF_DEFAULTS +-#include <polkit-gnome/polkit-gnome.h> +-#endif ++ + + static void gpm_prefs_class_init (GpmPrefsClass *klass); + static void gpm_prefs_init (GpmPrefs *prefs); +@@ -69,9 +67,7 @@ + gboolean can_hibernate; + GpmConf *conf; + GpmScreensaver *screensaver; +-#ifdef HAVE_GCONF_DEFAULTS +- PolKitGnomeAction *default_action; +-#endif ++ + }; + + enum { +@@ -965,95 +961,7 @@ + } + } + +-#ifdef HAVE_GCONF_DEFAULTS +-/** +- * pk_prefs_set_defaults_cb: +- **/ +-static void +-pk_prefs_set_defaults_cb (PolKitGnomeAction *default_action, GpmPrefs *prefs) +-{ +- DBusGProxy *proxy; +- DBusGConnection *connection; +- GError *error; +- gchar *keys[5] = { +- "/apps/gnome-power-manager/actions", +- "/apps/gnome-power-manager/ui", +- "/apps/gnome-power-manager/buttons", +- "/apps/gnome-power-manager/backlight", +- "/apps/gnome-power-manager/timeout" +- }; +- +- error = NULL; +- connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error); +- if (error != NULL) { +- g_warning ("failed to get system bus connection: %s", error->message); +- g_error_free (error); +- return; +- } +- +- proxy = dbus_g_proxy_new_for_name (connection, +- "org.gnome.GConf.Defaults", +- "/", +- "org.gnome.GConf.Defaults"); +- if (proxy == NULL) { +- g_warning ("Cannot connect to defaults mechanism"); +- return; +- } + +- GConfClient *client; +- client = gconf_client_get_default (); +- gconf_client_suggest_sync (client, NULL); +- g_object_unref (client); +- dbus_g_proxy_call (proxy, "SetSystem", &error, +- G_TYPE_STRV, keys, +- G_TYPE_STRV, NULL, +- G_TYPE_INVALID, G_TYPE_INVALID); +- +- g_object_unref (proxy); +-} +- +-/** +- * gpk_prefs_create_custom_widget: +- **/ +-static GtkWidget * +-gpk_prefs_create_custom_widget (GladeXML *xml, gchar *func_name, gchar *name, +- gchar *string1, gchar *string2, +- gint int1, gint int2, gpointer user_data) +-{ +- GpmPrefs *prefs = GPM_PREFS (user_data); +- if (strcmp (name, "button_default") == 0) { +- return polkit_gnome_action_create_button (prefs->priv->default_action); +- } +- egg_warning ("name unknown=%s", name); +- return NULL; +-} +- +-/** +- * gpk_prefs_setup_policykit: +- * +- * We have to do this before the glade stuff if done as the custom handler needs the actions setup +- **/ +-static void +-gpk_prefs_setup_policykit (GpmPrefs *prefs) +-{ +- PolKitAction *pk_action; +- +- g_return_if_fail (GPM_IS_PREFS (prefs)); +- +- /* set default */ +- pk_action = polkit_action_new (); +- polkit_action_set_action_id (pk_action, "org.freedesktop.packagekit.set-defaults"); +- prefs->priv->default_action = polkit_gnome_action_new_default ("set-defaults", pk_action, +- _("Make Default"), NULL); +- g_object_set (prefs->priv->default_action, +- "no-icon-name", GTK_STOCK_FLOPPY, +- "auth-icon-name", GTK_STOCK_FLOPPY, +- "yes-icon-name", GTK_STOCK_FLOPPY, +- "self-blocked-icon-name", GTK_STOCK_FLOPPY, +- NULL); +- polkit_action_unref (pk_action); +-} +-#endif + + /** + * gpm_prefs_init: +@@ -1088,13 +996,7 @@ + prefs->priv->can_hibernate = gpm_dbus_method_bool ("CanHibernate"); + egg_debug ("caps=%i", caps); + +-#ifdef HAVE_GCONF_DEFAULTS +- /* use custom widgets */ +- glade_set_custom_handler (gpk_prefs_create_custom_widget, prefs); +- +- /* we have to do this before we connect up the glade file */ +- gpk_prefs_setup_policykit (prefs); +-#endif ++ + + prefs->priv->glade_xml = glade_xml_new (GPM_DATA "/gpm-prefs.glade", NULL, NULL); + if (prefs->priv->glade_xml == NULL) { +@@ -1120,10 +1022,7 @@ + g_signal_connect (widget, "clicked", + G_CALLBACK (gpm_prefs_help_cb), prefs); + +-#ifdef HAVE_GCONF_DEFAULTS +- g_signal_connect (prefs->priv->default_action, "activate", +- G_CALLBACK (pk_prefs_set_defaults_cb), prefs); +-#endif ++ + + prefs_setup_ac (prefs); + prefs_setup_battery (prefs); diff --git a/source/gnome/gnome-power-manager/FrugalBuild b/source/gnome/gnome-power-manager/FrugalBuild index 1d012ac..d9f750a 100644 --- a/source/gnome/gnome-power-manager/FrugalBuild +++ b/source/gnome/gnome-power-manager/FrugalBuild @@ -3,12 +3,12 @@ # Former Maintainer: AlexExtreme <alex@alex-smith.me.uk> pkgname=gnome-power-manager -pkgver=2.22.1 +pkgver=2.24.0 pkgrel=1 pkgdesc="GNOME Power Management tool" url="http://www.gnome.org/" -depends=('libnotify>=0.4.4' 'hal>=0.5.8.1' 'dbus-glib>=0.71' 'xextproto' 'libgnomeui>=2.22.0' 'libgnome>=2.22.0' \ - 'libglade' 'libwnck>=2.22.0' 'gnome-panel>=2.22.0' 'gnome-keyring>=2.22.0' 'gstreamer') +depends=('libnotify>=0.4.4' 'hal>=0.5.8.1' 'dbus-glib>=0.71' 'xextproto' 'libgnomeui>=2.24.0' 'libgnome>=2.24.0' \ + 'libglade' 'libwnck>=2.24.0' 'gnome-panel>=2.24.0' 'gnome-keyring>=2.24.0' 'gstreamer') makedepends=('intltool' 'gnome-doc-utils') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') @@ -17,10 +17,11 @@ _F_gnome_scrollkeeper=y _F_gnome_desktop=y _F_gnome_iconcache=y Finclude gnome gnome-scriptlet -source=(${source[@]} $pkgname-2.15.90-disable_hibernate.patch strip_help_creation.patch) +source=(${source[@]} $pkgname-2.15.90-disable_hibernate.patch Fix_disablepam.diff DisableHelp.diff) Fconfopts="$Fconfopts --enable-dpms-ext --enable-libnotify --enable-applets --enable-keyring" -sha1sums=('bba77f4403643f10a26d7abf5a4681cd50ff08d4' \ - '30667680a326889bf25d754945140d4faa6710d2' \ - '5248b2534d6451bad0923726a71136792c5db717') +sha1sums=('07f761097389bab5801bf84910f1bd2fe05fd050' \ + '68c14c8193ddd0f1e817c3d89596c8d415d2d382' \ + 'cef6a51758948f6039c096d9ce59eb3478215d90' \ + '593f233326489bc76b721bcadd117695f040505f') # optimization OK diff --git a/source/gnome/gnome-power-manager/gnome-power-manager-2.15.90-disable_hibernate.patch b/source/gnome/gnome-power-manager/gnome-power-manager-2.15.90-disable_hibernate.patch index fe758db..57266f8 100644 --- a/source/gnome/gnome-power-manager/gnome-power-manager-2.15.90-disable_hibernate.patch +++ b/source/gnome/gnome-power-manager/gnome-power-manager-2.15.90-disable_hibernate.patch @@ -1,8 +1,7 @@ -diff -urN gnome-power-manager-2.15.90.orig/data/gnome-power-manager.schemas.in gnome-power-manager-2.15.90/data/gnome-power-manager.schemas.in ---- gnome-power-manager-2.15.90.orig/data/gnome-power-manager.schemas.in 2006-07-08 10:25:14.000000000 +0100 -+++ gnome-power-manager-2.15.90/data/gnome-power-manager.schemas.in 2006-07-28 11:05:36.000000000 +0100 -@@ -185,7 +185,7 @@ - <applyto>/apps/gnome-power-manager/can_hibernate</applyto> +--- gnome-power-manager-2.24.0old/data/gnome-power-manager.schemas.in 2008-09-04 12:05:18.000000000 +0200 ++++ gnome-power-manager-2.24.0/data/gnome-power-manager.schemas.in 2008-10-02 15:05:09.000000000 +0200 +@@ -411,7 +411,7 @@ + <applyto>/apps/gnome-power-manager/general/can_hibernate</applyto> <owner>gnome-power-manager</owner> <type>bool</type> - <default>true</default> From bouleetbil at frogdev.info Fri Oct 10 15:25:35 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:39 2008 Subject: [Frugalware-git] frugalware-current: gnome-screensaver-2.24.0-1-i686 Message-ID: <20081010132535.EACAC11901B9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9ba5ad9f113775302d0e388fa7a555ecc70c3c5c commit 9ba5ad9f113775302d0e388fa7a555ecc70c3c5c Author: bouleetbil <bouleetbil@frogdev.info> Date: Thu Oct 2 23:23:52 2008 +0200 gnome-screensaver-2.24.0-1-i686 *version bump diff --git a/source/gnome/gnome-screensaver/FrugalBuild b/source/gnome/gnome-screensaver/FrugalBuild index 6479558..951a3b3 100644 --- a/source/gnome/gnome-screensaver/FrugalBuild +++ b/source/gnome/gnome-screensaver/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=gnome-screensaver -pkgver=2.22.2 +pkgver=2.24.0 pkgrel=1 pkgdesc="GNOME screen saver and locker" url="http://live.gnome.org/GnomeScreensaver" -depends=('libgnomeui>=2.22.0' 'dbus-glib>=0.71' 'gnome-menus>=2.22.0' 'gdm>=2.20.5' 'libgnomekbd>=2.22.0' \ - 'libxscrnsaver' 'shadow' 'xscreensaver-data' 'libbonobo' 'gnome-vfs>=2.22.0') +depends=('libgnomeui>=2.24.0' 'dbus-glib>=0.71' 'gnome-menus>=2.24.0' 'gdm>=2.20.5' 'libgnomekbd>=2.24.0' \ + 'libxscrnsaver' 'shadow' 'xscreensaver-data' 'libbonobo' 'gnome-vfs>=2.24.0') makedepends=('intltool' 'scrnsaverproto') groups=('gnome' 'gnome-minimal') archs=('x86_64' 'i686' 'ppc') @@ -17,7 +17,7 @@ _F_gnome_desktop="y" _F_gnome_scrollkeeper="y" _F_gnome_mime="y" source=(${source[@]} http://frugalware.org/images/logo-new-big.png frugal-floaters.desktop $pkgname $pkgname-2.17.7-frugal-screensaver.patch) -sha1sums=('473b00fc6306742ada4e89520c991c31d1f79984' \ +sha1sums=('ed7871c8a004801717e6a7897b07b80386256ce8' \ '52ad3cef2d4d0b51eb9565316a9f4c688657dc54' \ 'a4913a96ccfd029620da03fbfbcaab8b6d42330c' \ '833bd26acc4bbf6486c696f9f700b449e1a91990' \ From bouleetbil at frogdev.info Fri Oct 10 15:25:36 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:41 2008 Subject: [Frugalware-git] frugalware-current: banshee-1.2.1-2-i686 Message-ID: <20081010132536.75E5F1190214@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=72e23359dfb15793bc7cb92f167490b38430279c commit 72e23359dfb15793bc7cb92f167490b38430279c Author: bouleetbil <bouleetbil@frogdev.info> Date: Fri Oct 3 17:43:29 2008 +0200 banshee-1.2.1-2-i686 *rebuild with gnome-desktop-sharp>=2.24.0-1 diff --git a/source/gnome-extra/banshee/FrugalBuild b/source/gnome-extra/banshee/FrugalBuild index d320787..aaccaba 100644 --- a/source/gnome-extra/banshee/FrugalBuild +++ b/source/gnome-extra/banshee/FrugalBuild @@ -5,13 +5,14 @@ pkgname=banshee _F_archive_name=$pkgname-1 pkgver=1.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="Banshee is a Mono based media player for Gnome" url="http://banshee-project.org" depends=('gnome-sharp' 'ipod-sharp>=0.8.0' 'sqlite3' 'hal' 'libmusicbrainz' 'brasero' \ 'mono-zeroconf>=0.7.6' 'gst-plugins-base-cdparanoia' 'gst-plugins-base-gnomevfs' \ 'gst-plugins-good-gconf' 'gst-plugins-base-oil' 'podsleuth' 'boo' \ - 'karma-sharp>=0.1.0-4' 'libmtp' 'ndesk-dbus-glib' 'njb-sharp' 'taglib-sharp' 'mono-addins') + 'karma-sharp>=0.1.0-4' 'libmtp' 'ndesk-dbus-glib' 'njb-sharp' 'taglib-sharp' 'mono-addins' \ + 'gnome-desktop-sharp>=2.24.0-1') conflicts=('banshee-official-plugins') provides=('banshee-official-plugins') replaces=('banshee-official-plugins') From bouleetbil at frogdev.info Fri Oct 10 15:25:36 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:43 2008 Subject: [Frugalware-git] frugalware-current: f-spot-0.5.0.1-2-i686 Message-ID: <20081010132536.A6FBA1190211@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=afad93a3ad2fe08fdc9a78e31107f522d8186a5f commit afad93a3ad2fe08fdc9a78e31107f522d8186a5f Author: bouleetbil <bouleetbil@frogdev.info> Date: Fri Oct 3 17:57:51 2008 +0200 f-spot-0.5.0.1-2-i686 *rebuild with gnome-desktop-sharp>=2.24.0-1 diff --git a/source/gnome-extra/f-spot/FrugalBuild b/source/gnome-extra/f-spot/FrugalBuild index 76442f7..779e4a3 100644 --- a/source/gnome-extra/f-spot/FrugalBuild +++ b/source/gnome-extra/f-spot/FrugalBuild @@ -4,10 +4,10 @@ pkgname=f-spot pkgver=0.5.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="A personal photo management program for Gnome" url="http://www.gnome.org/projects/f-spot/" -depends=('gtk2-sharp' 'lcms' 'libexif' 'libgphoto2' 'libjpeg' 'sqlite3' 'ndesk-dbus' 'ndesk-dbus-glib' 'gnome-sharp>=2.16.0-3' 'gnome-desktop-sharp') +depends=('gtk2-sharp' 'lcms' 'libexif' 'libgphoto2' 'libjpeg' 'sqlite3' 'ndesk-dbus' 'ndesk-dbus-glib' 'gnome-sharp>=2.16.0-3' 'gnome-desktop-sharp>=2.24.0-1') makedepends=('gnome-screensaver' 'perl-xml-parser' 'gnome-doc-utils' 'intltool') groups=('gnome-extra') archs=('i686' 'x86_64') From bouleetbil at frogdev.info Fri Oct 10 15:25:36 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:44 2008 Subject: [Frugalware-git] frugalware-current: gnomeartng-0.6.0-2-i686 Message-ID: <20081010132536.CF134119053F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5ac4c614be7582b8b1a4408a6effcccc561c0a67 commit 5ac4c614be7582b8b1a4408a6effcccc561c0a67 Author: bouleetbil <bouleetbil@frogdev.info> Date: Fri Oct 3 18:07:49 2008 +0200 gnomeartng-0.6.0-2-i686 *rebuild with gnome-desktop-sharp>=2.24.0-1 diff --git a/source/gnome-extra/gnomeartng/FrugalBuild b/source/gnome-extra/gnomeartng/FrugalBuild index b9b0d44..d894973 100644 --- a/source/gnome-extra/gnomeartng/FrugalBuild +++ b/source/gnome-extra/gnomeartng/FrugalBuild @@ -3,9 +3,9 @@ pkgname=gnomeartng pkgver=0.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="Manage your Gnome Desktop from arts.gnome.org" -depends=('gnome-sharp') +depends=('gnome-sharp' 'gnome-desktop-sharp>=2.24.0-1') options=('scriptlet') Finclude berlios mono source=($source Fix_GDM.diff) From bouleetbil at frogdev.info Fri Oct 10 15:25:37 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:46 2008 Subject: [Frugalware-git] frugalware-current: gnome-do-0.5.0.1-2-i686 Message-ID: <20081010132537.0BFBD119021B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ecdf11bbb49dd7140c1b4d65a9f919a9344b313e commit ecdf11bbb49dd7140c1b4d65a9f919a9344b313e Author: bouleetbil <bouleetbil@frogdev.info> Date: Fri Oct 3 18:15:19 2008 +0200 gnome-do-0.5.0.1-2-i686 *rebuild with gnome-desktop-sharp>=2.24.0-1 diff --git a/source/gnome-extra/gnome-do/FrugalBuild b/source/gnome-extra/gnome-do/FrugalBuild index de1972a..4195510 100644 --- a/source/gnome-extra/gnome-do/FrugalBuild +++ b/source/gnome-extra/gnome-do/FrugalBuild @@ -3,11 +3,11 @@ pkgname=gnome-do pkgver=0.5.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="A powerful, remote control for GNOME" depends=('gtk+2' 'glibc' 'freetype2' 'libxau' 'libxdmcp' 'libxdamage' \ 'libxext' 'libxml2' 'gnome-sharp' 'ndesk-dbus-glib' 'gnome-keyring-sharp' \ - 'gnome-desktop-sharp' 'mono-addins') + 'gnome-desktop-sharp>=2.24.0-1' 'mono-addins') makedepends=('perl-xml-parser' 'intltool') groups=('gnome-extra') options=('scriptlet') From bouleetbil at frogdev.info Fri Oct 10 15:25:37 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:48 2008 Subject: [Frugalware-git] frugalware-current: gnome-subtitles-0.8-2-i686 Message-ID: <20081010132537.5CBEA11901AE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e207f70b8761399459b0956d3752c456d4dcc218 commit e207f70b8761399459b0956d3752c456d4dcc218 Author: bouleetbil <bouleetbil@frogdev.info> Date: Fri Oct 3 18:31:35 2008 +0200 gnome-subtitles-0.8-2-i686 *rebuild with gnome-desktop-sharp>=2.24.0-1 diff --git a/source/gnome-extra/gnome-subtitles/FrugalBuild b/source/gnome-extra/gnome-subtitles/FrugalBuild index 4c03666..4d230a8 100644 --- a/source/gnome-extra/gnome-subtitles/FrugalBuild +++ b/source/gnome-extra/gnome-subtitles/FrugalBuild @@ -3,11 +3,11 @@ pkgname=gnome-subtitles pkgver=0.8 -pkgrel=1 +pkgrel=2 pkgdesc="Video subtitling for the GNOME desktop" depends=('mono' 'gnome-sharp' 'gstreamer' 'gst-plugins-base' \ 'gst-plugins-base-ogg' 'gst-plugins-base-oil' 'gst-plugins-base-vorbis' \ - 'gtkspell' 'enchant' 'sublib') + 'gtkspell' 'enchant' 'sublib' 'gnome-desktop-sharp>=2.24.0-1') makedepends=('gnome-doc-utils' 'perl-xml-parser') groups=('gnome-extra') archs=('i686') @@ -19,6 +19,13 @@ sha1sums=('14fe9eabf4288fc23072988f4423b5f447642352') build() { Fmonoexport + #Fix launch with new gtk# + Fcd + Fsed "<property name=\"title\">Gnome Subtitles</property>" \ + "<property name=\"title\">Gnome Subtitles</property><property name=\"visible\">True</property>" \ + src/Glade/MainWindow.glade + Fsed "window.Visible = true;" "" src/GnomeSubtitles/Core/GUI.cs + Fbuild Fbuild_gnome_scriptlet Fmonocleanup From bouleetbil at frogdev.info Fri Oct 10 15:25:37 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:51 2008 Subject: [Frugalware-git] frugalware-current: tomboy-0.12.0-2-i686 Message-ID: <20081010132537.974F61190545@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=611c915224665cc163b90128f13746b5b17c2757 commit 611c915224665cc163b90128f13746b5b17c2757 Author: bouleetbil <bouleetbil@frogdev.info> Date: Fri Oct 3 18:44:28 2008 +0200 tomboy-0.12.0-2-i686 *rebuild with gnome-desktop-sharp>=2.24.0-1 diff --git a/source/gnome-extra/tomboy/FrugalBuild b/source/gnome-extra/tomboy/FrugalBuild index b443d7d..77a1c0e 100644 --- a/source/gnome-extra/tomboy/FrugalBuild +++ b/source/gnome-extra/tomboy/FrugalBuild @@ -4,11 +4,11 @@ pkgname=tomboy pkgver=0.12.0 -pkgrel=1 +pkgrel=2 pkgdesc="A Wiki style desktop note-taking application" url="http://www.beatniksoftware.com/tomboy" depends=('gnome-sharp' 'gtkspell' 'gnome-panel>=2.20.0' 'galago-sharp' \ -'gmime>=2.2.10' 'ndesk-dbus' 'ndesk-dbus-glib') +'gmime>=2.2.10' 'ndesk-dbus' 'ndesk-dbus-glib' 'gnome-desktop-sharp>=2.24.0-1') makedepends=('intltool' 'gnome-doc-utils') groups=('gnome-extra') archs=('i686' 'x86_64') @@ -21,6 +21,10 @@ sha1sums=('48cda3ee4aaa108bccd12b141f41dd57fdaaef58') build() { Fmonoexport + #disable print preview "crash" + Fcd + Fsed "#include <libgnomeprintui/gnome-print-job-preview.h>" "" Tomboy/Addins/PrintNotes/gedit-print.c + Fbuild_slice_scrollkeeper Fmake --disable-schemas-install --disable-scrollkeeper --enable-desktop-update=no --enable-dbus=yes Fmakeinstall GCONF_DISABLE_SCHEMA_INSTALL=1 From bouleetbil at frogdev.info Fri Oct 10 15:25:37 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:53 2008 Subject: [Frugalware-git] frugalware-current: monodevelop-1.0-8-i686 Message-ID: <20081010132537.B50021190397@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f19434c006bef7909ad99efc56b0d9cceddcbea0 commit f19434c006bef7909ad99efc56b0d9cceddcbea0 Author: bouleetbil <bouleetbil@frogdev.info> Date: Fri Oct 3 19:06:00 2008 +0200 monodevelop-1.0-8-i686 *rebuild with gnome-sharp>=2.24.0 diff --git a/source/gnome-extra/monodevelop/FrugalBuild b/source/gnome-extra/monodevelop/FrugalBuild index 9d5d8e1..25e4320 100644 --- a/source/gnome-extra/monodevelop/FrugalBuild +++ b/source/gnome-extra/monodevelop/FrugalBuild @@ -3,11 +3,11 @@ pkgname=monodevelop pkgver=1.0 -pkgrel=6 +pkgrel=8 pkgdesc="A project to port SharpDevelop to Gtk#" url="http://www.mono-project.com/" depends=('gecko-sharp' 'gtksourceview-sharp' 'shared-mime-info' \ - 'mono-tools>=1.2.6' 'firefox=3.0.2' 'gnome-sharp' 'mono>=1.2.6' \ + 'mono-tools>=1.2.6' 'firefox=3.0.3' 'gnome-sharp>=2.24.0' 'mono>=1.2.6' \ 'monodoc>=1.2.6' 'mono-addins') makedepends=('intltool' 'perl-xml-parser') groups=('gnome-extra') From bouleetbil at frogdev.info Fri Oct 10 15:25:38 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:54 2008 Subject: [Frugalware-git] frugalware-current: evolution-2.24.0-1-i686 Message-ID: <20081010132538.31D6411901AF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a37e065d9c105fdb0610b16653fa81a155d9aa29 commit a37e065d9c105fdb0610b16653fa81a155d9aa29 Author: bouleetbil <bouleetbil@frogdev.info> Date: Fri Oct 3 22:00:49 2008 +0200 evolution-2.24.0-1-i686 *version bump diff --git a/source/gnome/evolution/FrugalBuild b/source/gnome/evolution/FrugalBuild index f5f8019..9bc2354 100644 --- a/source/gnome/evolution/FrugalBuild +++ b/source/gnome/evolution/FrugalBuild @@ -2,24 +2,26 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=evolution -pkgver=2.22.1.1 -pkgrel=5 +pkgver=2.24.0 +pkgrel=1 pkgdesc="Integrated mail, calendar and address book suite for GNOME" -depends=('gail>=1.20.1' 'gal>=2.5.3-3' 'evolution-data-server>=2.22.1.1' 'gtkhtml>=3.18.0' \ +depends=('gail>=1.20.1' 'gal>=2.5.3-3' 'evolution-data-server>=2.24.0' 'gtkhtml>=3.24.0' \ 'gnome-spell>=1.0.8' 'rarian' 'heimdal>=1.2.1' \ - 'evolution-data-server-ldap>=2.22.1.1' 'libbonobo>=2.22.0' 'nss>=3.12' 'nspr>=4.7.1' \ + 'evolution-data-server-ldap>=2.24.0' 'libbonobo>=2.24.0' 'nss>=3.12' 'nspr>=4.7.1' \ 'libnotify' 'gnome-pilot-conduits' 'db>=4.7.25') -makedepends=('intltool' 'gnome-doc-utils>=0.10.3' 'openldap' 'psmisc' 'gnome-common') +makedepends=('intltool' 'gnome-doc-utils>=0.14.0' 'openldap' 'psmisc' 'gnome-common') groups=('gnome') archs=('i686' 'x86_64' 'ppc') -_F_gnome_schemas=('/etc/gconf/schemas/apps_evolution_addressbook.schemas' - '/etc/gconf/schemas/apps-evolution-attachment-reder.schemas' - '/etc/gconf/schemas/apps_evolution_calendar.schemas' - '/etc/gconf/schemas/apps-evolution-mail-notification.schemas' - '/etc/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas' - '/etc/gconf/schemas/apps_evolution_shell.schemas' - '/etc/gconf/schemas/bogo-junk-plu.schemas' - '/etc/gconf/schemas/evolution-mail.schemas') +_F_gnome_schemas=('/etc/gconf/schemas/apps_evolution_addressbook.schemas' \ + '/etc/gconf/schemas/apps-evolution-attachment-reminder.schemas' \ + '/etc/gconf/schemas/apps_evolution_calendar.schemas' \ + '/etc/gconf/schemas/apps_evolution_email_custom_header.schemas' \ + '/etc/gconf/schemas/apps-evolution-mail-notification.schemas' \ + '/etc/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas' \ + '/etc/gconf/schemas/apps_evolution_shell.schemas' \ + '/etc/gconf/schemas/apps-evolution-template-placeholders.schemas' \ + '/etc/gconf/schemas/bogo-junk-plugin.schemas' \ + '/etc/gconf/schemas/evolution-mail.schemas') _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" @@ -70,6 +72,6 @@ build() { Fbuild_gnome_scriptlet } -sha1sums=('ea058e3b0885246bdf6628c47d807b49f14b4abd' \ +sha1sums=('fbfddbf242955f170a7597edf0ba1f36309f7092' \ '41988b2a14c10156b60a6000efc058c59248b5e2') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:38 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:55 2008 Subject: [Frugalware-git] frugalware-current: evolution-webcal-2.24.0-1-i686 Message-ID: <20081010132538.9041411904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=408a39c3919e4de4f5d0954e701e2865167be80e commit 408a39c3919e4de4f5d0954e701e2865167be80e Author: bouleetbil <bouleetbil@frogdev.info> Date: Fri Oct 3 22:25:35 2008 +0200 evolution-webcal-2.24.0-1-i686 *version bump *change m8r diff --git a/source/gnome-extra/evolution-webcal/FrugalBuild b/source/gnome-extra/evolution-webcal/FrugalBuild index a5813dd..59ad020 100644 --- a/source/gnome-extra/evolution-webcal/FrugalBuild +++ b/source/gnome-extra/evolution-webcal/FrugalBuild @@ -1,17 +1,19 @@ # Compiling time: 0.09 SBU -# Maintainer: AlexExtreme <alex@alex-smith.me.uk> +# Maintainer: bouleetbil <bouleetbil@frogdev.info> +# Contributor: AlexExtreme <alex@alex-smith.me.uk> pkgname=evolution-webcal -pkgver=2.12.0 -pkgrel=2 +pkgver=2.24.0 +pkgrel=1 pkgdesc="Evolution web calendar" url="http://www.gnome.org/projects/evolution/" -depends=('evolution-data-server>=1.12.3' 'libsoup' 'libbonobo>=2.20.3') +depends=('evolution-data-server>=2.24.0' 'libsoup' 'libbonobo>=2.24.0-1') makedepends=('intltool') groups=('gnome-extra') archs=('i686' 'x86_64') _F_gnome_schemas=('/etc/gconf/schemas/evolution-webcal.schemas') Finclude gnome gnome-scriptlet options=('scriptlet' 'genscriptlet') -sha1sums=('8bdb0ea760e6e92aa19be99c33ed0aa3a2607c89') +sha1sums=('0cd859d2d008e5b3c6cc8e83bb1c21f23e90a312') + # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:38 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:56 2008 Subject: [Frugalware-git] frugalware-current: fast-user-switch-applet-2.24.0-1-i686 Message-ID: <20081010132538.64618119021D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=03dc044ff3fd47f182fa2295412d6882769e8f03 commit 03dc044ff3fd47f182fa2295412d6882769e8f03 Author: bouleetbil <bouleetbil@frogdev.info> Date: Fri Oct 3 22:13:01 2008 +0200 fast-user-switch-applet-2.24.0-1-i686 *version bump *change m8r diff --git a/source/gnome/fast-user-switch-applet/FrugalBuild b/source/gnome/fast-user-switch-applet/FrugalBuild index 35503c0..251891a 100644 --- a/source/gnome/fast-user-switch-applet/FrugalBuild +++ b/source/gnome/fast-user-switch-applet/FrugalBuild @@ -1,19 +1,20 @@ # Compiling time: 1.99 SBU -# Maintainer: AlexExtreme <alex@alex-smith.me.uk> +# Maintainer: bouleetbil <bouleetbil@frogdev.info> +# Contributor: AlexExtreme <alex@alex-smith.me.uk> pkgname=fast-user-switch-applet -pkgver=2.22.0 +pkgver=2.24.0 pkgrel=1 pkgdesc="Applet to allow you to switch between users without logging off" url="http://www.gnome.org" -depends=('gnome-panel>=2.22.0' 'gdm>=2.20.5' 'dbus-glib>=0.71-2') +depends=('gnome-panel>=2.24.0' 'gdm>=2.20.5' 'dbus-glib>=0.71-2') makedepends=('intltool' 'gnome-doc-utils') groups=('gnome') archs=('i686' 'x86_64') _F_gnome_schemas=('/etc/gconf/schemas/fast-user-switch-applet.schemas') _F_gnome_scrollkeeper="y" Finclude gnome gnome-scriptlet -sha1sums=('bc7e39edba559be5cb8e18b1aab7bf2554e55941') +sha1sums=('8f3c99fa18b8b0a666964174f832e961bb9b9520') build() { Fbuild_slice_scrollkeeper From bouleetbil at frogdev.info Fri Oct 10 15:25:39 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:57 2008 Subject: [Frugalware-git] frugalware-current: evolution-sharp-0.18.0-1-i686 Message-ID: <20081010132539.0DC0111904CE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=590e0d93ac2836fec829a7c87fed498dcfaa592a commit 590e0d93ac2836fec829a7c87fed498dcfaa592a Author: bouleetbil <bouleetbil@frogdev.info> Date: Fri Oct 3 22:41:32 2008 +0200 evolution-sharp-0.18.0-1-i686 *version bump *change m8r diff --git a/source/gnome-extra/evolution-sharp/FrugalBuild b/source/gnome-extra/evolution-sharp/FrugalBuild index 104684d..86934e9 100644 --- a/source/gnome-extra/evolution-sharp/FrugalBuild +++ b/source/gnome-extra/evolution-sharp/FrugalBuild @@ -1,23 +1,19 @@ # Compiling Time: 0.24 SBU -# Maintainer: AlexExtreme <alex@alex-smith.me.uk> +# Maintainer: bouleetbil <bouleetbil@frogdev.info> +# Contributor: AlexExtreme <alex@alex-smith.me.uk> pkgname=evolution-sharp -pkgver=0.17.3 +pkgver=0.18.0 pkgrel=1 pkgdesc="Mono bindings for evolution." url="http://www.gnome.org" -depends=('gtk2-sharp>=2.12.1' 'atk>=1.22.0' 'libsm' 'evolution>=2.22.1.1' 'gnome-sharp>=2.20.1') +depends=('gtk2-sharp>=2.12.4' 'atk>=1.22.0' 'libsm' 'evolution>=2.24.0' 'gnome-sharp>=2.24.0') makedepends=('pkgconfig') _F_gnome_devel="y" +_F_mono_aot=0 Finclude gnome mono groups=('gnome-extra') archs=('i686' 'x86_64') -sha1sums=('185aceaac89c154cacfdb5354ca0dd74432cf6f9') - -build() { - Fmonoexport - Fbuild - Fmonocleanup -} +sha1sums=('c07880cc5f57944956c753bc63fec5171b4ce815') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:39 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:57 2008 Subject: [Frugalware-git] frugalware-current: evolution-exchange-2.24.0-1-i686 Message-ID: <20081010132539.47C281190926@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6c247247471ddbb69af9620875df4aa4e7d8686b commit 6c247247471ddbb69af9620875df4aa4e7d8686b Author: bouleetbil <bouleetbil@frogdev.info> Date: Fri Oct 3 23:01:01 2008 +0200 evolution-exchange-2.24.0-1-i686 *version bump diff --git a/source/gnome/evolution-exchange/FrugalBuild b/source/gnome/evolution-exchange/FrugalBuild index c9b8e63..0eb23eb 100644 --- a/source/gnome/evolution-exchange/FrugalBuild +++ b/source/gnome/evolution-exchange/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=evolution-exchange -pkgver=2.22.1.2 +pkgver=2.24.0 pkgrel=1 pkgdesc="Ximian Connector for Microsoft Exchange, which adds support for Microsoft Exchange 2000 and 2003 to Evolution." -depends=('gtkhtml>=3.18.0' 'evolution-data-server>=2.22.1.1' 'evolution>=2.22.1.1' 'libsoup>=2.4.0' \ - 'evolution-data-server-ldap>=2.22.1.1') +depends=('gtkhtml>=3.24.0' 'evolution-data-server>=2.24.0' 'evolution>=2.24.0' 'libsoup>=2.24.0' \ + 'evolution-data-server-ldap>=2.24.0') makedepends=('gtk-doc>=1.9' 'perl-xml-parser' 'openldap' 'intltool') groups=('gnome') archs=('i686' 'x86_64' 'ppc') @@ -14,5 +14,5 @@ Finclude gnome url="http://www.gnome.org/projects/evolution/" Fconfopts="$Fconfopts --enable-gtk-doc" -sha1sums=('f30b1a465872e8e39c26b70463d2601d6710743f') +sha1sums=('983b413e6fb24c8177db17bc36c93b715b7f2c2c') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:39 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:58 2008 Subject: [Frugalware-git] frugalware-current: gdm-2.20.5-3-i686 Message-ID: <20081010132539.E2B3D1190212@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=edbbc0c3af3ede237ac1184d0c349237f6357260 commit edbbc0c3af3ede237ac1184d0c349237f6357260 Author: bouleetbil <bouleetbil@frogdev.info> Date: Sat Oct 4 23:01:54 2008 +0200 gdm-2.20.5-3-i686 *use the old theme for now the new is broken diff --git a/source/gnome/gdm/FrugalBuild b/source/gnome/gdm/FrugalBuild index 1b2a1de..88913dd 100644 --- a/source/gnome/gdm/FrugalBuild +++ b/source/gnome/gdm/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gdm pkgver=2.20.5 -pkgrel=2 +pkgrel=3 pkgdesc="GNOME Display Manager" url="http://www.gnome.org/" backup=(etc/gdm/custom.conf) @@ -21,12 +21,12 @@ options=(${options[@]} 'force') source=(${source[@]} $pkgname-2.20.1-gdmconf.patch \ $pkgname-gksu_categories.patch \ fix_reboot_path.patch \ - http://ftp.frugalware.org/pub/other/artwork/gdm-theme/GDM-Frugalware-1.0.tar.bz2) + http://ftp.frugalware.org/pub/other/artwork/gdm-theme/GDM-Frugalware-0.7.tar.bz2) sha1sums=('04d92b6b9a8c005b4a687d477b813bb4a357abd6' \ 'db576eb16baa10c95ce7143c5696594ee7b07744' \ '9665399f5ceaee25e5807f08c53456d5ac2a81fa' \ 'b602b6805d1d4787e4404827abf3d6f346843317' \ - 'b51f5b7654d9314367f27ed655b204d23c966f6d') + 'b13852bf7ce59df5d02f27b3603e274fba3e074d') build() { From bouleetbil at frogdev.info Fri Oct 10 15:25:40 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:28:59 2008 Subject: [Frugalware-git] frugalware-current: seahorse-2.24.0-1-i686 Message-ID: <20081010132540.19E0111901C5@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=668291f345fa4b2c264517c1690cf08bf3f8b31a commit 668291f345fa4b2c264517c1690cf08bf3f8b31a Author: bouleetbil <bouleetbil@frogdev.info> Date: Sat Oct 4 23:32:10 2008 +0200 seahorse-2.24.0-1-i686 *version bump *delete subpackage since this version they delete the applet diff --git a/source/gnome-extra/seahorse/FrugalBuild b/source/gnome-extra/seahorse/FrugalBuild index a24a75f..2e33fc9 100644 --- a/source/gnome-extra/seahorse/FrugalBuild +++ b/source/gnome-extra/seahorse/FrugalBuild @@ -2,74 +2,28 @@ # Maintainer: Priyank Gosalia <priyankmg@gmail.com> pkgname=seahorse -pkgver=2.22.3 -pkgrel=2 +pkgver=2.24.0 +pkgrel=1 pkgdesc="A GNOME application for managing PGP keys." url="http://www.seahorse.sourceforge.net/" -depends=('gnutls=2.2.5-2' 'gtksourceview' 'gnupg' 'gpgme' 'libsoup' 'dbus' \ - 'dbus-glib' 'libsoup' 'libxml2' 'libnotify' 'libgnomeui>=2.22.1' \ - 'openssh' 'gconf>=2.22.0' 'avahi') -makedepends=('gettext' 'openldap' 'intltool' 'pkgconfig' 'gnome-doc-utils' \ - 'nautilus>=2.22.0' 'gedit>=2.20.0' 'gnome-applets>=2.22.0') +depends=('gnutls=2.4.2-1' 'gtksourceview' 'gnupg' 'gpgme' 'libsoup' 'dbus' \ + 'dbus-glib' 'libsoup' 'libxml2' 'libnotify' 'libgnomeui>=2.24.0' \ + 'openssh' 'gconf>=2.24.0' 'avahi') +makedepends=('gettext' 'openldap' 'intltool' 'pkgconfig' 'gnome-doc-utils') groups=('gnome-extra') archs=('i686' 'x86_64') -_F_gnome_schemas=('/etc/gconf/schemas/seahorse-gedit.schemas' - '/etc/gconf/schemas/seahorse.schemas') +_F_gnome_schemas=('/etc/gconf/schemas/seahorse.schemas') _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" _F_gnome_iconcache="y" _F_gnome_mime="y" Finclude gnome gnome-scriptlet -sha1sums=('11a5c4a641e3419e022f3c8e733b49a1139a52ed') -subpkgs=("$pkgname-gedit" "$pkgname-nautilus" "$pkgname-applet") -subdescs=('seahorse encryption plugin for gedit' \ - 'seahorse encryption extension for nautilus' \ - 'seahorse panel applet for GNOME') -subdepends=("$pkgname=$pkgver gedit>=2.20.0 gedit-python>=2.20.0" "$pkgname=$pkgver nautilus>=2.20.0" "$pkgname=$pkgver gnome-applets>=2.20.0") -subgroups=('gnome-extra' 'gnome-extra' 'gnome-extra') -subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64') - -build() -{ - unset MAKEFLAGS - Fsed 'chmod u+s $(bindir)' 'chmod u+s $(DESTDIR)$(bindir)' agent/Makefile.in - Fsed 'chmod u+s $(bindir)' 'chmod u+s $(DESTDIR)$(bindir)' agent/Makefile.am - Fpatchall - - Fconf --enable-ldap --enable-hkp --enable-gedit --enable-nautilus \ +sha1sums=('e6113d22cf63121bf4a2505ad7a1b755c21a280c') +unset MAKEFLAGS +Fconfopts="${Fconfopts[@]} -enable-ldap --enable-hkp \ --enable-agent --enable-libnotify --with-keyserver --enable-ssh \ --enable-nautilus --enable-dbus --enable-avahi --enable-sharing \ - --enable-gnome-keyring --disable-epiphany --enable-gedit \ - --disable-update-mime-database - - make || return 1 - Fmakeinstall GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$Fdestdir - Fbuild_gnome_scriptlet - - Fsplit $pkgname-gedit usr/lib/gedit-2/ - Fsplit $pkgname-nautilus usr/lib/nautilus/ - Fsplit $pkgname-applet usr/lib/seahorse/seahorse-applet - Fsplit $pkgname-applet usr/share/omf/seahorse-applet/ - Fsplit $pkgname-applet usr/share/gnome/help/seahorse-applet/ - Fsplit $pkgname-applet usr/share/pixmaps/seahorse-applet.svg - Fsplit $pkgname-applet usr/share/seahorse/glade/seahorse-applet-preferences.glade - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/22x22/seahorse-applet-encrypted.png - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/22x22/seahorse-applet-key.png - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/22x22/seahorse-applet-signed.png - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/22x22/seahorse-applet-text.png - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/22x22/seahorse-applet-unknown.png - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/48x48/seahorse-applet-encrypted.png - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/48x48/seahorse-applet-key.png - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/48x48/seahorse-applet-signed.png - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/48x48/seahorse-applet-text.png - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/48x48/seahorse-applet-unknown.png - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/48x48/seahorse-applet.png - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/scalable/seahorse-applet-encrypted.svg - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/scalable/seahorse-applet-key.svg - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/scalable/seahorse-applet-signed.svg - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/scalable/seahorse-applet-text.svg - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/scalable/seahorse-applet-unknown.svg - Fsplit $pkgname-applet usr/share/pixmaps/seahorse/scalable/seahorse-applet.svg -} + --enable-gnome-keyring --disable-epiphany \ + --disable-update-mime-database" # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:40 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:29:00 2008 Subject: [Frugalware-git] frugalware-current: goobox-2.0.0-1-i686 Message-ID: <20081010132540.40C6A1190504@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6f9d968423f6a6aa83ce522c380184b7e9a26d4f commit 6f9d968423f6a6aa83ce522c380184b7e9a26d4f Author: bouleetbil <bouleetbil@frogdev.info> Date: Sat Oct 4 23:40:03 2008 +0200 goobox-2.0.0-1-i686 *new package diff --git a/source/gnome-extra/goobox/FrugalBuild b/source/gnome-extra/goobox/FrugalBuild new file mode 100644 index 0000000..691af13 --- /dev/null +++ b/source/gnome-extra/goobox/FrugalBuild @@ -0,0 +1,25 @@ +# Compiling Time: 0.18 SBU +# Maintainer: bouleetbil <bouleetbil@frogdev.info> + +pkgname=goobox +pkgver=2.0.0 +pkgrel=1 +pkgdesc="Goobox is an CD player and ripper for the GNOME 2 environment" +options=('scriptlet') +depends=('libgnomeui' 'libsm' 'popt' 'esd' 'pango' 'gail' 'libart_lgpl' \ + 'gnome-vfs' 'libglade' 'gstreamer' 'libmusicbrainz' 'libnotify' \ + 'atk' 'freetype2' 'libxau' 'libxdmcp' 'libgcc' 'libjpeg' \ + 'openssl' 'libxdamage' 'libxinerama' 'libxi' 'libxrandr' \ + 'libxcursor' 'gst-plugins-base-gnomevfs' 'gst-plugins-good') +makedepends=('gnome-doc-utils' 'perl-xml-parser') +_F_gnome_devel="y" +_F_gnome_iconcache="y" +_F_gnome_desktop="y" +_F_gnome_schemas=('/etc/gconf/schemas/goobox.schemas') +Finclude gnome gnome-scriptlet +groups=('gnome-extra') +archs=('i686') +sha1sums=('560dcf04143ddac00f5bc63e710b5a07a1f64ec3') + +# optimization OK + From bouleetbil at frogdev.info Fri Oct 10 15:25:39 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:29:01 2008 Subject: [Frugalware-git] frugalware-current: gdm-2.20.5-2-i686 Message-ID: <20081010132539.9EF72119021E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9cc46d134b1d64e52c872a8ca43bfcde4c93655b commit 9cc46d134b1d64e52c872a8ca43bfcde4c93655b Author: bouleetbil <bouleetbil@frogdev.info> Date: Fri Oct 3 23:39:30 2008 +0200 gdm-2.20.5-2-i686 *update theme diff --git a/source/gnome/gdm/FrugalBuild b/source/gnome/gdm/FrugalBuild index d7cd8ed..1b2a1de 100644 --- a/source/gnome/gdm/FrugalBuild +++ b/source/gnome/gdm/FrugalBuild @@ -3,11 +3,11 @@ pkgname=gdm pkgver=2.20.5 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME Display Manager" url="http://www.gnome.org/" backup=(etc/gdm/custom.conf) -depends=('zenity>=2.22.0' 'libgnomeui>=2.22.0' 'libxi' 'fontconfig' 'libxrandr>=1.2.2' 'librsvg>=2.20.0' \ +depends=('zenity>=2.24.0' 'libgnomeui>=2.24.0' 'libxi' 'fontconfig' 'libxrandr>=1.2.2' 'librsvg>=2.20.0' \ 'libxinerama' 'libxcursor' 'libxevie' 'xorg-server>=1.4.0.90-4') rodepends=('xsm' 'sessreg' 'gksu' 'xmessage') makedepends=('intltool' 'gnome-doc-utils') @@ -21,12 +21,12 @@ options=(${options[@]} 'force') source=(${source[@]} $pkgname-2.20.1-gdmconf.patch \ $pkgname-gksu_categories.patch \ fix_reboot_path.patch \ - http://ftp.frugalware.org/pub/other/artwork/gdm-theme/GDM-Frugalware-0.7.tar.bz2) + http://ftp.frugalware.org/pub/other/artwork/gdm-theme/GDM-Frugalware-1.0.tar.bz2) sha1sums=('04d92b6b9a8c005b4a687d477b813bb4a357abd6' \ 'db576eb16baa10c95ce7143c5696594ee7b07744' \ '9665399f5ceaee25e5807f08c53456d5ac2a81fa' \ 'b602b6805d1d4787e4404827abf3d6f346843317' \ - 'b13852bf7ce59df5d02f27b3603e274fba3e074d') + 'b51f5b7654d9314367f27ed655b204d23c966f6d') build() { From bouleetbil at frogdev.info Fri Oct 10 15:25:40 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:29:02 2008 Subject: [Frugalware-git] frugalware-current: cheese-2.24.0-1-i686 Message-ID: <20081010132540.9E660119024D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2b1e01bd52a84ba5e5152678d6212a7c46c72310 commit 2b1e01bd52a84ba5e5152678d6212a7c46c72310 Author: bouleetbil <bouleetbil@frogdev.info> Date: Sat Oct 4 23:59:29 2008 +0200 cheese-2.24.0-1-i686 *version bump diff --git a/source/gnome-extra/cheese/FrugalBuild b/source/gnome-extra/cheese/FrugalBuild index b19303f..dc5365a 100644 --- a/source/gnome-extra/cheese/FrugalBuild +++ b/source/gnome-extra/cheese/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=cheese -pkgver=2.22.2 -pkgrel=3 +pkgver=2.24.0 +pkgrel=1 pkgdesc="Cheese is a Photobooth-inspired GNOME application for taking pictures and videos from a webcam." url="http://www.gnome.org/projects/cheese" -depends=('librsvg>=2.22.0' 'gst-plugins-good' 'gst-plugins-base' 'gst-plugins-base-pango' \ - 'gnome-vfs' 'libgnomeui' 'xf86vidmodeproto' 'evolution-data-server>=2.22.0' 'dbus' 'hal' \ +depends=('librsvg>=2.22.2' 'gst-plugins-good' 'gst-plugins-base' 'gst-plugins-base-pango' \ + 'gnome-vfs' 'libgnomeui' 'xf86vidmodeproto' 'evolution-data-server>=2.24.0' 'dbus' 'hal' \ 'gst-plugins-good-video4linux2' 'heimdal>=1.2.1' 'db>=4.7.25' 'gst-plugins-bad-mpeg2enc') makedepends=('intltool' 'gnome-doc-utils' 'samba' 'fuse' 'libsoup' 'gconf') groups=('gnome-extra') @@ -16,6 +16,6 @@ _F_gnome_iconcache="y" _F_gnome_desktop="y" _F_gnome_schemas=('/etc/gconf/schemas/cheese.schemas') Finclude gnome gnome-scriptlet -sha1sums=('af430576d73ea70e2339ea8767409a5c922b8692') +sha1sums=('b48fff98e3f36602bf4b6a188509af46f2c4bf16') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:40 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:29:03 2008 Subject: [Frugalware-git] frugalware-current: gnome-user-docs-2.24.0-1-i686 Message-ID: <20081010132540.C5F7F11901BD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f76d19093cef832c80406ec847d5b3c42a9db2cc commit f76d19093cef832c80406ec847d5b3c42a9db2cc Author: bouleetbil <bouleetbil@frogdev.info> Date: Sun Oct 5 09:47:52 2008 +0200 gnome-user-docs-2.24.0-1-i686 *version bump diff --git a/source/gnome-extra/gnome-user-docs/FrugalBuild b/source/gnome-extra/gnome-user-docs/FrugalBuild index 74e5d30..0edaa37 100644 --- a/source/gnome-extra/gnome-user-docs/FrugalBuild +++ b/source/gnome-extra/gnome-user-docs/FrugalBuild @@ -3,16 +3,16 @@ # Contributor: AlexExtreme <alex@alex-smith.me.uk> pkgname=gnome-user-docs -pkgver=2.22.0 +pkgver=2.24.0 pkgrel=1 pkgdesc="User documentation for GNOME" url="http://www.gnome.org/" depends=('rarian') -makedepends=('gnome-doc-utils>=0.12.0') +makedepends=('gnome-doc-utils>=0.14.0' 'docbook-xsl' 'docbook-xml') replaces=('gnome2-user-docs') groups=('gnome-extra') archs=('i686' 'x86_64') _F_gnome_scrollkeeper="y" Finclude gnome gnome-scriptlet unset MAKEFLAGS -sha1sums=('b6eef0b7dcf3e61743e438df8493e5c5511ea465') +sha1sums=('1db8a2eff00b96bd6ca0ca184a5aadbd1f4dfd1d') From bouleetbil at frogdev.info Fri Oct 10 15:25:41 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:29:04 2008 Subject: [Frugalware-git] frugalware-current: mousetweaks-2.24.0-1-i686 Message-ID: <20081010132541.166751190219@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=410e567f416e520476b8bf1e83531f9f21d96050 commit 410e567f416e520476b8bf1e83531f9f21d96050 Author: bouleetbil <bouleetbil@frogdev.info> Date: Sun Oct 5 09:55:14 2008 +0200 mousetweaks-2.24.0-1-i686 *version bump diff --git a/source/gnome-extra/mousetweaks/FrugalBuild b/source/gnome-extra/mousetweaks/FrugalBuild index 6d64d99..57522c8 100644 --- a/source/gnome-extra/mousetweaks/FrugalBuild +++ b/source/gnome-extra/mousetweaks/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=mousetweaks -pkgver=2.22.2 +pkgver=2.24.0 pkgrel=1 pkgdesc="The Mousetweaks package provides mouse accessibility enhancements for the GNOME desktop." url="http://www.gnome.org/" @@ -13,6 +13,6 @@ archs=('i686' 'x86_64') _F_gnome_schemas=('/etc/gconf/schemas/mousetweaks.schemas' \ '/etc/gconf/schemas/pointer-capture-applet.schemas') Finclude gnome -sha1sums=('846c9ee24bdfe01282d214367b710da138a101cc') +sha1sums=('ffee63d8b833fdef87a440041689c2adb2a76564') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:41 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:29:05 2008 Subject: [Frugalware-git] frugalware-current: deskbar-applet-2.24.0-1-i686 Message-ID: <20081010132541.3BC6611901A1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=240e3cfb9fdbf2c2fa750d43d1b2539d1bfa4b23 commit 240e3cfb9fdbf2c2fa750d43d1b2539d1bfa4b23 Author: bouleetbil <bouleetbil@frogdev.info> Date: Sun Oct 5 10:29:28 2008 +0200 deskbar-applet-2.24.0-1-i686 *version bump diff --git a/source/gnome-extra/deskbar-applet/FrugalBuild b/source/gnome-extra/deskbar-applet/FrugalBuild index dbe899d..63a3ff9 100644 --- a/source/gnome-extra/deskbar-applet/FrugalBuild +++ b/source/gnome-extra/deskbar-applet/FrugalBuild @@ -3,12 +3,12 @@ # Contributor: AlexExtreme <alex@alex-smith.me.uk> pkgname=deskbar-applet -pkgver=2.22.1 +pkgver=2.24.0 pkgrel=1 pkgdesc="The Deskbar applet for gnome" url="http://www.gnome.org/" -depends=('gnome-python-extras>=2.19.1' 'evolution-data-server>=2.22.0' \ - 'gnome-desktop>=2.22.0' 'gnome-python-desktop-applet>=2.22.0') +depends=('gnome-python-extras>=2.14.0' 'evolution-data-server>=2.24.0' \ + 'gnome-desktop>=2.24.0' 'gnome-python-desktop-applet>=2.24.0') makedepends=('intltool' 'perl-xml-parser' 'gnome-doc-utils') groups=('gnome-extra') archs=('i686' 'x86_64') @@ -16,7 +16,7 @@ _F_gnome_schemas=('/etc/gconf/schemas/deskbar-applet.schemas') _F_gnome_scrollkeeper="y" _F_gnome_iconcache="y" Finclude gnome gnome-scriptlet +sha1sums=('e5affc173b440959cd8edead0bbb8b36bdadd9b2') unset MAKEFLAGS -sha1sums=('e1f7784af5ac4493b3800424018b4a10eac69425') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:41 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:29:06 2008 Subject: [Frugalware-git] frugalware-current: gvfs-1.0.1-2-i686 Message-ID: <20081010132541.AF05611904D3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=abca1f0860f504a3e908a72e5f9ea228564b1556 commit abca1f0860f504a3e908a72e5f9ea228564b1556 Author: bouleetbil <bouleetbil@frogdev.info> Date: Sun Oct 5 11:51:39 2008 +0200 gvfs-1.0.1-2-i686 *added new options diff --git a/source/gnome/gvfs/FrugalBuild b/source/gnome/gvfs/FrugalBuild index be5a7a9..a88680e 100644 --- a/source/gnome/gvfs/FrugalBuild +++ b/source/gnome/gvfs/FrugalBuild @@ -3,11 +3,13 @@ pkgname=gvfs pkgver=1.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="gvfs is a userspace virtual filesystem designed to work with the i/o abstractions of gio." url="http://www.gnome.org/" depends=('glib2>=2.16.5' 'dbus' 'avahi-glib' 'avahi' 'hal') -makedepends=('intltool' 'gnome-doc-utils' 'samba' 'fuse' 'libsoup' 'gconf') +makedepends=('intltool' 'gnome-doc-utils' 'samba' 'fuse' 'libsoup' 'gconf' \ + 'gnome-keyring' 'libcdio' 'gphoto2' \ + 'bluez-libs' 'expat' 'openssh') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') Finclude gnome From bouleetbil at frogdev.info Fri Oct 10 15:25:41 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:29:07 2008 Subject: [Frugalware-git] frugalware-current: pessulus-2.24.0-1-i686 Message-ID: <20081010132541.EEA1F1190220@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ddad43395f240b7db24fba2a0b52837f06652ccc commit ddad43395f240b7db24fba2a0b52837f06652ccc Author: bouleetbil <bouleetbil@frogdev.info> Date: Sun Oct 5 12:07:44 2008 +0200 pessulus-2.24.0-1-i686 *version bump diff --git a/source/gnome-extra/pessulus/FrugalBuild b/source/gnome-extra/pessulus/FrugalBuild index 7c00127..0464975 100644 --- a/source/gnome-extra/pessulus/FrugalBuild +++ b/source/gnome-extra/pessulus/FrugalBuild @@ -3,17 +3,18 @@ # Contributor: AlexExtreme <alex@alex-smith.me.uk> pkgname=pessulus -pkgver=2.16.4 +pkgver=2.24.0 pkgrel=1 pkgdesc="Pessulus is a lockdown editor for Gnome" -url="http://live.gnome.org/Pessulus" groups=('gnome-extra') archs=('i686' 'x86_64') -depends=('gconf' 'gnome-python>=2.16.0') +depends=('gconf' 'gnome-python>=2.22.1' 'gnome-python-desktop') makedepends=('intltool' 'gnome-doc-utils') -Finclude gnome - -# On a version bump, rebuild sabayon and change it's pessulus URLs +_F_gnome_iconcache="y" +_F_gnome_desktop="y" +Finclude gnome gnome-scriptlet +url="http://live.gnome.org/Pessulus" +sha1sums=('598ef7ed3588fe08ad3d8b8148a6aa1b413a7bc0') +# On a version bump, rebuild sabayon # optimization OK -sha1sums=('f3dca72688c50039ce9b53256be7af929a79cb23') From bouleetbil at frogdev.info Fri Oct 10 15:25:42 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:29:10 2008 Subject: [Frugalware-git] frugalware-current: sabayon-2.22.0-1-i686 Message-ID: <20081010132542.21FFA11901DA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=59bf85aaa522fd95e7699441533e558ff1bb1e1a commit 59bf85aaa522fd95e7699441533e558ff1bb1e1a Author: bouleetbil <bouleetbil@frogdev.info> Date: Sun Oct 5 12:21:31 2008 +0200 sabayon-2.22.0-1-i686 *rebuild with pessulus>=2.24.0 diff --git a/source/gnome-extra/sabayon/FrugalBuild b/source/gnome-extra/sabayon/FrugalBuild index 376c60d..2bafdca 100644 --- a/source/gnome-extra/sabayon/FrugalBuild +++ b/source/gnome-extra/sabayon/FrugalBuild @@ -9,7 +9,7 @@ pkgdesc="Sabayon is a user profile system for Gnome" url="http://www.gnome.org/projects/sabayon" groups=('gnome-extra') archs=('i686' 'x86_64') -depends=('gnome-desktop' 'xorg-server' 'gnome-python' 'python-ldap' 'pessulus>=2.16.2') +depends=('gnome-desktop' 'xorg-server' 'gnome-python' 'python-ldap' 'pessulus>=2.24.0') makedepends=('intltool' 'gnome-doc-utils') Finclude gnome python source=(${source[@]} $pkgname-2.17.90-use-gksu.patch pessulus_integration.patch) From bouleetbil at frogdev.info Fri Oct 10 15:25:42 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:29:13 2008 Subject: [Frugalware-git] frugalware-current: consolekit-0.3.0-1-i686 Message-ID: <20081010132542.3FF7611904E0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=919e504a5252291e4079930a46bbf6c33a54a8cb commit 919e504a5252291e4079930a46bbf6c33a54a8cb Author: bouleetbil <bouleetbil@frogdev.info> Date: Mon Oct 6 21:35:28 2008 +0200 consolekit-0.3.0-1-i686 *new package diff --git a/source/xapps-extra/consolekit/FrugalBuild b/source/xapps-extra/consolekit/FrugalBuild new file mode 100644 index 0000000..c839735 --- /dev/null +++ b/source/xapps-extra/consolekit/FrugalBuild @@ -0,0 +1,30 @@ +# Compiling time: 0.38 SBU +# Maintainer: bouleetbil <bouleetbil@frogdev.info> + +pkgname=consolekit +_F_archive_name="ConsoleKit" +pkgver=0.3.0 +pkgrel=1 +pkgdesc="Framework for defining and tracking users, login sessions and seats." +url="http://www.freedesktop.org/wiki/Software/ConsoleKit" +source=(http://people.freedesktop.org/~mccann/dist/$_F_archive_name-$pkgver.tar.bz2 rc.xconsolekit \ + consolekit-0.3.0-shutdown.patch close_log.diff) +up2date="lynx -dump http://people.freedesktop.org/~mccann/dist/ | Flasttar" +depends=('libx11' 'dbus-glib' 'zlib') +install="$pkgname.install" +groups=('xapps-extra') +archs=('i686' 'x86_64') +sha1sums=('e3b6156622cc14ebca7382a55b8ed15f2f2bad98' \ + '5efcbfa507b4b5a1aff2670b3b2b507b50ba2d77' \ + 'f02205b3273047afdfe4438fac4f71f50655112b' \ + 'f05ccbcab5cc768edfe76307066c88dc721b9448') + +#If you bump this package think to verify if gnome-session can reboot or shutdown +#for now this package is only use by gnome-session but the next gnome* could use. + +build() { + Fbuild + Frcd2 xconsolekit +} + +# optimization OK diff --git a/source/xapps-extra/consolekit/close_log.diff b/source/xapps-extra/consolekit/close_log.diff new file mode 100755 index 0000000..3f23533 --- /dev/null +++ b/source/xapps-extra/consolekit/close_log.diff @@ -0,0 +1,27 @@ +/*Fixes #17866*/ +--- a/src/ck-event-logger.c ++++ b/src/ck-event-logger.c +@@ -180,8 +180,10 @@ retry: + static void + reopen_file_stream (CkEventLogger *event_logger) + { +- close (event_logger->priv->fd); +- fclose (event_logger->priv->file); ++ /* fclose will also close the underlying fd */ ++ if (event_logger->priv->file != NULL) { ++ fclose (event_logger->priv->file); ++ } + + /* FIXME: retries */ + open_log_file (event_logger); +@@ -420,8 +422,8 @@ ck_event_logger_finalize (GObject *objec + g_async_queue_unref (event_logger->priv->event_queue); + } + +- if (event_logger->priv->fd != -1) { +- close (event_logger->priv->fd); ++ if (event_logger->priv->file != NULL) { ++ fclose (event_logger->priv->file); + } + + g_free (event_logger->priv->log_filename); diff --git a/source/xapps-extra/consolekit/consolekit-0.3.0-shutdown.patch b/source/xapps-extra/consolekit/consolekit-0.3.0-shutdown.patch new file mode 100755 index 0000000..682f820 --- /dev/null +++ b/source/xapps-extra/consolekit/consolekit-0.3.0-shutdown.patch @@ -0,0 +1,32 @@ +From b09ddd0f5c9de463ad0d1ebd329a9d16b084e192 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Wed, 1 Oct 2008 22:27:24 +0200 +Subject: [PATCH] allow shutdown without policykit or RBAC intervention. + +--- + src/ck-manager.c | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/src/ck-manager.c b/src/ck-manager.c +index bcb9350..54a78e6 100644 +--- a/src/ck-manager.c ++++ b/src/ck-manager.c +@@ -1349,7 +1349,6 @@ ck_manager_restart (CkManager *manager, + } + #else + g_warning ("Compiled without PolicyKit or RBAC support!"); +- goto out; + #endif + + g_debug ("ConsoleKit preforming Restart: %s", action); +@@ -1409,7 +1408,6 @@ ck_manager_stop (CkManager *manager, + } + #else + g_warning ("Compiled without PolicyKit or RBAC support!"); +- goto out; + #endif + + g_debug ("Stopping system"); +-- +1.6.0.2 + diff --git a/source/xapps-extra/consolekit/consolekit.install b/source/xapps-extra/consolekit/consolekit.install new file mode 100644 index 0000000..64093a1 --- /dev/null +++ b/source/xapps-extra/consolekit/consolekit.install @@ -0,0 +1,28 @@ +post_install() +{ + /usr/sbin/chkconfig --add rc.xconsolekit +} + +pre_upgrade() +{ + /sbin/service xconsolekit stop +} + +post_upgrade() +{ + post_install $1 + /sbin/service xconsolekit start +} + +pre_remove() +{ + /sbin/service xconsolekit stop + /usr/sbin/chkconfig --del rc.xconsolekit +} + +op=$1 +shift + +$op $* + +# vim: ft=sh diff --git a/source/xapps-extra/consolekit/rc.xconsolekit b/source/xapps-extra/consolekit/rc.xconsolekit new file mode 100755 index 0000000..4b8aa8f --- /dev/null +++ b/source/xapps-extra/consolekit/rc.xconsolekit @@ -0,0 +1,40 @@ +#!/bin/bash + +# (c) 2008 bouleetbil <bouleetbil@frogdev.info> +# rc.xconsolekit for FrugalWare +# distributed under GPL License + +# chkconfig: 2345 99 02 +# description: Framework for defining and tracking users, login sessions and seats. + +source /lib/initscripts/functions +TEXTDOMAIN=xconsolekit +TEXTDOMAINDIR=/lib/initscripts/messages + +actions=(restart start status stop) + +pid="pidof console-kit-daemon 2> /dev/null" + +rc_start() +{ + start_msg + if [ -z "$(eval $pid)" ]; then + /usr/sbin/console-kit-daemon -- 2>/dev/null 1>/dev/null + ok $? + else + ok 999 + fi +} + +rc_stop() +{ + stop_msg + if [ ! -z "$(eval $pid)" ] ;then + kill $(eval $pid) 2>/dev/null 1>/dev/null + ok $? + else + ok 999 + fi +} + +rc_exec $1 From bouleetbil at frogdev.info Fri Oct 10 15:25:42 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:29:15 2008 Subject: [Frugalware-git] frugalware-current: gnome-session-2.24.0-5-i686 Message-ID: <20081010132542.7927511904E3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d7b4af2eac921f4734d8f015536695cf1255ef02 commit d7b4af2eac921f4734d8f015536695cf1255ef02 Author: bouleetbil <bouleetbil@frogdev.info> Date: Mon Oct 6 21:53:24 2008 +0200 gnome-session-2.24.0-5-i686 *added patch for shutdown/restart *added rodepends consolekit diff --git a/source/gnome/gnome-session/FrugalBuild b/source/gnome/gnome-session/FrugalBuild index 1ac4395..d543f56 100644 --- a/source/gnome/gnome-session/FrugalBuild +++ b/source/gnome/gnome-session/FrugalBuild @@ -5,26 +5,30 @@ pkgname=gnome-session pkgver=2.24.0 -pkgrel=3 +pkgrel=5 pkgdesc="GNOME session manager" depends=('libgnomeui>=2.24.0' 'gnome-desktop>=2.24.0' \ 'dbus-glib>=0.76' 'gnome-control-center>=2.24.0.1' 'gnome-vfs>=2.24.0' 'libnotify' 'gnome-keyring>=2.24.0') makedepends=('intltool') +rodepends=('consolekit') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') _F_gnome_schemas=('/etc/gconf/schemas/gnome-session.schemas') _F_gnome_iconcache="y" _F_gnome_desktop="y" Finclude gnome gnome-scriptlet -source=(${source[@]} enable_splash.diff \ +source=(${source[@]} enable_splash.diff gnome-session-HEAD-shutdown.patch gnome-session-2.23.5-polkit-automagic.patch\ $pkgname http://ftp.frugalware.org/pub/other/artwork/gnome-theme/GNOME-Splash-1.0.png ) sha1sums=('5a4b329db62ae3518029982ae86fb1b138500c3e' \ '5a63c81ad2ecd0d29aa33c73d2717dcd1774333e' \ + 'aaa28556a4e3d0a0cc102b5d9ae90ded6f6da862' \ + '942a4a41abc28596f8baac7ff41c03a677ac64db' \ '047ac00bb24d52986aac94e232b4b40fa122f582' \ '222c9a2fd01872acc2fb69c17e9771cde2e1e5a2') build() { Fpatchall + Fautoreconf Fmake --disable-schemas-install Fmakeinstall GCONF_DISABLE_SCHEMA_INSTALL=1 Fbuild_gnome_scriptlet diff --git a/source/gnome/gnome-session/gnome-session-2.23.5-polkit-automagic.patch b/source/gnome/gnome-session/gnome-session-2.23.5-polkit-automagic.patch new file mode 100644 index 0000000..c92e474 --- /dev/null +++ b/source/gnome/gnome-session/gnome-session-2.23.5-polkit-automagic.patch @@ -0,0 +1,30 @@ +--- + From bheelinkg, fix automagic dependency on policykit + + configure.in | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff -Naur gnome-session-2.23.5/configure.in gnome-session-2.23.5.new/configure.in +--- gnome-session-2.23.5/configure.in 2008-07-23 03:08:03.000000000 +0530 ++++ gnome-session-2.23.5.new/configure.in 2008-08-09 11:34:35.000000000 +0530 +@@ -77,9 +77,18 @@ + PKG_CHECK_MODULES(EGG_SMCLIENT, gtk+-2.0) + PKG_CHECK_MODULES(EGG_LIBGNOMEUI, libgnomeui-2.0) + +-PKG_CHECK_MODULES(POLKIT_GNOME, polkit-gnome >= $POLKIT_GNOME_REQUIRED, have_polkit=yes, have_polkit=no) ++AC_ARG_ENABLE([polkit], ++ AC_HELP_STRING([--enable-polkit], [Enable PolicyKit support (default auto)]), ++ enable_polkit=$enableval, ++ enable_polkit=auto) ++if test "x$enable_polkit" != "xno"; then ++ PKG_CHECK_MODULES(POLKIT_GNOME, polkit-gnome >= $POLKIT_GNOME_REQUIRED, have_polkit=yes, have_polkit=no) ++ if test "x$enable_polkit" = "xyes" -a "x$have_polkit" = "xno"; then ++ AC_MSG_ERROR([PolicyKit support explicitly requested but dependencies not found]) ++ fi ++fi + +-if test "$have_polkit" = "yes"; then ++if test "x$have_polkit" = "xyes"; then + AC_DEFINE(HAVE_POLKIT_GNOME, [1], [whether PolKit GNOME was found]) + fi + diff --git a/source/gnome/gnome-session/gnome-session-HEAD-shutdown.patch b/source/gnome/gnome-session/gnome-session-HEAD-shutdown.patch new file mode 100644 index 0000000..9529a61 --- /dev/null +++ b/source/gnome/gnome-session/gnome-session-HEAD-shutdown.patch @@ -0,0 +1,73 @@ +--- + Straight forward fix to allow shutdown on systems not using policykit. + + If the system really don't have policykit, it will make things work + as in 2.22. + + If pk is in gsm but not in ck, it'll still work as in 2.22. + + If pk is present in both, you just have to fix the logic to make + gsm ask pk if the user has the permission to shutdown _before_ showing + buttons and in case this is not possible, just damn fix pk. + + gnome-session/gsm-consolekit.c | 14 ++------------ + 1 file changed, 2 insertions(+), 12 deletions(-) + +Index: b/gnome-session/gsm-consolekit.c +=================================================================== +--- a/gnome-session/gsm-consolekit.c ++++ b/gnome-session/gsm-consolekit.c +@@ -528,7 +528,7 @@ request_restart_priv (GsmConsolekit *man + g_free (error_message); + } + #else +- g_assert_not_reached (); ++ g_warning ("Failed to restart and Policykit support not enabled"); + #endif /* HAVE POLKIT */ + } + +@@ -568,7 +568,7 @@ request_stop_priv (GsmConsolekit *manage + } + } + #else +- g_assert_not_reached (); ++ g_warning ("Failed to shutdown and Policykit support not enabled"); + #endif /* HAVE POLKIT */ + } + +@@ -828,7 +828,6 @@ gsm_consolekit_can_switch_user (GsmConso + gboolean + gsm_consolekit_can_restart (GsmConsolekit *manager) + { +-#ifdef HAVE_POLKIT_GNOME + gboolean res; + GError *error; + error = NULL; +@@ -839,16 +838,11 @@ gsm_consolekit_can_restart (GsmConsoleki + g_error_free (error); + } + return res; +-#else +- g_debug ("GsmConsolekit: built without PolicyKit-gnome support - cannot restart system"); +- return FALSE; +-#endif + } + + gboolean + gsm_consolekit_can_stop (GsmConsolekit *manager) + { +-#ifdef HAVE_POLKIT_GNOME + gboolean res; + GError *error; + error = NULL; +@@ -859,10 +853,6 @@ gsm_consolekit_can_stop (GsmConsolekit * + g_error_free (error); + } + return res; +-#else +- g_debug ("GsmConsolekit: built without PolicyKit-gnome support - cannot stop system"); +- return FALSE; +-#endif + } + + GsmConsolekit * From bouleetbil at frogdev.info Fri Oct 10 15:25:42 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:29:18 2008 Subject: [Frugalware-git] frugalware-current: gksu-2.0.0-4-i686 Message-ID: <20081010132542.B08B3119092B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1ac8c6894c799f71ee45ebb6278941a087cf9dbe commit 1ac8c6894c799f71ee45ebb6278941a087cf9dbe Author: bouleetbil <bouleetbil@frogdev.info> Date: Mon Oct 6 23:03:14 2008 +0200 gksu-2.0.0-4-i686 *added patch for use the new plugin dir diff --git a/source/gnome/gksu/FrugalBuild b/source/gnome/gksu/FrugalBuild index f457540..f7fb42a 100644 --- a/source/gnome/gksu/FrugalBuild +++ b/source/gnome/gksu/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gksu pkgver=2.0.0 -pkgrel=3 +pkgrel=4 pkgdesc="A GTK+2 frontend for su and sudo" url="http://www.gnu.org/non-gnu/gksu/" backup=(etc/gksu.conf) @@ -13,9 +13,10 @@ groups=('gnome' 'gnome-apps') archs=('i686' 'x86_64' 'ppc') options=('scriptlet') up2date="lynx -dump http://people.debian.org/~kov/gksu/ | grep -v libgksu | grep tar.gz$ | tail -n 1 | sed 's/.*gksu-\([0-9\.]*\).tar.gz/\1/'" -source=(http://people.debian.org/~kov/$pkgname/$pkgname-$pkgver.tar.gz Fix_gvfs222.diff) +source=(http://people.debian.org/~kov/$pkgname/$pkgname-$pkgver.tar.gz Fix_gvfs222.diff nautilus-2.24.diff) sha1sums=('f15d568f43ecbeedd050b8f09b1da94a7d574de5' \ - '813d7cd2ac823ca14210293d927ab98e34719321') + '813d7cd2ac823ca14210293d927ab98e34719321' \ + '33449f4cfa4eb92856a1bd8c2a1eb1ae307456d0') subpkgs=("nautilus-$pkgname") subdescs=('Gksu nautilus extension') diff --git a/source/gnome/gksu/nautilus-2.24.diff b/source/gnome/gksu/nautilus-2.24.diff new file mode 100644 index 0000000..04d319c --- /dev/null +++ b/source/gnome/gksu/nautilus-2.24.diff @@ -0,0 +1,75 @@ +diff -Nur -x '*.orig' -x '*~' gksu-2.0.0/nautilus-gksu/Makefile.am gksu-2.0.0.new/nautilus-gksu/Makefile.am +--- gksu-2.0.0/nautilus-gksu/Makefile.am 2006-09-15 10:45:10.000000000 +0800 ++++ gksu-2.0.0.new/nautilus-gksu/Makefile.am 2008-04-12 15:45:47.000000000 +0800 +@@ -2,7 +2,7 @@ + INCLUDES = ${NAUTILUS_CFLAGS} + AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" + +-nautilus_extensiondir=$(libdir)/nautilus/extensions-1.0 ++nautilus_extensiondir=$(libdir)/nautilus/extensions-2.0 + nautilus_extension_LTLIBRARIES = libnautilus-gksu.la + libnautilus_gksu_la_SOURCES = libnautilus-gksu.c + libnautilus_gksu_la_LDFLAGS = LDFLAGS = -module -avoid-version -no-undefined +diff -Nur -x '*.orig' -x '*~' gksu-2.0.0/nautilus-gksu/Makefile.in gksu-2.0.0.new/nautilus-gksu/Makefile.in +--- gksu-2.0.0/nautilus-gksu/Makefile.in 2006-09-24 04:23:10.000000000 +0800 ++++ gksu-2.0.0.new/nautilus-gksu/Makefile.in 2008-04-12 15:45:53.000000000 +0800 +@@ -241,7 +241,7 @@ + AM_CFLAGS = -g -O2 -Wall + INCLUDES = ${NAUTILUS_CFLAGS} + AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" +-nautilus_extensiondir = $(libdir)/nautilus/extensions-1.0 ++nautilus_extensiondir = $(libdir)/nautilus/extensions-2.0 + nautilus_extension_LTLIBRARIES = libnautilus-gksu.la + libnautilus_gksu_la_SOURCES = libnautilus-gksu.c + libnautilus_gksu_la_LDFLAGS = LDFLAGS = -module -avoid-version -no-undefined +-- gksu-2.0.0.orig/debian/patches/01_always_ask.patch +++ gksu-2.0.0/debian/patches/01_always_ask.patch +@ -0,0 +1,48 @@ +diff -Nur gksu-2.0.0/gksu/gksu.c gksu-2.0.0.new/gksu/gksu.c +--- gksu-2.0.0/gksu/gksu.c 2006-09-15 04:45:04.000000000 +0200 ++++ gksu-2.0.0.new/gksu/gksu.c 2007-03-05 09:09:47.000000000 +0100 +@@ -55,6 +55,7 @@ + {"prompt", optional_argument, NULL, 'P'}, + {"desktop", required_argument, NULL, 'D'}, + {"description", required_argument, NULL, 'D'}, ++ {"always-ask-pass", no_argument, NULL, 'A'}, + {0, 0, 0, 0} + }; + +@@ -119,6 +120,9 @@ + N_(" --su-mode, -w\n" + " Make GKSu use su, instead of using libgksu's\n" + " default.\n"), ++ N_(" --always-ask-pass\n" ++ " Make GKSu always ask for a password, even if it is cached\n" ++ " by sudo.\n"), + }; + + help_trans = g_strconcat(_(help_text[0]), _(help_text[1]), +@@ -129,6 +133,7 @@ + _(help_text[10]), _(help_text[11]), + _(help_text[12]), _(help_text[13]), + _(help_text[14]), _(help_text[15]), ++ _(help_text[16]), _(help_text[17]), + NULL); + g_print (_(help_trans), PACKAGE_VERSION, cmdname); + g_free (help_trans); +@@ -501,7 +506,7 @@ + gtk_init (&newargc, &newargv); + + context = gksu_context_new (); +- while ((c = getopt_long(newargc, newargv, "?hu:lpm:kt:i:gdsSwP::aD:", long_opts, NULL)) ++ while ((c = getopt_long(newargc, newargv, "?hu:lpm:kt:i:gdsSwP::aD:A", long_opts, NULL)) + != EOF) + { + switch (c) +@@ -564,6 +569,9 @@ + case 'w': + run_mode = SU_MODE; + break; ++ case 'A': ++ gksu_context_set_always_ask_password(context, TRUE); ++ break; + case 'P': + prompt = TRUE; + From bouleetbil at frogdev.info Fri Oct 10 15:25:42 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:29:20 2008 Subject: [Frugalware-git] frugalware-current: gksu-2.0.0-5-i686 Message-ID: <20081010132542.D924A11901D1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=53078eb70af746d42b261b6fdf66869b8bfb4266 commit 53078eb70af746d42b261b6fdf66869b8bfb4266 Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Oct 7 20:06:55 2008 +0200 gksu-2.0.0-5-i686 *added a wrapper for gksu use dbus diff --git a/source/gnome/gksu/FrugalBuild b/source/gnome/gksu/FrugalBuild index f7fb42a..72a8d0c 100644 --- a/source/gnome/gksu/FrugalBuild +++ b/source/gnome/gksu/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gksu pkgver=2.0.0 -pkgrel=4 +pkgrel=5 pkgdesc="A GTK+2 frontend for su and sudo" url="http://www.gnu.org/non-gnu/gksu/" backup=(etc/gksu.conf) @@ -30,6 +30,10 @@ build() { Fautoreconf Fmake Fmakeinstall + #since gnome-2.24 all gnome* should be launch with dbus-launch + #the package that don't use dbus-launch is launch normally + Fmv /usr/bin/gksu /usr/bin/gksu.bin + Fwrapper "/usr/bin/gksu.bin dbus-launch \$@" gksu Fsed "x-terminal-emulator" "gnome-terminal" $Fdestdir/usr/share/applications/gksu.desktop Fsplit nautilus-$pkgname usr/lib } From bouleetbil at frogdev.info Fri Oct 10 15:25:43 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:29:22 2008 Subject: [Frugalware-git] frugalware-current: rhythmbox-0.11.5-3-i686 Message-ID: <20081010132543.203DB11904E5@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=665577216211ff570c6e2cf692097c53212b0702 commit 665577216211ff570c6e2cf692097c53212b0702 Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Oct 7 20:09:15 2008 +0200 rhythmbox-0.11.5-3-i686 *rebuild with libsoup>=2.24.0.1-2 *disable broken gtk-doc diff --git a/source/gnome/rhythmbox/FrugalBuild b/source/gnome/rhythmbox/FrugalBuild index 3549085..6d5069e 100644 --- a/source/gnome/rhythmbox/FrugalBuild +++ b/source/gnome/rhythmbox/FrugalBuild @@ -4,13 +4,13 @@ pkgname=rhythmbox pkgver=0.11.5 -pkgrel=1 +pkgrel=3 pkgdesc="A music management application for GNOME" url="http://www.rhythmbox.org/" -depends=('libgnomeui>=2.20.0' 'nautilus-cd-burner>=2.20.0' 'rarian' 'desktop-file-utils' \ - 'totem>=2.20.0' 'gst-plugins-base-oil' 'avahi-glib' 'libnotify' 'libsexy' 'libgpod>=0.6.0' \ - 'libsoup>=2.2.104-2' 'gnome-media>=2.20.1' 'dbus-glib>=0.74' 'python>=2.5') -makedepends=('intltool' 'gnome-doc-utils' 'gtk-doc') +depends=('libgnomeui>=2.24.0' 'nautilus-cd-burner>=2.24.0' 'rarian' 'desktop-file-utils' \ + 'totem>=2.24.0' 'gst-plugins-base-oil' 'avahi-glib' 'libnotify' 'libsexy' 'libgpod>=0.6.0' \ + 'libsoup>=2.24.0.1-2' 'gnome-media>=2.24.0' 'dbus-glib>=0.74' 'python>=2.5') +makedepends=('intltool' 'gnome-doc-utils') rodepends=('notification-daemon') groups=('gnome') archs=('i686' 'x86_64') @@ -20,7 +20,7 @@ _F_gnome_desktop="y" _F_gnome_iconcache="y" Finclude gnome-scriptlet gnome unset MAKEFLAGS -Fconfopts="$Fconfopts --enable-mdns=avahi --with-playback=gstreamer-0-10 --enable-gtk-doc --enable-daap --enable-audioscrobbler" +Fconfopts="$Fconfopts --enable-mdns=avahi --with-playback=gstreamer-0-10 --enable-daap --enable-audioscrobbler" sha1sums=('ccec2523f3a6f3746bf1091558819b602f74114f') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:43 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:29:23 2008 Subject: [Frugalware-git] frugalware-current: ruby-gtk2-0.18.0-1-i686 Message-ID: <20081010132543.5844811904E2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=856d19419add7cc9cc5bf56751629023c377b306 commit 856d19419add7cc9cc5bf56751629023c377b306 Author: bouleetbil <bouleetbil@frogdev.info> Date: Tue Oct 7 20:11:21 2008 +0200 ruby-gtk2-0.18.0-1-i686 *change m8r *fixe up2date *#version bump diff --git a/source/xlib-extra/ruby-gtk2/FrugalBuild b/source/xlib-extra/ruby-gtk2/FrugalBuild index cc6f2ae..7603fe0 100644 --- a/source/xlib-extra/ruby-gtk2/FrugalBuild +++ b/source/xlib-extra/ruby-gtk2/FrugalBuild @@ -1,23 +1,19 @@ # Compiling Time: 0.52 SBU -# Maintainer: Bence Nagy <nagybence@tipogral.hu> +# Maintainer: bouleetbil <bouleetbil@frogdev.info> +# Contributor: Bence Nagy <nagybence@tipogral.hu> pkgname=ruby-gtk2 -pkgver=0.16.0 +pkgver=0.18.0 pkgrel=1 pkgdesc="Ruby language bindings for GTK+ development libraries" depends=('freetype2' 'gtk+2' 'ruby') options=('scriptlet') groups=('xlib-extra') archs=('i686' 'x86_64') +_F_sourceforge_realname="ruby-gnome2" _F_sourceforge_dirname="ruby-gnome2" Finclude sourceforge url="http://ruby-gnome2.sourceforge.jp/" -sha1sums=('45b2c18523c1fca39ae346766b38550ed7005b6f') - -build() -{ - Fmake - make DESTDIR=$Fdestdir install || Fdie -} +sha1sums=('cdfcf1e161b8e5d8bd9daa5d6ccea24ff74fdfcf') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 15:25:43 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 15:29:25 2008 Subject: [Frugalware-git] frugalware-current: gnome-python-extras-2.19.1-2-i686 Message-ID: <20081010132543.F34CA11901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2056e696b80e79a87825dc061fc2bab15476cbb5 commit 2056e696b80e79a87825dc061fc2bab15476cbb5 Author: bouleetbil <bouleetbil@frogdev.info> Date: Wed Oct 8 20:53:42 2008 +0200 gnome-python-extras-2.19.1-2-i686 *rebuild gnome-python-extras-mozembed with xulrunner *it's broken since firefox3 diff --git a/source/gnome/gnome-python-extras/FrugalBuild b/source/gnome/gnome-python-extras/FrugalBuild index c66d88b..198a815 100644 --- a/source/gnome/gnome-python-extras/FrugalBuild +++ b/source/gnome/gnome-python-extras/FrugalBuild @@ -3,11 +3,11 @@ pkgname=gnome-python-extras pkgver=2.19.1 -pkgrel=1 +pkgrel=2 pkgdesc="Additional Python bindings for GNOME" url="http://www.pygtk.org/" -depends=('gnome-python-desktop>=2.22.0') -makedepends=('firefox>=2.0' 'libgtkhtml' 'gtkspell' 'libgda' 'libgksu') +depends=('gnome-python-desktop>=2.24.0') +makedepends=('xulrunner' 'libgtkhtml' 'gtkspell' 'libgda' 'libgksu') groups=('gnome') archs=('i686' 'x86_64') _F_gnome_devel="y" @@ -16,9 +16,10 @@ sha1sums=('f97303aa92c300050818ac8a01d0bc0657b2a9e3') subpkgs=("$pkgname-mozembed" "$pkgname-gtkhtml" "$pkgname-gtkspell") subdescs=('Mozilla embed library for PyGTK' 'GtkHTML library for PyGTK' 'GtkSpell library for PyGTK') -subdepends=("$pkgname=$pkgver firefox>=2.0" "$pkgname=$pkgver libgtkhtml" "$pkgname=$pkgver gtkspell") +subdepends=("$pkgname=$pkgver xulrunner" "$pkgname=$pkgver libgtkhtml" "$pkgname=$pkgver gtkspell") subgroups=('gnome-extra' 'gnome-extra' 'gnome-extra') subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64') +Fconfopts="${Fconfopts[@]} --with-gtkmozembed=xulrunner" build() { Fbuild From vmiklos at frugalware.org Fri Oct 10 15:25:44 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 10 15:29:26 2008 Subject: [Frugalware-git] frugalware-current: vte-0.17.4-1-x86_64 Message-ID: <20081010132544.21C9F11901AB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d814961583c22dfb2a92e92469bb79b13425da4e commit d814961583c22dfb2a92e92469bb79b13425da4e Author: Miklos Vajna <vmiklos@frugalware.org> Date: Thu Oct 9 16:18:47 2008 +0200 vte-0.17.4-1-x86_64 - makedepends() fix diff --git a/source/gnome/vte/FrugalBuild b/source/gnome/vte/FrugalBuild index 4218e44..49b5bb8 100644 --- a/source/gnome/vte/FrugalBuild +++ b/source/gnome/vte/FrugalBuild @@ -8,9 +8,9 @@ pkgdesc="Virtual Terminal Emulator" url="http://www.gnome.org/" depends=('gtk+2>=2.14.3') if [ "$CARCH" != "ppc" ]; then - makedepends=('pygtk>=2.12.0' 'gtk-doc>=1.9' 'perl-xml-parser') + makedepends=('pygtk>=2.12.0' 'gtk-doc>=1.9' 'perl-xml-parser' 'intltool') else - makedepends=('gtk-doc>=1.9' 'perl-xml-parser') + makedepends=('gtk-doc>=1.9' 'perl-xml-parser' 'intltool') fi groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') From vmiklos at frugalware.org Fri Oct 10 15:25:44 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 10 15:29:28 2008 Subject: [Frugalware-git] frugalware-current: empathy-2.24.0-1-x86_64 Message-ID: <20081010132544.5EBCD11904E4@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=213278aad0d77046b6e2dde2662fcdb8e86fc065 commit 213278aad0d77046b6e2dde2662fcdb8e86fc065 Author: Miklos Vajna <vmiklos@frugalware.org> Date: Fri Oct 10 01:51:59 2008 +0200 empathy-2.24.0-1-x86_64 added x86_64 to archs() diff --git a/source/gnome-extra/empathy/FrugalBuild b/source/gnome-extra/empathy/FrugalBuild index be93efb..526bd4b 100644 --- a/source/gnome-extra/empathy/FrugalBuild +++ b/source/gnome-extra/empathy/FrugalBuild @@ -13,7 +13,7 @@ depends=('gconf' 'telepathy-glib' 'libxml2' 'enchant' \ 'aspell' 'iso-codes' 'telepathy-mission-control' 'telepathy-gabble') makedepends=('gnome-common' 'intltool' 'gtk-doc' 'gnome-doc-utils') groups=('gnome-extra') -archs=('i686') +archs=('i686' 'x86_64') options=('scriptlet') _F_gnome_iconcache="y" _F_gnome_desktop="y" From vmiklos at frugalware.org Fri Oct 10 15:25:44 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 10 15:29:30 2008 Subject: [Frugalware-git] frugalware-current: gnome-screensaver-2.24.0-1-x86_64 Message-ID: <20081010132544.7D072119092C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0e60ea9163ecb42f8d2930740a34f6dfd5ea537d commit 0e60ea9163ecb42f8d2930740a34f6dfd5ea537d Author: Miklos Vajna <vmiklos@frugalware.org> Date: Fri Oct 10 09:11:43 2008 +0200 gnome-screensaver-2.24.0-1-x86_64 - depends() fix diff --git a/source/gnome/gnome-screensaver/FrugalBuild b/source/gnome/gnome-screensaver/FrugalBuild index 951a3b3..9eb2389 100644 --- a/source/gnome/gnome-screensaver/FrugalBuild +++ b/source/gnome/gnome-screensaver/FrugalBuild @@ -7,7 +7,7 @@ pkgrel=1 pkgdesc="GNOME screen saver and locker" url="http://live.gnome.org/GnomeScreensaver" depends=('libgnomeui>=2.24.0' 'dbus-glib>=0.71' 'gnome-menus>=2.24.0' 'gdm>=2.20.5' 'libgnomekbd>=2.24.0' \ - 'libxscrnsaver' 'shadow' 'xscreensaver-data' 'libbonobo' 'gnome-vfs>=2.24.0') + 'libxscrnsaver' 'shadow' 'xscreensaver-data' 'libbonobo' 'gnome-vfs>=2.24.0' 'gnome-desktop>=2.24.0') makedepends=('intltool' 'scrnsaverproto') groups=('gnome' 'gnome-minimal') archs=('x86_64' 'i686' 'ppc') From vmiklos at frugalware.org Fri Oct 10 15:25:44 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 10 15:29:31 2008 Subject: [Frugalware-git] frugalware-current: gnome-subtitles-0.8-2-x86_64 Message-ID: <20081010132544.A626911904E6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=03ab806ad09c9fa90b10f3f8569f127f1effef2f commit 03ab806ad09c9fa90b10f3f8569f127f1effef2f Author: Miklos Vajna <vmiklos@frugalware.org> Date: Fri Oct 10 09:54:18 2008 +0200 gnome-subtitles-0.8-2-x86_64 added x86_64 to archs() diff --git a/source/gnome-extra/gnome-subtitles/FrugalBuild b/source/gnome-extra/gnome-subtitles/FrugalBuild index 4d230a8..5e01b0c 100644 --- a/source/gnome-extra/gnome-subtitles/FrugalBuild +++ b/source/gnome-extra/gnome-subtitles/FrugalBuild @@ -10,7 +10,7 @@ depends=('mono' 'gnome-sharp' 'gstreamer' 'gst-plugins-base' \ 'gtkspell' 'enchant' 'sublib' 'gnome-desktop-sharp>=2.24.0-1') makedepends=('gnome-doc-utils' 'perl-xml-parser') groups=('gnome-extra') -archs=('i686') +archs=('i686' 'x86_64') options=('scriptlet') _F_gnome_desktop="y" _F_gnome_schemas=('/etc/gconf/schemas/gnome-subtitles.schemas') From vmiklos at frugalware.org Fri Oct 10 15:25:44 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 10 15:29:32 2008 Subject: [Frugalware-git] frugalware-current: goobox-2.0.0-1-x86_64 Message-ID: <20081010132544.D11261190213@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0077353007e37361cade3446747de48c29a4886b commit 0077353007e37361cade3446747de48c29a4886b Author: Miklos Vajna <vmiklos@frugalware.org> Date: Fri Oct 10 12:22:08 2008 +0200 goobox-2.0.0-1-x86_64 added x86_64 to archs() diff --git a/source/gnome-extra/goobox/FrugalBuild b/source/gnome-extra/goobox/FrugalBuild index 691af13..2774cba 100644 --- a/source/gnome-extra/goobox/FrugalBuild +++ b/source/gnome-extra/goobox/FrugalBuild @@ -18,7 +18,7 @@ _F_gnome_desktop="y" _F_gnome_schemas=('/etc/gconf/schemas/goobox.schemas') Finclude gnome gnome-scriptlet groups=('gnome-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('560dcf04143ddac00f5bc63e710b5a07a1f64ec3') # optimization OK From vmiklos at frugalware.org Fri Oct 10 15:25:45 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 10 15:29:33 2008 Subject: [Frugalware-git] frugalware-current: Merge branch 'master' of git.frugalware.org:/pub/other/people/bouleetbil/bouleetbilgnome224 Message-ID: <20081010132545.34B1711901F5@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0d24faf718297dc83820f63082ced516ec5429d8 commit 0d24faf718297dc83820f63082ced516ec5429d8 Merge: cbf43e5... 0077353... Author: Miklos Vajna <vmiklos@frugalware.org> Date: Fri Oct 10 15:19:27 2008 +0200 Merge branch 'master' of git.frugalware.org:/pub/other/people/bouleetbil/bouleetbilgnome224 Conflicts: source/gnome-extra/monodevelop/FrugalBuild source/gnome-extra/seahorse/FrugalBuild source/gnome/bug-buddy/FrugalBuild source/gnome/evolution-data-server/FrugalBuild source/gnome/nautilus-open-terminal/FrugalBuild source/gnome/rhythmbox/FrugalBuild source/gnome/vino/FrugalBuild source/lib/libsoup/FrugalBuild diff --cc source/gnome/vino/FrugalBuild index dde54ce,ba11f0a..4f275e1 --- a/source/gnome/vino/FrugalBuild +++ b/source/gnome/vino/FrugalBuild @@@ -2,10 -2,10 +2,10 @@@ # Maintainer: Christian Hamar alias krix <krics@linuxforum.hu> pkgname=vino - pkgver=2.22.2 - pkgrel=2 + pkgver=2.24.0 + pkgrel=1 pkgdesc="An integrated VNC server for GNOME" - depends=('libgnomeui>=2.22.1' 'gnutls>=2.4' 'avahi' 'libxtst' 'libxdamage' 'libnotify' 'gnome-keyring') -depends=('libgnomeui>=2.24.0' 'gnutls>=2.2' 'avahi' 'libxtst' 'libxdamage' 'libnotify' 'gnome-keyring') ++depends=('libgnomeui>=2.24.0' 'gnutls>=2.4' 'avahi' 'libxtst' 'libxdamage' 'libnotify' 'gnome-keyring') makedepends=('intltool' 'perl-xml-parser') groups=('gnome') archs=('i686' 'x86_64' 'ppc') From ryuo at frugalware.org Fri Oct 10 16:22:33 2008 From: ryuo at frugalware.org (James Buren) Date: Fri Oct 10 16:22:36 2008 Subject: [Frugalware-git] frugalware-current: larswm-7.5.3-1-i686 Message-ID: <20081010142233.99A8B1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8ae459c55631ea780bfe506af320735649703a41 commit 8ae459c55631ea780bfe506af320735649703a41 Author: James Buren <ryuo@frugalware.org> Date: Fri Oct 10 09:24:01 2008 -0500 larswm-7.5.3-1-i686 * up2date fix diff --git a/source/x11-extra/larswm/FrugalBuild b/source/x11-extra/larswm/FrugalBuild index 30ba5e8..a0c2dcb 100644 --- a/source/x11-extra/larswm/FrugalBuild +++ b/source/x11-extra/larswm/FrugalBuild @@ -5,7 +5,7 @@ pkgname=larswm pkgver=7.5.3 pkgrel=1 pkgdesc="A rewrite of 9wm, adding virtual desktops and tiling." -url="http://www.lab1702.net/fnurt/larswm" +url="http://www.safereconnect.com/fnurt/larswm/" depends=('glibc' 'libxmu' 'libsm') makedepends=('imake' 'gccmakedep') groups=('x11-extra') From ryuo at frugalware.org Fri Oct 10 16:25:30 2008 From: ryuo at frugalware.org (James Buren) Date: Fri Oct 10 16:25:31 2008 Subject: [Frugalware-git] frugalware-current: fvwm-crystal-3.0.6-1-i686 Message-ID: <20081010142530.35B8F1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e08a16512804f039879abcab8642bfab5eab13c5 commit e08a16512804f039879abcab8642bfab5eab13c5 Author: James Buren <ryuo@frugalware.org> Date: Fri Oct 10 09:27:05 2008 -0500 fvwm-crystal-3.0.6-1-i686 * up2date fix diff --git a/source/x11-extra/fvwm-crystal/FrugalBuild b/source/x11-extra/fvwm-crystal/FrugalBuild index ebd73e8..5ca4111 100644 --- a/source/x11-extra/fvwm-crystal/FrugalBuild +++ b/source/x11-extra/fvwm-crystal/FrugalBuild @@ -6,7 +6,7 @@ pkgname=fvwm-crystal pkgver=3.0.6 pkgrel=1 pkgdesc="Simple tool that builds FVWM-Crystal Application Panel from a database" -url="http://fvwm-crystal.org/" +url="http://www.fvwm-crystal.org/" license="GPL-2" depends=('infobox' 'habak' 'xmms' 'mpd' 'imagemagick' 'xscreensaver' 'trayer' 'python' 'fvwm-devel') archs=('i686' 'x86_64') From ryuo at frugalware.org Fri Oct 10 16:30:03 2008 From: ryuo at frugalware.org (James Buren) Date: Fri Oct 10 16:30:05 2008 Subject: [Frugalware-git] frugalware-current: fnlib-0.5-4-i686 Message-ID: <20081010143003.F0FB51190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=65bec4f08c98f06056fe7d7cc5b40245b41e8023 commit 65bec4f08c98f06056fe7d7cc5b40245b41e8023 Author: James Buren <ryuo@frugalware.org> Date: Fri Oct 10 09:29:39 2008 -0500 fnlib-0.5-4-i686 * remove old package that is no longer maintained diff --git a/source/xlib-extra/fnlib/FrugalBuild b/source/xlib-extra/fnlib/FrugalBuild deleted file mode 100644 index c94875b..0000000 --- a/source/xlib-extra/fnlib/FrugalBuild +++ /dev/null @@ -1,18 +0,0 @@ -# Compiling Time: 0.02 SBU -# Maintainer: James Buren <ryuo@frugalware.org> - -pkgname=fnlib -pkgver=0.5 -pkgrel=4 -pkgdesc="Font rendering library for X11" -depends=('libxext' 'imlib' 'libpng') -groups=('xlib-extra') -archs=('i686' 'x86_64') -_F_sourceforge_dirname="enlightenment" -Finclude sourceforge -url="http://enlightenment.org" -up2date="lynx -dump http://ftp.heanet.ie/mirrors/download.sourceforge.net/pub/sourceforge/e/en/enlightenment/|Flasttar" -Fconfopts="$Fconfopts --sysconfdir=/etc/fnlib" -sha1sums=('0dd7053e443ea5d22e4864fe6997b77901118335') - -# optimization OK From j3d1f0x at free.fr Fri Oct 10 16:30:55 2008 From: j3d1f0x at free.fr (gholafox) Date: Fri Oct 10 16:30:57 2008 Subject: [Frugalware-git] frugalware-current: rman-3.2-1-i686 Message-ID: <20081010143055.B2D781190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=34533132c7960d638a5fc3233d33b0cb4998c8db commit 34533132c7960d638a5fc3233d33b0cb4998c8db Author: gholafox <j3d1f0x@free.fr> Date: Fri Oct 10 16:30:00 2008 +0200 rman-3.2-1-i686 * Correct a mistake diff --git a/source/apps-extra/rman/FrugalBuild b/source/apps-extra/rman/FrugalBuild index cd50de7..c612675 100644 --- a/source/apps-extra/rman/FrugalBuild +++ b/source/apps-extra/rman/FrugalBuild @@ -1,6 +1,6 @@ # Compiling Time: 0.01 SBU # Maintainer: gholafox <j3d1f0x@free.fr> -# Contributorr: AlexExtreme <alex@alex-smith.me.uk> +# Contributor: AlexExtreme <alex@alex-smith.me.uk> pkgname=rman pkgver=3.2 From vmiklos at frugalware.org Fri Oct 10 17:06:33 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 10 17:06:35 2008 Subject: [Frugalware-git] homepage-ng: FSA531-drupal Message-ID: <20081010150633.D2D751190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=4ef2e64cec71bbd39f725206391d4066b9b50271 commit 4ef2e64cec71bbd39f725206391d4066b9b50271 Author: Miklos Vajna <vmiklos@frugalware.org> Date: Fri Oct 10 17:06:30 2008 +0200 FSA531-drupal diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index be5885e..349e0fc 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -26,6 +26,20 @@ <fsas> <fsa> + <id>531</id> + <date>2008-10-10</date> + <author>Miklos Vajna</author> + <package>drupal</package> + <vulnerable>5.10-1</vulnerable> + <unaffected>5.11-1solaria1</unaffected> + <bts>http://bugs.frugalware.org/task/3392</bts> + <cve>No CVE, see http://drupal.org/node/318706</cve> + <desc>Two vulnerabilities have been reported in Drupal, which can be exploited by malicious people and users to bypass certain security restrictions. + 1) A vulnerability is caused due to improper access restriction in the core upload module. This can be exploited to retrieve files attached to content, without valid credentials for accessing the content itself. + Successful exploitation of this vulnerability requires valid user credentials and that the core upload module is enabled. + 2) A vulnerability is caused due to improper access restriction in the node module API. This can be exploited to bypass node validation under some unspecified circumstances. No further information is currently available.</desc> + </fsa> + <fsa> <id>530</id> <date>2008-10-08</date> <author>Miklos Vajna</author> From vmiklos at frugalware.org Fri Oct 10 17:09:14 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 10 17:09:15 2008 Subject: [Frugalware-git] homepage-ng: FSA532-drupal6 Message-ID: <20081010150914.42ADE1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=d6c7bc5fc94aa17b6076d6534124868e04cef2e4 commit d6c7bc5fc94aa17b6076d6534124868e04cef2e4 Author: Miklos Vajna <vmiklos@frugalware.org> Date: Fri Oct 10 17:09:12 2008 +0200 FSA532-drupal6 diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 349e0fc..802e67d 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -26,6 +26,19 @@ <fsas> <fsa> + <id>532</id> + <date>2008-10-10</date> + <author>Miklos Vajna</author> + <package>drupal6</package> + <vulnerable>6.4-1</vulnerable> + <unaffected>6.5-1solaria1</unaffected> + <bts>http://bugs.frugalware.org/task/3393</bts> + <cve>No CVE, see http://drupal.org/node/318706</cve> + <desc>A vulnerability has been reported in Drupal, which can be exploited by malicious people to bypass certain security restrictions. +The vulnerability is caused due to improper access restriction in the core upload module. This can be exploited to attach arbitrary files to content, without valid credentials. +Successful exploitation requires that the core upload module is enabled.</desc> + </fsa> + <fsa> <id>531</id> <date>2008-10-10</date> <author>Miklos Vajna</author> From vmiklos at frugalware.org Fri Oct 10 17:12:13 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 10 17:12:14 2008 Subject: [Frugalware-git] frugalware-current: dovecot-1.1.4-1-i686 Message-ID: <20081010151213.E15581190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=33123a576757a1ebf9f2f98d4ff4c53cd5eafccc commit 33123a576757a1ebf9f2f98d4ff4c53cd5eafccc Author: Miklos Vajna <vmiklos@frugalware.org> Date: Fri Oct 10 17:11:51 2008 +0200 dovecot-1.1.4-1-i686 - version bump - closes #3387 diff --git a/source/network-extra/dovecot/FrugalBuild b/source/network-extra/dovecot/FrugalBuild index ae55555..28b7d81 100644 --- a/source/network-extra/dovecot/FrugalBuild +++ b/source/network-extra/dovecot/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Krisztian VASAS <iron@frugalware.org> pkgname=dovecot -pkgver=1.1.3 +pkgver=1.1.4 pkgrel=1 mainver=${pkgver%.*} pkgdesc="An open source IMAP and POP3 server, written with security primarily in mind." @@ -15,7 +15,7 @@ up2date="lynx -dump $url | grep 'Released v' | sed -ne 's/.*\ v\(.*\)\.$/\1/; 1 source=("${url}/releases/${mainver}/${pkgname}-${pkgver}.tar.gz" \ "rc.$pkgname" \ "rc.$pkgname-hu.po" ) -sha1sums=('a46a4bdb3d6fb86d74458c1e375cf71ff4503189' \ +sha1sums=('576d0d1323b77e7820f284fae788a98d174098f8' \ 'c463e6736b9e9ea4dc854ee247737d0fc113c7cb' \ 'cfa557ab1d6d0931f8969ab797b1fbf31cecf88f') install="$pkgname.install" From vmiklos at frugalware.org Fri Oct 10 17:54:54 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 10 17:54:56 2008 Subject: [Frugalware-git] frugalware-current: jasper-1.900.1-3-i686 Message-ID: <20081010155454.1F7221190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d32a54c73d62cec17f80d92ad598c6ee39c69b71 commit d32a54c73d62cec17f80d92ad598c6ee39c69b71 Author: Miklos Vajna <vmiklos@frugalware.org> Date: Fri Oct 10 17:54:27 2008 +0200 jasper-1.900.1-3-i686 - added CVE-2008-3520.patch - closes #3396 diff --git a/source/xlib/jasper/CVE-2008-3520.patch b/source/xlib/jasper/CVE-2008-3520.patch new file mode 100644 index 0000000..0c69c79 --- /dev/null +++ b/source/xlib/jasper/CVE-2008-3520.patch @@ -0,0 +1,835 @@ +--- src/libjasper/base/jas_cm.c ++++ src/libjasper/base/jas_cm.c +@@ -704,8 +704,7 @@ + { + jas_cmpxform_t **p; + assert(n >= pxformseq->numpxforms); +- p = (!pxformseq->pxforms) ? jas_malloc(n * sizeof(jas_cmpxform_t *)) : +- jas_realloc(pxformseq->pxforms, n * sizeof(jas_cmpxform_t *)); ++ p = jas_realloc2(pxformseq->pxforms, n, sizeof(jas_cmpxform_t *)); + if (!p) { + return -1; + } +@@ -889,13 +888,13 @@ + jas_cmshapmatlut_cleanup(lut); + if (curv->numents == 0) { + lut->size = 2; +- if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t)))) ++ if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t)))) + goto error; + lut->data[0] = 0.0; + lut->data[1] = 1.0; + } else if (curv->numents == 1) { + lut->size = 256; +- if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t)))) ++ if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t)))) + goto error; + gamma = curv->ents[0] / 256.0; + for (i = 0; i < lut->size; ++i) { +@@ -903,7 +902,7 @@ + } + } else { + lut->size = curv->numents; +- if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t)))) ++ if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t)))) + goto error; + for (i = 0; i < lut->size; ++i) { + lut->data[i] = curv->ents[i] / 65535.0; +@@ -953,7 +952,7 @@ + return -1; + } + } +- if (!(invlut->data = jas_malloc(n * sizeof(jas_cmreal_t)))) ++ if (!(invlut->data = jas_alloc2(n, sizeof(jas_cmreal_t)))) + return -1; + invlut->size = n; + for (i = 0; i < invlut->size; ++i) { +--- src/libjasper/base/jas_icc.c ++++ src/libjasper/base/jas_icc.c +@@ -373,7 +373,7 @@ + jas_icctagtab_t *tagtab; + + tagtab = &prof->tagtab; +- if (!(tagtab->ents = jas_malloc(prof->attrtab->numattrs * ++ if (!(tagtab->ents = jas_alloc2(prof->attrtab->numattrs, + sizeof(jas_icctagtabent_t)))) + goto error; + tagtab->numents = prof->attrtab->numattrs; +@@ -522,7 +522,7 @@ + } + if (jas_iccgetuint32(in, &tagtab->numents)) + goto error; +- if (!(tagtab->ents = jas_malloc(tagtab->numents * ++ if (!(tagtab->ents = jas_alloc2(tagtab->numents, + sizeof(jas_icctagtabent_t)))) + goto error; + tagtabent = tagtab->ents; +@@ -743,8 +743,7 @@ + { + jas_iccattr_t *newattrs; + assert(maxents >= tab->numattrs); +- newattrs = tab->attrs ? jas_realloc(tab->attrs, maxents * +- sizeof(jas_iccattr_t)) : jas_malloc(maxents * sizeof(jas_iccattr_t)); ++ newattrs = jas_realloc2(tab->attrs, maxents, sizeof(jas_iccattr_t)); + if (!newattrs) + return -1; + tab->attrs = newattrs; +@@ -999,7 +998,7 @@ + + if (jas_iccgetuint32(in, &curv->numents)) + goto error; +- if (!(curv->ents = jas_malloc(curv->numents * sizeof(jas_iccuint16_t)))) ++ if (!(curv->ents = jas_alloc2(curv->numents, sizeof(jas_iccuint16_t)))) + goto error; + for (i = 0; i < curv->numents; ++i) { + if (jas_iccgetuint16(in, &curv->ents[i])) +@@ -1100,7 +1099,7 @@ + if (jas_iccgetuint32(in, &txtdesc->uclangcode) || + jas_iccgetuint32(in, &txtdesc->uclen)) + goto error; +- if (!(txtdesc->ucdata = jas_malloc(txtdesc->uclen * 2))) ++ if (!(txtdesc->ucdata = jas_alloc2(txtdesc->uclen, 2))) + goto error; + if (jas_stream_read(in, txtdesc->ucdata, txtdesc->uclen * 2) != + JAS_CAST(int, txtdesc->uclen * 2)) +@@ -1292,17 +1291,17 @@ + jas_iccgetuint16(in, &lut8->numouttabents)) + goto error; + clutsize = jas_iccpowi(lut8->clutlen, lut8->numinchans) * lut8->numoutchans; +- if (!(lut8->clut = jas_malloc(clutsize * sizeof(jas_iccuint8_t))) || +- !(lut8->intabsbuf = jas_malloc(lut8->numinchans * +- lut8->numintabents * sizeof(jas_iccuint8_t))) || +- !(lut8->intabs = jas_malloc(lut8->numinchans * ++ if (!(lut8->clut = jas_alloc2(clutsize, sizeof(jas_iccuint8_t))) || ++ !(lut8->intabsbuf = jas_alloc3(lut8->numinchans, ++ lut8->numintabents, sizeof(jas_iccuint8_t))) || ++ !(lut8->intabs = jas_alloc2(lut8->numinchans, + sizeof(jas_iccuint8_t *)))) + goto error; + for (i = 0; i < lut8->numinchans; ++i) + lut8->intabs[i] = &lut8->intabsbuf[i * lut8->numintabents]; +- if (!(lut8->outtabsbuf = jas_malloc(lut8->numoutchans * +- lut8->numouttabents * sizeof(jas_iccuint8_t))) || +- !(lut8->outtabs = jas_malloc(lut8->numoutchans * ++ if (!(lut8->outtabsbuf = jas_alloc3(lut8->numoutchans, ++ lut8->numouttabents, sizeof(jas_iccuint8_t))) || ++ !(lut8->outtabs = jas_alloc2(lut8->numoutchans, + sizeof(jas_iccuint8_t *)))) + goto error; + for (i = 0; i < lut8->numoutchans; ++i) +@@ -1461,17 +1460,17 @@ + jas_iccgetuint16(in, &lut16->numouttabents)) + goto error; + clutsize = jas_iccpowi(lut16->clutlen, lut16->numinchans) * lut16->numoutchans; +- if (!(lut16->clut = jas_malloc(clutsize * sizeof(jas_iccuint16_t))) || ++ if (!(lut16->clut = jas_alloc2(clutsize, sizeof(jas_iccuint16_t))) || + !(lut16->intabsbuf = jas_malloc(lut16->numinchans * + lut16->numintabents * sizeof(jas_iccuint16_t))) || +- !(lut16->intabs = jas_malloc(lut16->numinchans * ++ !(lut16->intabs = jas_alloc2(lut16->numinchans, + sizeof(jas_iccuint16_t *)))) + goto error; + for (i = 0; i < lut16->numinchans; ++i) + lut16->intabs[i] = &lut16->intabsbuf[i * lut16->numintabents]; +- if (!(lut16->outtabsbuf = jas_malloc(lut16->numoutchans * +- lut16->numouttabents * sizeof(jas_iccuint16_t))) || +- !(lut16->outtabs = jas_malloc(lut16->numoutchans * ++ if (!(lut16->outtabsbuf = jas_alloc3(lut16->numoutchans, ++ lut16->numouttabents, sizeof(jas_iccuint16_t))) || ++ !(lut16->outtabs = jas_alloc2(lut16->numoutchans, + sizeof(jas_iccuint16_t *)))) + goto error; + for (i = 0; i < lut16->numoutchans; ++i) +--- src/libjasper/base/jas_image.c ++++ src/libjasper/base/jas_image.c +@@ -142,7 +142,7 @@ + image->inmem_ = true; + + /* Allocate memory for the per-component information. */ +- if (!(image->cmpts_ = jas_malloc(image->maxcmpts_ * ++ if (!(image->cmpts_ = jas_alloc2(image->maxcmpts_, + sizeof(jas_image_cmpt_t *)))) { + jas_image_destroy(image); + return 0; +@@ -774,8 +774,7 @@ + jas_image_cmpt_t **newcmpts; + int cmptno; + +- newcmpts = (!image->cmpts_) ? jas_malloc(maxcmpts * sizeof(jas_image_cmpt_t *)) : +- jas_realloc(image->cmpts_, maxcmpts * sizeof(jas_image_cmpt_t *)); ++ newcmpts = jas_realloc2(image->cmpts_, maxcmpts, sizeof(jas_image_cmpt_t *)); + if (!newcmpts) { + return -1; + } +--- src/libjasper/base/jas_malloc.c ++++ src/libjasper/base/jas_malloc.c +@@ -76,6 +76,9 @@ + + /* We need the prototype for memset. */ + #include <string.h> ++#include <limits.h> ++#include <errno.h> ++#include <stdint.h> + + #include "jasper/jas_malloc.h" + +@@ -113,18 +116,50 @@ + + void *jas_realloc(void *ptr, size_t size) + { +- return realloc(ptr, size); ++ return ptr ? realloc(ptr, size) : malloc(size); + } + +-void *jas_calloc(size_t nmemb, size_t size) ++void *jas_realloc2(void *ptr, size_t nmemb, size_t size) ++{ ++ if (!ptr) ++ return jas_alloc2(nmemb, size); ++ if (nmemb && SIZE_MAX / nmemb < size) { ++ errno = ENOMEM; ++ return NULL; ++ } ++ return jas_realloc(ptr, nmemb * size); ++ ++} ++ ++void *jas_alloc2(size_t nmemb, size_t size) ++{ ++ if (nmemb && SIZE_MAX / nmemb < size) { ++ errno = ENOMEM; ++ return NULL; ++ } ++ ++ return jas_malloc(nmemb * size); ++} ++ ++void *jas_alloc3(size_t a, size_t b, size_t c) + { +- void *ptr; + size_t n; +- n = nmemb * size; +- if (!(ptr = jas_malloc(n * sizeof(char)))) { +- return 0; ++ ++ if (a && SIZE_MAX / a < b) { ++ errno = ENOMEM; ++ return NULL; + } +- memset(ptr, 0, n); ++ ++ return jas_alloc2(a*b, c); ++} ++ ++void *jas_calloc(size_t nmemb, size_t size) ++{ ++ void *ptr; ++ ++ ptr = jas_alloc2(nmemb, size); ++ if (ptr) ++ memset(ptr, 0, nmemb*size); + return ptr; + } + +--- src/libjasper/base/jas_seq.c ++++ src/libjasper/base/jas_seq.c +@@ -114,7 +114,7 @@ + matrix->datasize_ = numrows * numcols; + + if (matrix->maxrows_ > 0) { +- if (!(matrix->rows_ = jas_malloc(matrix->maxrows_ * ++ if (!(matrix->rows_ = jas_alloc2(matrix->maxrows_, + sizeof(jas_seqent_t *)))) { + jas_matrix_destroy(matrix); + return 0; +@@ -122,7 +122,7 @@ + } + + if (matrix->datasize_ > 0) { +- if (!(matrix->data_ = jas_malloc(matrix->datasize_ * ++ if (!(matrix->data_ = jas_alloc2(matrix->datasize_, + sizeof(jas_seqent_t)))) { + jas_matrix_destroy(matrix); + return 0; +@@ -220,7 +220,7 @@ + mat0->numrows_ = r1 - r0 + 1; + mat0->numcols_ = c1 - c0 + 1; + mat0->maxrows_ = mat0->numrows_; +- mat0->rows_ = jas_malloc(mat0->maxrows_ * sizeof(jas_seqent_t *)); ++ mat0->rows_ = jas_alloc2(mat0->maxrows_, sizeof(jas_seqent_t *)); + for (i = 0; i < mat0->numrows_; ++i) { + mat0->rows_[i] = mat1->rows_[r0 + i] + c0; + } +@@ -432,7 +432,8 @@ + for (i = 0; i < jas_matrix_numrows(matrix); ++i) { + for (j = 0; j < jas_matrix_numcols(matrix); ++j) { + x = jas_matrix_get(matrix, i, j); +- sprintf(sbuf, "%s%4ld", (strlen(buf) > 0) ? " " : "", ++ snprintf(sbuf, sizeof sbuf, ++ "%s%4ld", (strlen(buf) > 0) ? " " : "", + JAS_CAST(long, x)); + n = strlen(buf); + if (n + strlen(sbuf) > MAXLINELEN) { +--- src/libjasper/base/jas_stream.c ++++ src/libjasper/base/jas_stream.c +@@ -212,7 +212,7 @@ + if (buf) { + obj->buf_ = (unsigned char *) buf; + } else { +- obj->buf_ = jas_malloc(obj->bufsize_ * sizeof(char)); ++ obj->buf_ = jas_malloc(obj->bufsize_); + obj->myalloc_ = 1; + } + if (!obj->buf_) { +@@ -361,28 +361,22 @@ + } + obj->fd = -1; + obj->flags = 0; +- obj->pathname[0] = '\0'; + stream->obj_ = obj; + + /* Choose a file name. */ +- tmpnam(obj->pathname); ++ snprintf(obj->pathname, L_tmpnam, "%stmp.XXXXXXXXXX", P_tmpdir); + + /* Open the underlying file. */ +- if ((obj->fd = open(obj->pathname, O_CREAT | O_EXCL | O_RDWR | O_TRUNC | O_BINARY, +- JAS_STREAM_PERMS)) < 0) { ++ if ((obj->fd = mkstemp(obj->pathname)) < 0) { + jas_stream_destroy(stream); + return 0; + } + + /* Unlink the file so that it will disappear if the program + terminates abnormally. */ +- /* Under UNIX, one can unlink an open file and continue to do I/O +- on it. Not all operating systems support this functionality, however. +- For example, under Microsoft Windows the unlink operation will fail, +- since the file is open. */ + if (unlink(obj->pathname)) { +- /* We will try unlinking the file again after it is closed. */ +- obj->flags |= JAS_STREAM_FILEOBJ_DELONCLOSE; ++ jas_stream_destroy(stream); ++ return 0; + } + + /* Use full buffering. */ +@@ -553,7 +547,7 @@ + int ret; + + va_start(ap, fmt); +- ret = vsprintf(buf, fmt, ap); ++ ret = vsnprintf(buf, sizeof buf, fmt, ap); + jas_stream_puts(stream, buf); + va_end(ap); + return ret; +@@ -992,7 +986,7 @@ + unsigned char *buf; + + assert(m->buf_); +- if (!(buf = jas_realloc(m->buf_, bufsize * sizeof(unsigned char)))) { ++ if (!(buf = jas_realloc(m->buf_, bufsize))) { + return -1; + } + m->buf_ = buf; +--- src/libjasper/bmp/bmp_dec.c ++++ src/libjasper/bmp/bmp_dec.c +@@ -283,7 +283,7 @@ + } + + if (info->numcolors > 0) { +- if (!(info->palents = jas_malloc(info->numcolors * ++ if (!(info->palents = jas_alloc2(info->numcolors, + sizeof(bmp_palent_t)))) { + bmp_info_destroy(info); + return 0; +--- src/libjasper/include/jasper/jas_malloc.h ++++ src/libjasper/include/jasper/jas_malloc.h +@@ -95,6 +95,9 @@ + #define jas_free MEMFREE + #define jas_realloc MEMREALLOC + #define jas_calloc MEMCALLOC ++#define jas_alloc2(a, b) MEMALLOC((a)*(b)) ++#define jas_alloc3(a, b, c) MEMALLOC((a)*(b)*(c)) ++#define jas_realloc2(p, a, b) MEMREALLOC((p), (a)*(b)) + #endif + + /******************************************************************************\ +@@ -115,6 +118,12 @@ + /* Allocate a block of memory and initialize the contents to zero. */ + void *jas_calloc(size_t nmemb, size_t size); + ++/* size-checked double allocation .*/ ++void *jas_alloc2(size_t, size_t); ++ ++void *jas_alloc3(size_t, size_t, size_t); ++ ++void *jas_realloc2(void *, size_t, size_t); + #endif + + #ifdef __cplusplus +--- src/libjasper/jp2/jp2_cod.c ++++ src/libjasper/jp2/jp2_cod.c +@@ -795,11 +795,15 @@ + jp2_cmap_t *cmap = &box->data.cmap; + unsigned int i; + jp2_cmapent_t *ent; +- fprintf(out, "numchans = %d\n", (int) cmap->numchans); ++ if (jas_getdbglevel() >= 1) { ++ fprintf(out, "numchans = %d\n", (int) cmap->numchans); ++ } + for (i = 0; i < cmap->numchans; ++i) { + ent = &cmap->ents[i]; +- fprintf(out, "cmptno=%d; map=%d; pcol=%d\n", +- (int) ent->cmptno, (int) ent->map, (int) ent->pcol); ++ if (jas_getdbglevel() >= 1) { ++ fprintf(out, "cmptno=%d; map=%d; pcol=%d\n", ++ (int) ent->cmptno, (int) ent->map, (int) ent->pcol); ++ } + } + } + +--- src/libjasper/jp2/jp2_dec.c ++++ src/libjasper/jp2/jp2_dec.c +@@ -293,7 +293,9 @@ + dec->colr->data.colr.iccplen); + assert(iccprof); + jas_iccprof_gethdr(iccprof, &icchdr); +- jas_eprintf("ICC Profile CS %08x\n", icchdr.colorspc); ++ if (jas_getdbglevel() >= 1) { ++ jas_eprintf("ICC Profile CS %08x\n", icchdr.colorspc); ++ } + jas_image_setclrspc(dec->image, fromiccpcs(icchdr.colorspc)); + dec->image->cmprof_ = jas_cmprof_createfromiccprof(iccprof); + assert(dec->image->cmprof_); +--- src/libjasper/jp2/jp2_enc.c ++++ src/libjasper/jp2/jp2_enc.c +@@ -191,7 +191,7 @@ + } + bpcc = &box->data.bpcc; + bpcc->numcmpts = jas_image_numcmpts(image); +- if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts * ++ if (!(bpcc->bpcs = jas_alloc2(bpcc->numcmpts, + sizeof(uint_fast8_t)))) { + goto error; + } +@@ -285,7 +285,7 @@ + } + cdef = &box->data.cdef; + cdef->numchans = jas_image_numcmpts(image); +- cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t)); ++ cdef->ents = jas_alloc2(cdef->numchans, sizeof(jp2_cdefchan_t)); + for (i = 0; i < jas_image_numcmpts(image); ++i) { + cdefchanent = &cdef->ents[i]; + cdefchanent->channo = i; +@@ -343,7 +343,8 @@ + /* Output the JPEG-2000 code stream. */ + + overhead = jas_stream_getrwcount(out); +- sprintf(buf, "%s\n_jp2overhead=%lu\n", (optstr ? optstr : ""), ++ snprintf(buf, sizeof buf, "%s\n_jp2overhead=%lu\n", ++ (optstr ? optstr : ""), + (unsigned long) overhead); + + if (jpc_encode(image, out, buf)) { +--- src/libjasper/jpc/jpc_cs.c ++++ src/libjasper/jpc/jpc_cs.c +@@ -502,7 +502,7 @@ + !siz->tileheight || !siz->numcomps) { + return -1; + } +- if (!(siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t)))) { ++ if (!(siz->comps = jas_alloc2(siz->numcomps, sizeof(jpc_sizcomp_t)))) { + return -1; + } + for (i = 0; i < siz->numcomps; ++i) { +@@ -986,7 +986,7 @@ + jpc_qcx_destroycompparms(compparms); + return -1; + } else if (compparms->numstepsizes > 0) { +- compparms->stepsizes = jas_malloc(compparms->numstepsizes * ++ compparms->stepsizes = jas_alloc2(compparms->numstepsizes, + sizeof(uint_fast16_t)); + assert(compparms->stepsizes); + for (i = 0; i < compparms->numstepsizes; ++i) { +@@ -1094,7 +1094,7 @@ + + ppm->len = ms->len - 1; + if (ppm->len > 0) { +- if (!(ppm->data = jas_malloc(ppm->len * sizeof(unsigned char)))) { ++ if (!(ppm->data = jas_malloc(ppm->len))) { + goto error; + } + if (JAS_CAST(uint, jas_stream_read(in, ppm->data, ppm->len)) != ppm->len) { +@@ -1163,7 +1163,7 @@ + } + ppt->len = ms->len - 1; + if (ppt->len > 0) { +- if (!(ppt->data = jas_malloc(ppt->len * sizeof(unsigned char)))) { ++ if (!(ppt->data = jas_malloc(ppt->len))) { + goto error; + } + if (jas_stream_read(in, (char *) ppt->data, ppt->len) != JAS_CAST(int, ppt->len)) { +@@ -1226,7 +1226,7 @@ + uint_fast8_t tmp; + poc->numpchgs = (cstate->numcomps > 256) ? (ms->len / 9) : + (ms->len / 7); +- if (!(poc->pchgs = jas_malloc(poc->numpchgs * sizeof(jpc_pocpchg_t)))) { ++ if (!(poc->pchgs = jas_alloc2(poc->numpchgs, sizeof(jpc_pocpchg_t)))) { + goto error; + } + for (pchgno = 0, pchg = poc->pchgs; pchgno < poc->numpchgs; ++pchgno, +@@ -1331,7 +1331,7 @@ + jpc_crgcomp_t *comp; + uint_fast16_t compno; + crg->numcomps = cstate->numcomps; +- if (!(crg->comps = jas_malloc(cstate->numcomps * sizeof(uint_fast16_t)))) { ++ if (!(crg->comps = jas_alloc2(cstate->numcomps, sizeof(uint_fast16_t)))) { + return -1; + } + for (compno = 0, comp = crg->comps; compno < cstate->numcomps; +@@ -1470,7 +1470,7 @@ + cstate = 0; + + if (ms->len > 0) { +- if (!(unk->data = jas_malloc(ms->len * sizeof(unsigned char)))) { ++ if (!(unk->data = jas_malloc(ms->len))) { + return -1; + } + if (jas_stream_read(in, (char *) unk->data, ms->len) != JAS_CAST(int, ms->len)) { +--- src/libjasper/jpc/jpc_dec.c ++++ src/libjasper/jpc/jpc_dec.c +@@ -1466,7 +1466,9 @@ + dec = 0; + + jas_eprintf("warning: ignoring unknown marker segment\n"); +- jpc_ms_dump(ms, stderr); ++ if (jas_getdbglevel() >= 1) { ++ jpc_ms_dump(ms, stderr); ++ } + return 0; + } + +--- src/libjasper/jpc/jpc_enc.c ++++ src/libjasper/jpc/jpc_enc.c +@@ -403,7 +403,7 @@ + vsteplcm *= jas_image_cmptvstep(image, cmptno); + } + +- if (!(cp->ccps = jas_malloc(cp->numcmpts * sizeof(jpc_enc_ccp_t)))) { ++ if (!(cp->ccps = jas_alloc2(cp->numcmpts, sizeof(jpc_enc_ccp_t)))) { + goto error; + } + for (cmptno = 0, ccp = cp->ccps; cmptno < JAS_CAST(int, cp->numcmpts); ++cmptno, +@@ -656,7 +656,7 @@ + + if (ilyrrates && numilyrrates > 0) { + tcp->numlyrs = numilyrrates + 1; +- if (!(tcp->ilyrrates = jas_malloc((tcp->numlyrs - 1) * ++ if (!(tcp->ilyrrates = jas_alloc2((tcp->numlyrs - 1), + sizeof(jpc_fix_t)))) { + goto error; + } +@@ -940,7 +940,7 @@ + siz->tilewidth = cp->tilewidth; + siz->tileheight = cp->tileheight; + siz->numcomps = cp->numcmpts; +- siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t)); ++ siz->comps = jas_alloc2(siz->numcomps, sizeof(jpc_sizcomp_t)); + assert(siz->comps); + for (i = 0; i < JAS_CAST(int, cp->numcmpts); ++i) { + siz->comps[i].prec = cp->ccps[i].prec; +@@ -958,7 +958,8 @@ + if (!(enc->mrk = jpc_ms_create(JPC_MS_COM))) { + return -1; + } +- sprintf(buf, "Creator: JasPer Version %s", jas_getversion()); ++ snprintf(buf, sizeof buf, "Creator: JasPer Version %s", ++ jas_getversion()); + com = &enc->mrk->parms.com; + com->len = strlen(buf); + com->regid = JPC_COM_LATIN; +@@ -977,7 +978,7 @@ + return -1; + } + crg = &enc->mrk->parms.crg; +- crg->comps = jas_malloc(crg->numcomps * sizeof(jpc_crgcomp_t)); ++ crg->comps = jas_alloc2(crg->numcomps, sizeof(jpc_crgcomp_t)); + if (jpc_putms(enc->out, enc->cstate, enc->mrk)) { + jas_eprintf("cannot write CRG marker\n"); + return -1; +@@ -1955,7 +1956,7 @@ + tile->mctid = cp->tcp.mctid; + + tile->numlyrs = cp->tcp.numlyrs; +- if (!(tile->lyrsizes = jas_malloc(tile->numlyrs * ++ if (!(tile->lyrsizes = jas_alloc2(tile->numlyrs, + sizeof(uint_fast32_t)))) { + goto error; + } +@@ -1964,7 +1965,7 @@ + } + + /* Allocate an array for the per-tile-component information. */ +- if (!(tile->tcmpts = jas_malloc(cp->numcmpts * sizeof(jpc_enc_tcmpt_t)))) { ++ if (!(tile->tcmpts = jas_alloc2(cp->numcmpts, sizeof(jpc_enc_tcmpt_t)))) { + goto error; + } + /* Initialize a few members critical for error recovery. */ +@@ -2110,7 +2111,7 @@ + jas_seq2d_ystart(tcmpt->data), jas_seq2d_xend(tcmpt->data), + jas_seq2d_yend(tcmpt->data), bandinfos); + +- if (!(tcmpt->rlvls = jas_malloc(tcmpt->numrlvls * sizeof(jpc_enc_rlvl_t)))) { ++ if (!(tcmpt->rlvls = jas_alloc2(tcmpt->numrlvls, sizeof(jpc_enc_rlvl_t)))) { + goto error; + } + for (rlvlno = 0, rlvl = tcmpt->rlvls; rlvlno < tcmpt->numrlvls; +@@ -2213,7 +2214,7 @@ + rlvl->numvprcs = JPC_FLOORDIVPOW2(brprcbry - tlprctly, rlvl->prcheightexpn); + rlvl->numprcs = rlvl->numhprcs * rlvl->numvprcs; + +- if (!(rlvl->bands = jas_malloc(rlvl->numbands * sizeof(jpc_enc_band_t)))) { ++ if (!(rlvl->bands = jas_alloc2(rlvl->numbands, sizeof(jpc_enc_band_t)))) { + goto error; + } + for (bandno = 0, band = rlvl->bands; bandno < rlvl->numbands; +@@ -2290,7 +2291,7 @@ + band->synweight = bandinfo->synenergywt; + + if (band->data) { +- if (!(band->prcs = jas_malloc(rlvl->numprcs * sizeof(jpc_enc_prc_t)))) { ++ if (!(band->prcs = jas_alloc2(rlvl->numprcs, sizeof(jpc_enc_prc_t)))) { + goto error; + } + for (prcno = 0, prc = band->prcs; prcno < rlvl->numprcs; ++prcno, +@@ -2422,7 +2423,7 @@ + goto error; + } + +- if (!(prc->cblks = jas_malloc(prc->numcblks * sizeof(jpc_enc_cblk_t)))) { ++ if (!(prc->cblks = jas_alloc2(prc->numcblks, sizeof(jpc_enc_cblk_t)))) { + goto error; + } + for (cblkno = 0, cblk = prc->cblks; cblkno < prc->numcblks; +--- src/libjasper/jpc/jpc_mqdec.c ++++ src/libjasper/jpc/jpc_mqdec.c +@@ -118,7 +118,7 @@ + mqdec->in = in; + mqdec->maxctxs = maxctxs; + /* Allocate memory for the per-context state information. */ +- if (!(mqdec->ctxs = jas_malloc(mqdec->maxctxs * sizeof(jpc_mqstate_t *)))) { ++ if (!(mqdec->ctxs = jas_alloc2(mqdec->maxctxs, sizeof(jpc_mqstate_t *)))) { + goto error; + } + /* Set the current context to the first context. */ +--- src/libjasper/jpc/jpc_mqenc.c ++++ src/libjasper/jpc/jpc_mqenc.c +@@ -197,7 +197,7 @@ + mqenc->maxctxs = maxctxs; + + /* Allocate memory for the per-context state information. */ +- if (!(mqenc->ctxs = jas_malloc(mqenc->maxctxs * sizeof(jpc_mqstate_t *)))) { ++ if (!(mqenc->ctxs = jas_alloc2(mqenc->maxctxs, sizeof(jpc_mqstate_t *)))) { + goto error; + } + +--- src/libjasper/jpc/jpc_qmfb.c ++++ src/libjasper/jpc/jpc_qmfb.c +@@ -321,7 +321,7 @@ + #if !defined(HAVE_VLA) + /* Get a buffer. */ + if (bufsize > QMFB_SPLITBUFSIZE) { +- if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) { ++ if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { + /* We have no choice but to commit suicide in this case. */ + abort(); + } +@@ -389,7 +389,7 @@ + #if !defined(HAVE_VLA) + /* Get a buffer. */ + if (bufsize > QMFB_SPLITBUFSIZE) { +- if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) { ++ if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { + /* We have no choice but to commit suicide in this case. */ + abort(); + } +@@ -460,7 +460,7 @@ + #if !defined(HAVE_VLA) + /* Get a buffer. */ + if (bufsize > QMFB_SPLITBUFSIZE) { +- if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) { ++ if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { + /* We have no choice but to commit suicide in this case. */ + abort(); + } +@@ -549,7 +549,7 @@ + #if !defined(HAVE_VLA) + /* Get a buffer. */ + if (bufsize > QMFB_SPLITBUFSIZE) { +- if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) { ++ if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { + /* We have no choice but to commit suicide in this case. */ + abort(); + } +@@ -633,7 +633,7 @@ + #if !defined(HAVE_VLA) + /* Allocate memory for the join buffer from the heap. */ + if (bufsize > QMFB_JOINBUFSIZE) { +- if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) { ++ if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { + /* We have no choice but to commit suicide. */ + abort(); + } +@@ -698,7 +698,7 @@ + #if !defined(HAVE_VLA) + /* Allocate memory for the join buffer from the heap. */ + if (bufsize > QMFB_JOINBUFSIZE) { +- if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) { ++ if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { + /* We have no choice but to commit suicide. */ + abort(); + } +@@ -766,7 +766,7 @@ + #if !defined(HAVE_VLA) + /* Allocate memory for the join buffer from the heap. */ + if (bufsize > QMFB_JOINBUFSIZE) { +- if (!(buf = jas_malloc(bufsize * JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) { ++ if (!(buf = jas_alloc2(bufsize, JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) { + /* We have no choice but to commit suicide. */ + abort(); + } +@@ -852,7 +852,7 @@ + #if !defined(HAVE_VLA) + /* Allocate memory for the join buffer from the heap. */ + if (bufsize > QMFB_JOINBUFSIZE) { +- if (!(buf = jas_malloc(bufsize * numcols * sizeof(jpc_fix_t)))) { ++ if (!(buf = jas_alloc3(bufsize, numcols, sizeof(jpc_fix_t)))) { + /* We have no choice but to commit suicide. */ + abort(); + } +--- src/libjasper/jpc/jpc_t1enc.c ++++ src/libjasper/jpc/jpc_t1enc.c +@@ -219,7 +219,7 @@ + + cblk->numpasses = (cblk->numbps > 0) ? (3 * cblk->numbps - 2) : 0; + if (cblk->numpasses > 0) { +- cblk->passes = jas_malloc(cblk->numpasses * sizeof(jpc_enc_pass_t)); ++ cblk->passes = jas_alloc2(cblk->numpasses, sizeof(jpc_enc_pass_t)); + assert(cblk->passes); + } else { + cblk->passes = 0; +--- src/libjasper/jpc/jpc_t2cod.c ++++ src/libjasper/jpc/jpc_t2cod.c +@@ -573,7 +573,7 @@ + } + if (pchglist->numpchgs >= pchglist->maxpchgs) { + newmaxpchgs = pchglist->maxpchgs + 128; +- if (!(newpchgs = jas_realloc(pchglist->pchgs, newmaxpchgs * sizeof(jpc_pchg_t *)))) { ++ if (!(newpchgs = jas_realloc2(pchglist->pchgs, newmaxpchgs, sizeof(jpc_pchg_t *)))) { + return -1; + } + pchglist->maxpchgs = newmaxpchgs; +--- src/libjasper/jpc/jpc_t2dec.c ++++ src/libjasper/jpc/jpc_t2dec.c +@@ -478,7 +478,7 @@ + return 0; + } + pi->numcomps = dec->numcomps; +- if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) { ++ if (!(pi->picomps = jas_alloc2(pi->numcomps, sizeof(jpc_picomp_t)))) { + jpc_pi_destroy(pi); + return 0; + } +@@ -490,7 +490,7 @@ + for (compno = 0, tcomp = tile->tcomps, picomp = pi->picomps; + compno < pi->numcomps; ++compno, ++tcomp, ++picomp) { + picomp->numrlvls = tcomp->numrlvls; +- if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls * ++ if (!(picomp->pirlvls = jas_alloc2(picomp->numrlvls, + sizeof(jpc_pirlvl_t)))) { + jpc_pi_destroy(pi); + return 0; +@@ -503,7 +503,7 @@ + rlvlno < picomp->numrlvls; ++rlvlno, ++pirlvl, ++rlvl) { + /* XXX sizeof(long) should be sizeof different type */ + pirlvl->numprcs = rlvl->numprcs; +- if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs * ++ if (!(pirlvl->prclyrnos = jas_alloc2(pirlvl->numprcs, + sizeof(long)))) { + jpc_pi_destroy(pi); + return 0; +--- src/libjasper/jpc/jpc_t2enc.c ++++ src/libjasper/jpc/jpc_t2enc.c +@@ -565,7 +565,7 @@ + } + pi->pktno = -1; + pi->numcomps = cp->numcmpts; +- if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) { ++ if (!(pi->picomps = jas_alloc2(pi->numcomps, sizeof(jpc_picomp_t)))) { + jpc_pi_destroy(pi); + return 0; + } +@@ -577,7 +577,7 @@ + for (compno = 0, tcomp = tile->tcmpts, picomp = pi->picomps; + compno < pi->numcomps; ++compno, ++tcomp, ++picomp) { + picomp->numrlvls = tcomp->numrlvls; +- if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls * ++ if (!(picomp->pirlvls = jas_alloc2(picomp->numrlvls, + sizeof(jpc_pirlvl_t)))) { + jpc_pi_destroy(pi); + return 0; +@@ -591,7 +591,7 @@ + /* XXX sizeof(long) should be sizeof different type */ + pirlvl->numprcs = rlvl->numprcs; + if (rlvl->numprcs) { +- if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs * ++ if (!(pirlvl->prclyrnos = jas_alloc2(pirlvl->numprcs, + sizeof(long)))) { + jpc_pi_destroy(pi); + return 0; +--- src/libjasper/jpc/jpc_tagtree.c ++++ src/libjasper/jpc/jpc_tagtree.c +@@ -125,7 +125,7 @@ + ++numlvls; + } while (n > 1); + +- if (!(tree->nodes_ = jas_malloc(tree->numnodes_ * sizeof(jpc_tagtreenode_t)))) { ++ if (!(tree->nodes_ = jas_alloc2(tree->numnodes_, sizeof(jpc_tagtreenode_t)))) { + return 0; + } + +--- src/libjasper/jpc/jpc_util.c ++++ src/libjasper/jpc/jpc_util.c +@@ -109,7 +109,7 @@ + } + + if (n) { +- if (!(vs = jas_malloc(n * sizeof(double)))) { ++ if (!(vs = jas_alloc2(n, sizeof(double)))) { + return -1; + } + +--- src/libjasper/mif/mif_cod.c ++++ src/libjasper/mif/mif_cod.c +@@ -438,8 +438,7 @@ + int cmptno; + mif_cmpt_t **newcmpts; + assert(maxcmpts >= hdr->numcmpts); +- newcmpts = (!hdr->cmpts) ? jas_malloc(maxcmpts * sizeof(mif_cmpt_t *)) : +- jas_realloc(hdr->cmpts, maxcmpts * sizeof(mif_cmpt_t *)); ++ newcmpts = jas_realloc2(hdr->cmpts, maxcmpts, sizeof(mif_cmpt_t *)); + if (!newcmpts) { + return -1; + } +--- src/libjasper/pnm/pnm_enc.c ++++ src/libjasper/pnm/pnm_enc.c +@@ -374,7 +374,7 @@ + } + } + } else { +- n = sprintf(buf, "%s%ld", ((!(!x && !cmptno)) ? " " : ""), ++ n = snprintf(buf, sizeof buf, "%s%ld", ((!(!x && !cmptno)) ? " " : ""), + (long) v); + if (linelen > 0 && linelen + n > PNM_MAXLINELEN) { + jas_stream_printf(out, "\n"); diff --git a/source/xlib/jasper/FrugalBuild b/source/xlib/jasper/FrugalBuild index 98a27ad..2879b84 100644 --- a/source/xlib/jasper/FrugalBuild +++ b/source/xlib/jasper/FrugalBuild @@ -3,17 +3,19 @@ pkgname=jasper pkgver=1.900.1 -pkgrel=2 +pkgrel=3 pkgdesc="Jasper is a implementation of the codec specified in the JPEG-2000 Part-1 standard." url="http://www.ece.uvic.ca/~mdadams/jasper/" up2date="lynx -dump http://www.ece.uvic.ca/~mdadams/jasper/|grep -m1 'jasper-\(.*\).zip'|sed 's/.*-\(.*\).z.*/\1/'" -source=($url/software/$pkgname-$pkgver.zip jasper-stepsizes-overflow.diff) +source=($url/software/$pkgname-$pkgver.zip jasper-stepsizes-overflow.diff \ + CVE-2008-3520.patch) depends=('libjpeg' 'freeglut') makedepends=('unzip') groups=('xlib') archs=('i686' 'x86_64' 'ppc') Fconfopts="$Fconfopts --enable-shared --disable-static" sha1sums=('9c5735f773922e580bf98c7c7dfda9bbed4c5191' \ - 'f298566fef08c8a589d072582112cd51c72c3983') + 'f298566fef08c8a589d072582112cd51c72c3983' \ + '1cbe124abc3c0dff101362f634c175e6a63892e7') # optimization OK From vmiklos at frugalware.org Fri Oct 10 18:15:40 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 10 18:15:42 2008 Subject: [Frugalware-git] bmf: gnash-bzr9976-1bmf1-ppc Message-ID: <20081010161540.9E6431190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=f92e5a0098ee9d01f0f4e6dac57d6c1d34a57c9e commit f92e5a0098ee9d01f0f4e6dac57d6c1d34a57c9e Author: Miklos Vajna <vmiklos@frugalware.org> Date: Fri Oct 10 18:13:40 2008 +0200 gnash-bzr9976-1bmf1-ppc - update to newer snapshot and replace ffmpeg with gst - this results in a working youtube on ppc :) diff --git a/source/xlib-extra/gnash/FrugalBuild b/source/xlib-extra/gnash/FrugalBuild index 9731f17..03d6933 100644 --- a/source/xlib-extra/gnash/FrugalBuild +++ b/source/xlib-extra/gnash/FrugalBuild @@ -5,12 +5,12 @@ USE_DEVEL=${USE_DEVEL:-"y"} pkgname=gnash pkgver=0.8.3 -Fuse $USE_DEVEL && pkgver=bzr9811 +Fuse $USE_DEVEL && pkgver=bzr9976 pkgrel=1bmf1 pkgdesc="A GNU Flash movie player." url="http://www.gnu.org/software/gnash/" depends=('sdl_mixer' 'cairo' 'libjpeg' 'libxml2' 'libmad' 'boost' 'agg' 'curl' \ - 'gtkglext' 'ffmpeg>=svn15366' 'libboost-mt') + 'gtkglext' 'libboost-mt' 'gstreamer') makedepends=('boost') groups=('xlib-extra') archs=('i686' 'x86_64' 'ppc') @@ -38,8 +38,7 @@ build() fi Fmake --enable-mp3 --enable-plugin \ --with-plugindir=/usr/lib/mozilla/plugins --enable-gui=gtk \ - --enable-visibility --enable-ffmpeg --enable-media=ffmpeg \ - --with-ffmpeg-incl=/usr/include + --enable-visibility --enable-media=gst Fmakeinstall install-plugin } From bouleetbil at frogdev.info Fri Oct 10 18:51:27 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 18:51:29 2008 Subject: [Frugalware-git] frugalware-current: f-spot-0.5.0.2-1-i686 Message-ID: <20081010165127.D21A71190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ccd9e8ed4108eacb9649964fcb37529ade16f828 commit ccd9e8ed4108eacb9649964fcb37529ade16f828 Author: bouleetbil <bouleetbil@frogdev.info> Date: Fri Oct 10 18:48:00 2008 +0200 f-spot-0.5.0.2-1-i686 *version bump diff --git a/source/gnome-extra/f-spot/FrugalBuild b/source/gnome-extra/f-spot/FrugalBuild index 779e4a3..4ede63c 100644 --- a/source/gnome-extra/f-spot/FrugalBuild +++ b/source/gnome-extra/f-spot/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: AlexExtreme <alex@alex-smith.me.uk> pkgname=f-spot -pkgver=0.5.0.1 -pkgrel=2 +pkgver=0.5.0.2 +pkgrel=1 pkgdesc="A personal photo management program for Gnome" url="http://www.gnome.org/projects/f-spot/" depends=('gtk2-sharp' 'lcms' 'libexif' 'libgphoto2' 'libjpeg' 'sqlite3' 'ndesk-dbus' 'ndesk-dbus-glib' 'gnome-sharp>=2.16.0-3' 'gnome-desktop-sharp>=2.24.0-1') @@ -16,7 +16,7 @@ _F_gnome_iconcache=y _F_gnome_scrollkeeper=y _F_gnome_devel=y Finclude gnome mono gnome-scriptlet -sha1sums=('e8f6d2c98243d7ebc717a077a595099cdfb2fc0f') +sha1sums=('8c2c52dc4c660160699650ee0f34ac3f494a4523') build() { Fmonoexport From bouleetbil at frogdev.info Fri Oct 10 20:00:26 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 20:00:28 2008 Subject: [Frugalware-git] frugalware-current: tomboy-0.12.1-1-i686 Message-ID: <20081010180026.AC53A1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2c7f27094db1900b236449988947fa549678dd7f commit 2c7f27094db1900b236449988947fa549678dd7f Author: bouleetbil <bouleetbil@frogdev.info> Date: Fri Oct 10 19:56:27 2008 +0200 tomboy-0.12.1-1-i686 *version bump diff --git a/source/gnome-extra/tomboy/FrugalBuild b/source/gnome-extra/tomboy/FrugalBuild index 77a1c0e..9ad173c 100644 --- a/source/gnome-extra/tomboy/FrugalBuild +++ b/source/gnome-extra/tomboy/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: AlexExtreme <alex@alex-smith.me.uk> pkgname=tomboy -pkgver=0.12.0 -pkgrel=2 +pkgver=0.12.1 +pkgrel=1 pkgdesc="A Wiki style desktop note-taking application" url="http://www.beatniksoftware.com/tomboy" depends=('gnome-sharp' 'gtkspell' 'gnome-panel>=2.20.0' 'galago-sharp' \ @@ -17,7 +17,7 @@ _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" _F_gnome_iconcache="y" Finclude gnome gnome-scriptlet mono -sha1sums=('48cda3ee4aaa108bccd12b141f41dd57fdaaef58') +sha1sums=('4b7f5b2153e6d396ad9ddbb8ef7f41b3f383770d') build() { Fmonoexport From j3d1f0x at free.fr Fri Oct 10 21:01:08 2008 From: j3d1f0x at free.fr (gholafox) Date: Fri Oct 10 21:01:09 2008 Subject: [Frugalware-git] frugalware-current: obby-0.4.6-1-i686 Message-ID: <20081010190108.342611190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5da2814b8d6f4bec1d92cb24ccaa7867509e137f commit 5da2814b8d6f4bec1d92cb24ccaa7867509e137f Author: gholafox <j3d1f0x@free.fr> Date: Fri Oct 10 21:00:32 2008 +0200 obby-0.4.6-1-i686 * Version bump * Change maintainer diff --git a/source/lib-extra/obby/FrugalBuild b/source/lib-extra/obby/FrugalBuild index adc37d6..22c1d50 100644 --- a/source/lib-extra/obby/FrugalBuild +++ b/source/lib-extra/obby/FrugalBuild @@ -1,8 +1,9 @@ -# Compiling Time: 0.49 SBU -# Maintainer: AlexExtreme <alex@alex-smith.me.uk> +# Compiling Time: 0.43 SBU +# Maintainer: gholafox <j3d1f0x@free.fr> +# Contributor: AlexExtreme <alex@alex-smith.me.uk> pkgname=obby -pkgver=0.4.5 +pkgver=0.4.6 pkgrel=1 pkgdesc="libobby is a library which provides synced document buffers." url="http://releases.0x539.de/obby/" @@ -11,7 +12,7 @@ groups=('lib-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url | sed '/latest/d' | sed '/stable/d' | Flasttar" source=($url/$pkgname-$pkgver.tar.gz) -sha1sums=('13a1a1497f1f3b5d8c4271db469573eaa0948b88') +sha1sums=('9a1258dad0da8223f517381715781cd113fca36c') Fconfopts="$Fconfopts --with-zeroconf --enable-ipv6" # optimization OK From j3d1f0x at free.fr Fri Oct 10 21:12:47 2008 From: j3d1f0x at free.fr (gholafox) Date: Fri Oct 10 21:12:48 2008 Subject: [Frugalware-git] frugalware-current: physfs-1.1.1-1-i686 Message-ID: <20081010191247.5033F1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3ccdb305e452d76c30cec557d39ca44b57a62c9f commit 3ccdb305e452d76c30cec557d39ca44b57a62c9f Author: gholafox <j3d1f0x@free.fr> Date: Fri Oct 10 21:12:22 2008 +0200 physfs-1.1.1-1-i686 * Version bump * Change maintainer diff --git a/source/lib-extra/physfs/FrugalBuild b/source/lib-extra/physfs/FrugalBuild index 7c67fe4..154d8df 100644 --- a/source/lib-extra/physfs/FrugalBuild +++ b/source/lib-extra/physfs/FrugalBuild @@ -1,17 +1,19 @@ -# Compiling Time: 0.11 SBU -# Maintainer: AlexExtreme <alex@alex-smith.me.uk> +# Compiling Time: 0.01 SBU +# Maintainer: gholafox <j3d1f0x@free.fr> +# Contributor: AlexExtreme <alex@alex-smith.me.uk> pkgname=physfs -pkgver=1.0.1 +pkgver=1.1.1 pkgrel=1 pkgdesc="PhysicsFS is a library to provide abstract access to various archive" -url="http://icculus.org/physfs/" +url="http://icculus.org/$pkgname" +Finclude cmake +makedepends=('cmake') depends=('zlib' 'readline') groups=('lib-extra') archs=('i686' 'x86_64') -up2date="lynx -dump \"http://svn.icculus.org/physfs/branches/stable-1.0/Doxyfile?view=markup\" | grep 'PROJECT_NUMBER' | grep '=' | sed 's/PROJECT_NUMBER//g' | sed 's/=//g' | sed 's/ //g'" -source=(http://icculus.org/$pkgname/downloads/$pkgname-$pkgver.tar.gz) -sha1sums=('48803ceb60b44a4d3b7511b7a2d66a020d86e95a') -options=('force') +up2date="Flasttar $url/downloads" +source=($url/downloads/$pkgname-$pkgver.tar.gz) +sha1sums=('7d167955732415b61dd93dae1b2419e98cd6419a') # optimization OK From voroskoi at frugalware.org Fri Oct 10 21:44:49 2008 From: voroskoi at frugalware.org (voroskoi) Date: Fri Oct 10 21:44:50 2008 Subject: [Frugalware-git] frugalware-current: mutt-ng-1.5.18-1-i686 Message-ID: <20081010194449.371811190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=972d54804fbf8e1bcf71ec3cab9cecd2a4cafffe commit 972d54804fbf8e1bcf71ec3cab9cecd2a4cafffe Author: voroskoi <voroskoi@frugalware.org> Date: Fri Oct 10 21:01:45 2008 +0200 mutt-ng-1.5.18-1-i686 version bump diff --git a/source/network-extra/mutt-ng/FrugalBuild b/source/network-extra/mutt-ng/FrugalBuild index d3560c9..2332a82 100644 --- a/source/network-extra/mutt-ng/FrugalBuild +++ b/source/network-extra/mutt-ng/FrugalBuild @@ -3,8 +3,8 @@ # Maintainer: voroskoi <voroskoi@frugalware.org> pkgname=mutt-ng -pkgver=1.5.17 -pkgrel=6 +pkgver=1.5.18 +pkgrel=1 pkgdesc="A well-known email client with a set of patches." url="www.mutt.org" groups=('network-extra') @@ -14,7 +14,7 @@ conflicts=('mutt' 'mutt-devel') backup=(etc/Muttrc) up2date="lynx -dump $url/download.html |grep tar |sed -ne 's/.*-\(.*\).t.*/\1/;2p'" source=(ftp://ftp.mutt.org/mutt/devel/mutt-$pkgver.tar.gz \ - http://ftp.frugalware.org/pub/other/sources/mutt-ng/mutt-${pkgver}-patches3.tar.gz) + http://ftp.frugalware.org/pub/other/sources/mutt-ng/mutt-${pkgver}-patches.tar.gz) signatures=($source.asc '') options=('nodocs') unset MAKEFLAGS From voroskoi at frugalware.org Fri Oct 10 21:54:45 2008 From: voroskoi at frugalware.org (voroskoi) Date: Fri Oct 10 21:54:47 2008 Subject: [Frugalware-git] frugalware-current: scons-1.1.0-1-x86_64 Message-ID: <20081010195445.9AA671190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5c0e5b2e0fd710fffbe19355b567be952842a149 commit 5c0e5b2e0fd710fffbe19355b567be952842a149 Author: voroskoi <voroskoi@frugalware.org> Date: Fri Oct 10 21:54:08 2008 +0200 scons-1.1.0-1-x86_64 version bump diff --git a/source/devel-extra/scons/FrugalBuild b/source/devel-extra/scons/FrugalBuild index 772a9cb..eeb3135 100644 --- a/source/devel-extra/scons/FrugalBuild +++ b/source/devel-extra/scons/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi <voroskoi@frugalware.org> pkgname=scons -pkgver=1.0.1 +pkgver=1.1.0 pkgrel=1 pkgdesc="SCons is an Open Source software construction tool, a next-generation build tool." Finclude sourceforge @@ -11,4 +11,4 @@ url="http://www.scons.org/" depends=('python') groups=('devel-extra') archs=('i686' 'x86_64') -sha1sums=('6129dd665d6be1012c4d5762b349157cf92f5a70') +sha1sums=('bb34a048e907f9a0c20f84ecc21a6ea0479fab99') From voroskoi at frugalware.org Fri Oct 10 22:30:33 2008 From: voroskoi at frugalware.org (voroskoi) Date: Fri Oct 10 22:30:34 2008 Subject: [Frugalware-git] frugalware-current: smb4k-0.9.8-1-i686 Message-ID: <20081010203033.1426F1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b78d1d2f76c8235aa2d55774b13061f57a7c4fd4 commit b78d1d2f76c8235aa2d55774b13061f57a7c4fd4 Author: voroskoi <voroskoi@frugalware.org> Date: Fri Oct 10 22:30:05 2008 +0200 smb4k-0.9.8-1-i686 version bump diff --git a/source/kde-extra/smb4k/FrugalBuild b/source/kde-extra/smb4k/FrugalBuild index 2b9e636..1852677 100644 --- a/source/kde-extra/smb4k/FrugalBuild +++ b/source/kde-extra/smb4k/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi <voroskoi@frugalware.org> pkgname=smb4k -pkgver=0.9.7 +pkgver=0.9.8 pkgrel=1 pkgdesc="Smb4K is a SMB/CIFS share browser for KDE." _F_berlios_ext=".tar.bz2" @@ -13,6 +13,6 @@ depends=('kdebase') rodepends=('samba-client') groups=('kde-extra' 'kde-apps') archs=('i686' 'x86_64') -sha1sums=('9e7d1c613fa9720a3e9b01587523032fa3a99084') +sha1sums=('96d571655f30945bebc26d6af2b264274b685c93') # optimization OK From bouleetbil at frogdev.info Fri Oct 10 22:50:43 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Oct 10 22:50:44 2008 Subject: [Frugalware-git] frugalware-current: nautilus-image-converter-0.3.0-1-i686 Message-ID: <20081010205043.3529A1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e60bcfc8f7294843968ab61419806dddace30770 commit e60bcfc8f7294843968ab61419806dddace30770 Author: bouleetbil <bouleetbil@frogdev.info> Date: Fri Oct 10 22:47:17 2008 +0200 nautilus-image-converter-0.3.0-1-i686 *new package diff --git a/source/gnome-extra/nautilus-image-converter/FrugalBuild b/source/gnome-extra/nautilus-image-converter/FrugalBuild new file mode 100644 index 0000000..f31d4cc --- /dev/null +++ b/source/gnome-extra/nautilus-image-converter/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.09 SBU +# Maintainer: bouleetbil <bouleetbil@frogdev.info> + +pkgname=nautilus-image-converter +pkgver=0.3.0 +pkgrel=1 +pkgdesc="nautilus extension to mass resize images" +options=('scriptlet') +depends=('imagemagick' 'nautilus' 'libglade' 'freetype2' 'glibc' 'libxau' 'libxdmcp' 'libxdamage' 'libxext') +makedepends=('perl-xml-parser') +_F_gnome_devel="y" +Finclude gnome +groups=('gnome-extra') +archs=('i686') +sha1sums=('fb202b0dfb367470ea756ecb521daf23d2ccd6b4') + +# optimization OK From voroskoi at frugalware.org Fri Oct 10 23:50:49 2008 From: voroskoi at frugalware.org (voroskoi) Date: Fri Oct 10 23:50:49 2008 Subject: [Frugalware-git] frugalware-current: blender-2.47-1-i686 Message-ID: <20081010215049.0311E1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=553d52590cdd87bda29c3bddcda37ee01c934eca commit 553d52590cdd87bda29c3bddcda37ee01c934eca Author: voroskoi <voroskoi@frugalware.org> Date: Fri Oct 10 23:49:04 2008 +0200 blender-2.47-1-i686 version bump diff --git a/source/xapps-extra/blender/FrugalBuild b/source/xapps-extra/blender/FrugalBuild index dead8e9..0e21a2a 100644 --- a/source/xapps-extra/blender/FrugalBuild +++ b/source/xapps-extra/blender/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi <voroskoi@frugalware.org> pkgname=blender -pkgver=2.46 +pkgver=2.47 pkgextraver= pkgrel=1 pkgdesc="A 3D modeling/rendering/animation/gaming application" @@ -16,7 +16,7 @@ makedepends=('cmake' 'ftgl') up2date="lynx -dump http://www.blender.org/download/source-code/ |grep tar |sed -ne 's/.*r \(.*\).ta.*/\1/;1p' -e s/$pkgextraver//" source=(http://download.blender.org/source/$pkgname-$pkgver$pkgextraver.tar.gz \ blender.desktop blender.png py$_F_python_ver.patch) -sha1sums=('c5f17700a18d44409a5920e852a97a87ff37d06e' \ +sha1sums=('9061ef792da1671ce5e2faa51804577560c65b2d' \ '44ee67a0ed814481aacca0dfc8cf45ae7a48eed5' \ '5d2583d847735c913c26c96ace8192a646323da8' \ 'c7357731664aa7fa704d05d74b75d9e101cf7af5') From vmiklos at frugalware.org Fri Oct 10 23:59:35 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Oct 10 23:59:36 2008 Subject: [Frugalware-git] pacman-tools: repoman: avoid sourcing /etc/repoman.{conf, d} two times Message-ID: <20081010215935.70A451190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=9de06e99787056497fc683b231c0af076e959c99 commit 9de06e99787056497fc683b231c0af076e959c99 Author: Miklos Vajna <vmiklos@frugalware.org> Date: Fri Oct 10 23:59:50 2008 +0200 repoman: avoid sourcing /etc/repoman.{conf,d} two times reported by olegfink on IRC diff --git a/repoman b/repoman index 5fe9007..4b1003b 100755 --- a/repoman +++ b/repoman @@ -756,15 +756,16 @@ merge() [ "$found" = 0 ] && die "package '$target' not found" } -[ -e /etc/repoman.conf ] && . /etc/repoman.conf || \ - die "Can't find /etc/repoman.conf!" - if [ "$1" != "upd" -a "$1" != "update" ]; then [ -e /usr/lib/frugalware/fwmakepkg ] && . /usr/lib/frugalware/fwmakepkg || \ die "Can't find /usr/lib/frugalware/fwmakepkg!" [ -e /etc/makepkg.conf ] && . /etc/makepkg.conf || \ die "Can't find /etc/makepkg.conf!" +else + [ -e /etc/repoman.conf ] && . /etc/repoman.conf || \ + die "Can't find /etc/repoman.conf!" fi + if [ -e FrugalBuild ]; then . FrugalBuild fi From janny at frugalware.org Sat Oct 11 08:43:10 2008 From: janny at frugalware.org (Janos Kovacs) Date: Sat Oct 11 08:43:12 2008 Subject: [Frugalware-git] frugalware-current: knetstats-1.6.2-1-i686 Message-ID: <20081011064310.BFF531190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=93df3ca5b8d92e275981352815cd5d72c2b046a8 commit 93df3ca5b8d92e275981352815cd5d72c2b046a8 Author: Janos Kovacs <janny@frugalware.org> Date: Sat Oct 11 08:42:32 2008 +0200 knetstats-1.6.2-1-i686 * version bump diff --git a/source/kde-extra/knetstats/FrugalBuild b/source/kde-extra/knetstats/FrugalBuild index 076c115..4aea8f8 100644 --- a/source/kde-extra/knetstats/FrugalBuild +++ b/source/kde-extra/knetstats/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Janos Kovacs <janny@frugalware.org> pkgname=knetstats -pkgver=1.6.1 +pkgver=1.6.2 pkgrel=1 pkgdesc="A network monitor that show the network transfer rate in a system tray icon." license="GPL" @@ -13,6 +13,6 @@ _F_sourceforge_prefix="KNetStats v" _F_sourceforge_ext=".tar.bz2" _F_kde_defaults=0 Finclude sourceforge kde -sha1sums=('1b4634482d0ce0ff504546f8ee62643368c853ff') +sha1sums=('e0f9c60df272d625aeba0eafac8533eb724dfe31') # optimization OK From voroskoi at frugalware.org Sat Oct 11 09:20:33 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sat Oct 11 09:20:36 2008 Subject: [Frugalware-git] frugalware-current: cups-1.3.9-1-i686 Message-ID: <20081011072033.B08DA1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=def7cbca65f1296670bde3b7f2ffaa6a2a922763 commit def7cbca65f1296670bde3b7f2ffaa6a2a922763 Author: voroskoi <voroskoi@frugalware.org> Date: Sat Oct 11 09:18:25 2008 +0200 cups-1.3.9-1-i686 version bump closes #3400 diff --git a/source/apps/cups/FrugalBuild b/source/apps/cups/FrugalBuild index c2c8b8c..949d1af 100644 --- a/source/apps/cups/FrugalBuild +++ b/source/apps/cups/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi <voroskoi@frugalware.org> pkgname=cups -pkgver=1.3.8 +pkgver=1.3.9 pkgrel=1 pkgdesc="The CUPS Printing System" url="http://www.cups.org/" @@ -53,7 +53,7 @@ build() { Fsplit libcups usr/lib/libcups.so* } -sha1sums=('f43bfcc05923c43fa5e83df2fcd07addf0f7000f' \ +sha1sums=('c1a596b355201320456b393446286fe3947bce16' \ 'ad90c43de181d362f6c507f366904472d01ae585' \ 'f19bb889e3535e1284d0b93606da48aa61089c8a' \ '03197abb98eff18d3ede3000a61c7783b8c1ad92') From bouleetbil at frogdev.info Sat Oct 11 09:24:42 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat Oct 11 09:24:42 2008 Subject: [Frugalware-git] frugalware-current: pangomm-2.14.0-1-i686 Message-ID: <20081011072442.63BD31190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=66e76b22f1c153f64eaba8d438655b1dcd434fdc commit 66e76b22f1c153f64eaba8d438655b1dcd434fdc Author: bouleetbil <bouleetbil@frogdev.info> Date: Sat Oct 11 09:19:45 2008 +0200 pangomm-2.14.0-1-i686 *moved to xlib diff --git a/source/xlib-extra/pangomm/FrugalBuild b/source/xlib-extra/pangomm/FrugalBuild deleted file mode 100644 index 42b4d80..0000000 --- a/source/xlib-extra/pangomm/FrugalBuild +++ /dev/null @@ -1,16 +0,0 @@ -# Compiling time: 0.18 SBU -# Maintainer: bouleetbil <bouleetbil@frogdev.info> - -pkgname=pangomm -pkgver=2.14.0 -pkgrel=1 -pkgdesc="Pangomm is a C++ wrapper for the pango library." -url="http://www.gtk.org/" -depends=('pango>=1.22.0' 'glibmm' 'cairomm') -groups=('xlib-extra') -#makedepends=('gtk-doc' 'perl') -archs=('i686' 'x86_64') -Finclude gnome -sha1sums=('da6acdc8b4dc404d6c5bde648ac7d0eb4620c1b1') - -# optimization OK diff --git a/source/xlib/pangomm/FrugalBuild b/source/xlib/pangomm/FrugalBuild new file mode 100644 index 0000000..0a67745 --- /dev/null +++ b/source/xlib/pangomm/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling time: 0.18 SBU +# Maintainer: bouleetbil <bouleetbil@frogdev.info> + +pkgname=pangomm +pkgver=2.14.0 +pkgrel=1 +pkgdesc="Pangomm is a C++ wrapper for the pango library." +url="http://www.gtk.org/" +depends=('pango>=1.22.0' 'glibmm' 'cairomm') +groups=('xlib') +archs=('i686' 'x86_64') +Finclude gnome +sha1sums=('da6acdc8b4dc404d6c5bde648ac7d0eb4620c1b1') + +# optimization OK From voroskoi at frugalware.org Sat Oct 11 09:25:02 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sat Oct 11 09:25:03 2008 Subject: [Frugalware-git] frugalware-current: ardour-2.5-1-x86_64 Message-ID: <20081011072502.215DD1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=09ff94c74d1cdcf6d8b731a324b4bc72a36a401e commit 09ff94c74d1cdcf6d8b731a324b4bc72a36a401e Author: voroskoi <voroskoi@frugalware.org> Date: Sat Oct 11 09:24:08 2008 +0200 ardour-2.5-1-x86_64 version bump updated depends() added gcc43.diff diff --git a/source/xmultimedia-extra/ardour/FrugalBuild b/source/xmultimedia-extra/ardour/FrugalBuild index 33d620c..5d38c23 100644 --- a/source/xmultimedia-extra/ardour/FrugalBuild +++ b/source/xmultimedia-extra/ardour/FrugalBuild @@ -3,19 +3,22 @@ # Contributor: Tuxbubling <tuxbubling@tiscali.fr> pkgname=ardour -pkgver=2.1 +pkgver=2.5 pkgrel=1 pkgdesc="Ardour is a digital audio workstation." url="http://ardour.org/" -depends=('jack' 'liblrdf' 'libsamplerate' 'liblo' 'libusb' 'gtk+2' 'libgnomecanvas') +depends=('jack' 'liblrdf' 'libxslt' 'liblo' 'pango' 'atk' 'libxau' 'libxdmcp' \ + 'freetype2' 'libxdamage' 'libxinerama' 'libxi' 'libxrandr' 'libxcursor' \ + 'libgnomecanvas' 'libusb' 'aubio') makedepends=('scons' 'boost>=1.34.1') groups=('xmultimedia-extra') archs=('i686' 'x86_64') options=('scriptlet') up2date="Flasttar http://ardour.org/source_downloads" -source=(http://ardour.org/files/releases/$pkgname-$pkgver.tar.bz2 libsndfile.patch) -sha1sums=('fcfb1230b9e7ec42c0044be89a6e25aa31a75658' \ - '29a6030afada866a3ec78d74afd28e1dda20ce53') +source=(http://ardour.org/files/releases/$pkgname-$pkgver.tar.bz2 libsndfile.patch gcc43.diff) +sha1sums=('6d3d563cc11772d4d6de6f89551dd89e43466f84' \ + '29a6030afada866a3ec78d74afd28e1dda20ce53' \ + '95b52651734d5dc70f39ef2d1a3504118a2fb6e9') build() { diff --git a/source/xmultimedia-extra/ardour/gcc43.diff b/source/xmultimedia-extra/ardour/gcc43.diff new file mode 100644 index 0000000..8823533 --- /dev/null +++ b/source/xmultimedia-extra/ardour/gcc43.diff @@ -0,0 +1,12 @@ +diff -aur ardour-2.5/libs/surfaces/tranzport/screen.cc fw_ardour-2.5/libs/surfaces/tranzport/screen.cc +--- ardour-2.5/libs/surfaces/tranzport/screen.cc 2008-04-18 15:54:21.000000000 +0200 ++++ fw_ardour-2.5/libs/surfaces/tranzport/screen.cc 2008-10-10 23:40:47.000000000 +0200 +@@ -18,6 +18,8 @@ + * + * */ + ++#include <cstring> ++ + #include <tranzport_control_protocol.h> + + void From bouleetbil at frogdev.info Sat Oct 11 09:34:31 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat Oct 11 09:34:33 2008 Subject: [Frugalware-git] frugalware-current: consolekit-0.3.0-1-i686 Message-ID: <20081011073431.DF5A01190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0bc29e1c428d7bbdf9a180fdf337125a734ef731 commit 0bc29e1c428d7bbdf9a180fdf337125a734ef731 Author: bouleetbil <bouleetbil@frogdev.info> Date: Sat Oct 11 09:29:15 2008 +0200 consolekit-0.3.0-1-i686 *moved to xapps diff --git a/source/xapps-extra/consolekit/FrugalBuild b/source/xapps-extra/consolekit/FrugalBuild deleted file mode 100644 index c839735..0000000 --- a/source/xapps-extra/consolekit/FrugalBuild +++ /dev/null @@ -1,30 +0,0 @@ -# Compiling time: 0.38 SBU -# Maintainer: bouleetbil <bouleetbil@frogdev.info> - -pkgname=consolekit -_F_archive_name="ConsoleKit" -pkgver=0.3.0 -pkgrel=1 -pkgdesc="Framework for defining and tracking users, login sessions and seats." -url="http://www.freedesktop.org/wiki/Software/ConsoleKit" -source=(http://people.freedesktop.org/~mccann/dist/$_F_archive_name-$pkgver.tar.bz2 rc.xconsolekit \ - consolekit-0.3.0-shutdown.patch close_log.diff) -up2date="lynx -dump http://people.freedesktop.org/~mccann/dist/ | Flasttar" -depends=('libx11' 'dbus-glib' 'zlib') -install="$pkgname.install" -groups=('xapps-extra') -archs=('i686' 'x86_64') -sha1sums=('e3b6156622cc14ebca7382a55b8ed15f2f2bad98' \ - '5efcbfa507b4b5a1aff2670b3b2b507b50ba2d77' \ - 'f02205b3273047afdfe4438fac4f71f50655112b' \ - 'f05ccbcab5cc768edfe76307066c88dc721b9448') - -#If you bump this package think to verify if gnome-session can reboot or shutdown -#for now this package is only use by gnome-session but the next gnome* could use. - -build() { - Fbuild - Frcd2 xconsolekit -} - -# optimization OK diff --git a/source/xapps-extra/consolekit/close_log.diff b/source/xapps-extra/consolekit/close_log.diff deleted file mode 100755 index 3f23533..0000000 --- a/source/xapps-extra/consolekit/close_log.diff +++ /dev/null @@ -1,27 +0,0 @@ -/*Fixes #17866*/ ---- a/src/ck-event-logger.c -+++ b/src/ck-event-logger.c -@@ -180,8 +180,10 @@ retry: - static void - reopen_file_stream (CkEventLogger *event_logger) - { -- close (event_logger->priv->fd); -- fclose (event_logger->priv->file); -+ /* fclose will also close the underlying fd */ -+ if (event_logger->priv->file != NULL) { -+ fclose (event_logger->priv->file); -+ } - - /* FIXME: retries */ - open_log_file (event_logger); -@@ -420,8 +422,8 @@ ck_event_logger_finalize (GObject *objec - g_async_queue_unref (event_logger->priv->event_queue); - } - -- if (event_logger->priv->fd != -1) { -- close (event_logger->priv->fd); -+ if (event_logger->priv->file != NULL) { -+ fclose (event_logger->priv->file); - } - - g_free (event_logger->priv->log_filename); diff --git a/source/xapps-extra/consolekit/consolekit-0.3.0-shutdown.patch b/source/xapps-extra/consolekit/consolekit-0.3.0-shutdown.patch deleted file mode 100755 index 682f820..0000000 --- a/source/xapps-extra/consolekit/consolekit-0.3.0-shutdown.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b09ddd0f5c9de463ad0d1ebd329a9d16b084e192 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Wed, 1 Oct 2008 22:27:24 +0200 -Subject: [PATCH] allow shutdown without policykit or RBAC intervention. - ---- - src/ck-manager.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/src/ck-manager.c b/src/ck-manager.c -index bcb9350..54a78e6 100644 ---- a/src/ck-manager.c -+++ b/src/ck-manager.c -@@ -1349,7 +1349,6 @@ ck_manager_restart (CkManager *manager, - } - #else - g_warning ("Compiled without PolicyKit or RBAC support!"); -- goto out; - #endif - - g_debug ("ConsoleKit preforming Restart: %s", action); -@@ -1409,7 +1408,6 @@ ck_manager_stop (CkManager *manager, - } - #else - g_warning ("Compiled without PolicyKit or RBAC support!"); -- goto out; - #endif - - g_debug ("Stopping system"); --- -1.6.0.2 - diff --git a/source/xapps-extra/consolekit/consolekit.install b/source/xapps-extra/consolekit/consolekit.install deleted file mode 100644 index 64093a1..0000000 --- a/source/xapps-extra/consolekit/consolekit.install +++ /dev/null @@ -1,28 +0,0 @@ -post_install() -{ - /usr/sbin/chkconfig --add rc.xconsolekit -} - -pre_upgrade() -{ - /sbin/service xconsolekit stop -} - -post_upgrade() -{ - post_install $1 - /sbin/service xconsolekit start -} - -pre_remove() -{ - /sbin/service xconsolekit stop - /usr/sbin/chkconfig --del rc.xconsolekit -} - -op=$1 -shift - -$op $* - -# vim: ft=sh diff --git a/source/xapps-extra/consolekit/rc.xconsolekit b/source/xapps-extra/consolekit/rc.xconsolekit deleted file mode 100755 index 4b8aa8f..0000000 --- a/source/xapps-extra/consolekit/rc.xconsolekit +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# (c) 2008 bouleetbil <bouleetbil@frogdev.info> -# rc.xconsolekit for FrugalWare -# distributed under GPL License - -# chkconfig: 2345 99 02 -# description: Framework for defining and tracking users, login sessions and seats. - -source /lib/initscripts/functions -TEXTDOMAIN=xconsolekit -TEXTDOMAINDIR=/lib/initscripts/messages - -actions=(restart start status stop) - -pid="pidof console-kit-daemon 2> /dev/null" - -rc_start() -{ - start_msg - if [ -z "$(eval $pid)" ]; then - /usr/sbin/console-kit-daemon -- 2>/dev/null 1>/dev/null - ok $? - else - ok 999 - fi -} - -rc_stop() -{ - stop_msg - if [ ! -z "$(eval $pid)" ] ;then - kill $(eval $pid) 2>/dev/null 1>/dev/null - ok $? - else - ok 999 - fi -} - -rc_exec $1 diff --git a/source/xapps/consolekit/FrugalBuild b/source/xapps/consolekit/FrugalBuild new file mode 100644 index 0000000..2ecbbae --- /dev/null +++ b/source/xapps/consolekit/FrugalBuild @@ -0,0 +1,30 @@ +# Compiling time: 0.38 SBU +# Maintainer: bouleetbil <bouleetbil@frogdev.info> + +pkgname=consolekit +_F_archive_name="ConsoleKit" +pkgver=0.3.0 +pkgrel=1 +pkgdesc="Framework for defining and tracking users, login sessions and seats." +url="http://www.freedesktop.org/wiki/Software/ConsoleKit" +source=(http://people.freedesktop.org/~mccann/dist/$_F_archive_name-$pkgver.tar.bz2 rc.xconsolekit \ + consolekit-0.3.0-shutdown.patch close_log.diff) +up2date="lynx -dump http://people.freedesktop.org/~mccann/dist/ | Flasttar" +depends=('libx11' 'dbus-glib' 'zlib') +install="$pkgname.install" +groups=('xapps') +archs=('i686' 'x86_64') +sha1sums=('e3b6156622cc14ebca7382a55b8ed15f2f2bad98' \ + '5efcbfa507b4b5a1aff2670b3b2b507b50ba2d77' \ + 'f02205b3273047afdfe4438fac4f71f50655112b' \ + 'f05ccbcab5cc768edfe76307066c88dc721b9448') + +#If you bump this package think to verify if gnome-session can reboot or shutdown +#for now this package is only use by gnome-session but the next gnome* could use. + +build() { + Fbuild + Frcd2 xconsolekit +} + +# optimization OK diff --git a/source/xapps/consolekit/close_log.diff b/source/xapps/consolekit/close_log.diff new file mode 100755 index 0000000..3f23533 --- /dev/null +++ b/source/xapps/consolekit/close_log.diff @@ -0,0 +1,27 @@ +/*Fixes #17866*/ +--- a/src/ck-event-logger.c ++++ b/src/ck-event-logger.c +@@ -180,8 +180,10 @@ retry: + static void + reopen_file_stream (CkEventLogger *event_logger) + { +- close (event_logger->priv->fd); +- fclose (event_logger->priv->file); ++ /* fclose will also close the underlying fd */ ++ if (event_logger->priv->file != NULL) { ++ fclose (event_logger->priv->file); ++ } + + /* FIXME: retries */ + open_log_file (event_logger); +@@ -420,8 +422,8 @@ ck_event_logger_finalize (GObject *objec + g_async_queue_unref (event_logger->priv->event_queue); + } + +- if (event_logger->priv->fd != -1) { +- close (event_logger->priv->fd); ++ if (event_logger->priv->file != NULL) { ++ fclose (event_logger->priv->file); + } + + g_free (event_logger->priv->log_filename); diff --git a/source/xapps/consolekit/consolekit-0.3.0-shutdown.patch b/source/xapps/consolekit/consolekit-0.3.0-shutdown.patch new file mode 100755 index 0000000..682f820 --- /dev/null +++ b/source/xapps/consolekit/consolekit-0.3.0-shutdown.patch @@ -0,0 +1,32 @@ +From b09ddd0f5c9de463ad0d1ebd329a9d16b084e192 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Wed, 1 Oct 2008 22:27:24 +0200 +Subject: [PATCH] allow shutdown without policykit or RBAC intervention. + +--- + src/ck-manager.c | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/src/ck-manager.c b/src/ck-manager.c +index bcb9350..54a78e6 100644 +--- a/src/ck-manager.c ++++ b/src/ck-manager.c +@@ -1349,7 +1349,6 @@ ck_manager_restart (CkManager *manager, + } + #else + g_warning ("Compiled without PolicyKit or RBAC support!"); +- goto out; + #endif + + g_debug ("ConsoleKit preforming Restart: %s", action); +@@ -1409,7 +1408,6 @@ ck_manager_stop (CkManager *manager, + } + #else + g_warning ("Compiled without PolicyKit or RBAC support!"); +- goto out; + #endif + + g_debug ("Stopping system"); +-- +1.6.0.2 + diff --git a/source/xapps/consolekit/consolekit.install b/source/xapps/consolekit/consolekit.install new file mode 100644 index 0000000..64093a1 --- /dev/null +++ b/source/xapps/consolekit/consolekit.install @@ -0,0 +1,28 @@ +post_install() +{ + /usr/sbin/chkconfig --add rc.xconsolekit +} + +pre_upgrade() +{ + /sbin/service xconsolekit stop +} + +post_upgrade() +{ + post_install $1 + /sbin/service xconsolekit start +} + +pre_remove() +{ + /sbin/service xconsolekit stop + /usr/sbin/chkconfig --del rc.xconsolekit +} + +op=$1 +shift + +$op $* + +# vim: ft=sh diff --git a/source/xapps/consolekit/rc.xconsolekit b/source/xapps/consolekit/rc.xconsolekit new file mode 100755 index 0000000..4b8aa8f --- /dev/null +++ b/source/xapps/consolekit/rc.xconsolekit @@ -0,0 +1,40 @@ +#!/bin/bash + +# (c) 2008 bouleetbil <bouleetbil@frogdev.info> +# rc.xconsolekit for FrugalWare +# distributed under GPL License + +# chkconfig: 2345 99 02 +# description: Framework for defining and tracking users, login sessions and seats. + +source /lib/initscripts/functions +TEXTDOMAIN=xconsolekit +TEXTDOMAINDIR=/lib/initscripts/messages + +actions=(restart start status stop) + +pid="pidof console-kit-daemon 2> /dev/null" + +rc_start() +{ + start_msg + if [ -z "$(eval $pid)" ]; then + /usr/sbin/console-kit-daemon -- 2>/dev/null 1>/dev/null + ok $? + else + ok 999 + fi +} + +rc_stop() +{ + stop_msg + if [ ! -z "$(eval $pid)" ] ;then + kill $(eval $pid) 2>/dev/null 1>/dev/null + ok $? + else + ok 999 + fi +} + +rc_exec $1 From bouleetbil at frogdev.info Sat Oct 11 09:38:20 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat Oct 11 09:38:22 2008 Subject: [Frugalware-git] frugalware-current: sound-theme-freedesktop-1-1-i686 Message-ID: <20081011073820.35FF61190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=de4fbe4ef9384d0aa15cf36c36335275f9b5df5e commit de4fbe4ef9384d0aa15cf36c36335275f9b5df5e Author: bouleetbil <bouleetbil@frogdev.info> Date: Sat Oct 11 09:35:08 2008 +0200 sound-theme-freedesktop-1-1-i686 *moved to lib diff --git a/source/lib-extra/sound-theme-freedesktop/FrugalBuild b/source/lib-extra/sound-theme-freedesktop/FrugalBuild deleted file mode 100644 index f76c66b..0000000 --- a/source/lib-extra/sound-theme-freedesktop/FrugalBuild +++ /dev/null @@ -1,19 +0,0 @@ -# Compiling Time: 0 SBU -# Maintainer: bouleetbil <bouleetbil@frogdev.info> - -pkgname=sound-theme-freedesktop -pkgver=1 -pkgrel=1 -url="http://0pointer.de/lennart/projects/libcanberra/" -pkgdesc="The default freedesktop.org sound theme following the XDG theming." -groups=('lib-extra') -archs=('i686' 'x86_64') -depends=() -source=(http://0pointer.de/public/sound-theme-freedesktop.tar.gz) -up2date=$pkgver -sha1sums=('4897a8c786316ef529dca20c2185ccd395807f12') - -build(){ - Fmkdir /usr/share/sounds - Fcp freedesktop /usr/share/sounds/ -} diff --git a/source/lib/sound-theme-freedesktop/FrugalBuild b/source/lib/sound-theme-freedesktop/FrugalBuild new file mode 100644 index 0000000..cba379a --- /dev/null +++ b/source/lib/sound-theme-freedesktop/FrugalBuild @@ -0,0 +1,19 @@ +# Compiling Time: 0 SBU +# Maintainer: bouleetbil <bouleetbil@frogdev.info> + +pkgname=sound-theme-freedesktop +pkgver=1 +pkgrel=1 +url="http://0pointer.de/lennart/projects/libcanberra/" +pkgdesc="The default freedesktop.org sound theme following the XDG theming." +groups=('lib') +archs=('i686' 'x86_64') +depends=() +source=(http://0pointer.de/public/sound-theme-freedesktop.tar.gz) +up2date=$pkgver +sha1sums=('4897a8c786316ef529dca20c2185ccd395807f12') + +build(){ + Fmkdir /usr/share/sounds + Fcp freedesktop /usr/share/sounds/ +} From bouleetbil at frogdev.info Sat Oct 11 09:42:45 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat Oct 11 09:42:47 2008 Subject: [Frugalware-git] frugalware-current: libcanberra-0.9-1-i686 Message-ID: <20081011074245.D3C2F1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3cf361c91cb47bc3c0bd1becbad23dfcdaa2ab75 commit 3cf361c91cb47bc3c0bd1becbad23dfcdaa2ab75 Author: bouleetbil <bouleetbil@frogdev.info> Date: Sat Oct 11 09:38:46 2008 +0200 libcanberra-0.9-1-i686 *moved the subgroups diff --git a/source/multimedia/libcanberra/FrugalBuild b/source/multimedia/libcanberra/FrugalBuild index 2c64590..28c03a4 100644 --- a/source/multimedia/libcanberra/FrugalBuild +++ b/source/multimedia/libcanberra/FrugalBuild @@ -17,7 +17,7 @@ sha1sums=('42b87af1ee770378dbfd8bfeb3c11a6e4f513dab') subpkgs=("libcanberra-alsa" "libcanberra-gst" "libcanberra-gtk") subdepends=("libcanberra alsa-lib" "libcanberra gstreamer" "libcanberra gtk+2") subdescs=('Alsa libcanberra' 'gstreamer libcanberra' 'GTK+2 libcanberra') -subgroups=('multimedia-extra' 'xmultimedia-extra' 'xmultimedia-extra') +subgroups=('multimedia' 'xmultimedia' 'xmultimedia') subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64') build(){ Fbuild From devil505linux at gmail.com Sat Oct 11 09:43:44 2008 From: devil505linux at gmail.com (Devil505) Date: Sat Oct 11 09:43:46 2008 Subject: [Frugalware-git] frugalware-current: playonlinux-3.1.1-1-i686 Message-ID: <20081011074344.AA68F1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5fabc461cfbb15cf9317a80e41ad2b196bc309db commit 5fabc461cfbb15cf9317a80e41ad2b196bc309db Author: Devil505 <devil505linux@gmail.com> Date: Sat Oct 11 09:38:13 2008 +0200 playonlinux-3.1.1-1-i686 * version bump diff --git a/source/xapps-extra/playonlinux/FrugalBuild b/source/xapps-extra/playonlinux/FrugalBuild index 4a01df4..c60db55 100644 --- a/source/xapps-extra/playonlinux/FrugalBuild +++ b/source/xapps-extra/playonlinux/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 <devil505linux@gmail.com> pkgname=playonlinux -pkgver=3.1 +pkgver=3.1.1 pkgrel=1 pkgdesc="GUI for managing Windows and DOS programs under linux" url="http://www.$pkgname.com" @@ -15,7 +15,7 @@ Fpkgversep="_" _F_cd_path="$pkgname" up2date="lynx -dump $url/en/download-generic.html | Flasttar" source=(http://www.playonlinux.com/script_files/$_F_archive_name/$pkgver/${_F_archive_name}_$pkgver.tar.gz) -sha1sums=('de312ca18976b86ab9fc232ccb5dd72c67dc448b') +sha1sums=('82a3c676516184d1dcbe11c81d6bfed9a92f0e4d') build() { From devil505linux at gmail.com Sat Oct 11 09:53:20 2008 From: devil505linux at gmail.com (Devil505) Date: Sat Oct 11 09:53:21 2008 Subject: [Frugalware-git] frugalware-current: watsup-1.3-1-i686 Message-ID: <20081011075320.90B151190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fbf2c73eec560bc0e83528beffbd89a597e88c0d commit fbf2c73eec560bc0e83528beffbd89a597e88c0d Author: Devil505 <devil505linux@gmail.com> Date: Sat Oct 11 09:50:52 2008 +0200 watsup-1.3-1-i686 * version bump diff --git a/source/xapps-extra/watsup/FrugalBuild b/source/xapps-extra/watsup/FrugalBuild index 5fcc03c..44fabca 100644 --- a/source/xapps-extra/watsup/FrugalBuild +++ b/source/xapps-extra/watsup/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 <devil505linux@gmail.com> pkgname=watsup -pkgver=1.2 +pkgver=1.3 pkgrel=1 pkgdesc="Watsup monitors Linux system resources and the processes using those resources." url="http://kornelix.squarespace.com/$pkgname/" @@ -13,7 +13,7 @@ archs=('i686' 'x86_64') up2date="lynx -dump http://kornelix.squarespace.com/downloads/ | Flasttar" source=(http://kornelix.squarespace.com/storage/$pkgname/$pkgname-$pkgver.tar.gz) _F_cd_path="$pkgname" -sha1sums=('42dfb4a5d451a410c115c18addb4cec893c7f31b') +sha1sums=('9ed267bd0f79f05ae53c59e01927095f3cbf96cd') _F_desktop_name="Watsup" _F_desktop_icon="/usr/share/watsup/icons/watsup.png" From bouleetbil at frogdev.info Sat Oct 11 11:21:03 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat Oct 11 11:21:09 2008 Subject: [Frugalware-git] frugalware-current: gnome-power-manager-2.24.0-1-i686 Message-ID: <20081011092104.006DF1190001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0700df81067d74980472d22d81f95d97ff1c3487 commit 0700df81067d74980472d22d81f95d97ff1c3487 Author: bouleetbil <bouleetbil@frogdev.info> Date: Sat Oct 11 11:16:31 2008 +0200 gnome-power-manager-2.24.0-1-i686 *patch more simple for same result diff --git a/source/gnome/gnome-power-manager/Fix_disablepam.diff b/source/gnome/gnome-power-manager/Fix_disablepam.diff index 5d27d4f..18953d5 100644 --- a/source/gnome/gnome-power-manager/Fix_disablepam.diff +++ b/source/gnome/gnome-power-manager/Fix_disablepam.diff @@ -1,13113 +1,73 @@ ---- gnome-power-manager-2.24.0old/configure 2008-09-22 22:46:09.000000000 +0200 -+++ gnome-power-manager-2.24.0/configure 2008-10-02 14:22:35.000000000 +0200 -@@ -1,9 +1,9 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.61 for gnome-power-manager 2.24.0. -+# Generated by GNU Autoconf 2.63 for gnome-power-manager 2.24.0. - # - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, --# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. - ## --------------------- ## -@@ -15,7 +15,7 @@ - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # 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 -@@ -37,17 +37,45 @@ - as_cr_digits='0123456789' - as_cr_alnum=$as_cr_Letters$as_cr_digits - --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -+as_nl=' -+' -+export as_nl -+# Printing a long string crashes Solaris 7 /usr/bin/printf. -+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 -+ as_echo='printf %s\n' -+ as_echo_n='printf %s' -+else -+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -+ as_echo_n='/usr/ucb/echo -n' - else -- PATH_SEPARATOR=: -+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -+ as_echo_n_body='eval -+ arg=$1; -+ case $arg in -+ *"$as_nl"*) -+ expr "X$arg" : "X\\(.*\\)$as_nl"; -+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -+ esac; -+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -+ ' -+ export as_echo_n_body -+ as_echo_n='sh -c $as_echo_n_body as_echo' - fi -- rm -f conf$$.sh -+ export as_echo_body -+ as_echo='sh -c $as_echo_body as_echo' -+fi -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } - fi - - # Support unset when possible. -@@ -63,8 +91,6 @@ - # there to prevent editors from complaining about space-tab. - # (If _AS_PATH_WALK were called with IFS unset, it would disable word - # splitting by setting IFS to empty value.) --as_nl=' --' - IFS=" "" $as_nl" - - # Find who we are. Look in the path if we contain no directory separator. -@@ -87,7 +113,7 @@ - as_myself=$0 - fi - if test ! -f "$as_myself"; then -- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } - fi - -@@ -100,17 +126,10 @@ - PS4='+ ' - - # NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -- LC_TELEPHONE LC_TIME --do -- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -- eval $as_var=C; export $as_var -- else -- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -- fi --done -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE - - # Required to use basename. - if expr a : '\(a\)' >/dev/null 2>&1 && -@@ -132,7 +151,7 @@ - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || --echo X/"$0" | -+$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q -@@ -158,7 +177,7 @@ - as_have_required=no - fi - -- if test $as_have_required = yes && (eval ": -+ if test $as_have_required = yes && (eval ": - (as_func_return () { - (exit \$1) - } -@@ -240,7 +259,7 @@ - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # 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 -@@ -261,7 +280,7 @@ - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # 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 -@@ -341,10 +360,10 @@ - - 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 -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+ done -+ export CONFIG_SHELL -+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} - fi - - -@@ -413,9 +432,10 @@ - - test \$exitcode = 0") || { - echo No shell found that supports shell functions. -- echo Please tell autoconf@gnu.org about your system, -- echo including any error possibly output before this -- echo message -+ 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. - } - - -@@ -451,7 +471,7 @@ - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || -- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -+ { $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 -@@ -479,7 +499,6 @@ - *) - ECHO_N='-n';; - esac -- - if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -@@ -492,19 +511,22 @@ - rm -f conf$$.dir/conf$$.file - else - rm -f conf$$.dir -- mkdir conf$$.dir -+ mkdir conf$$.dir 2>/dev/null - fi --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- as_ln_s='ln -s' -- # ... but there are two gotchas: -- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -- # In both cases, we have to default to `cp -p'. -- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -p' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else - as_ln_s='cp -p' --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln -+ fi - else - as_ln_s='cp -p' - fi -@@ -529,10 +551,10 @@ - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then -- test -d "$1/."; -+ test -d "$1/."; - else - case $1 in -- -*)set "./$1";; -+ -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi -@@ -767,235 +789,268 @@ - # include <unistd.h> - #endif" - --ac_subst_vars='SHELL --PATH_SEPARATOR --PACKAGE_NAME --PACKAGE_TARNAME --PACKAGE_VERSION --PACKAGE_STRING --PACKAGE_BUGREPORT --exec_prefix --prefix --program_transform_name --bindir --sbindir --libexecdir --datarootdir --datadir --sysconfdir --sharedstatedir --localstatedir --includedir --oldincludedir --docdir --infodir --htmldir --dvidir --pdfdir --psdir --libdir --localedir --mandir --DEFS --ECHO_C --ECHO_N --ECHO_T --LIBS --build_alias --host_alias --target_alias --INSTALL_PROGRAM --INSTALL_SCRIPT --INSTALL_DATA --am__isrc --CYGPATH_W --PACKAGE --VERSION --ACLOCAL --AUTOCONF --AUTOMAKE --AUTOHEADER --MAKEINFO --install_sh --STRIP --INSTALL_STRIP_PROGRAM --mkdir_p --AWK --SET_MAKE --am__leading_dot --AMTAR --am__tar --am__untar --CC --CFLAGS --LDFLAGS --CPPFLAGS --ac_ct_CC --EXEEXT --OBJEXT --DEPDIR --am__include --am__quote --AMDEP_TRUE --AMDEP_FALSE --AMDEPBACKSLASH --CCDEPMODE --am__fastdepCC_TRUE --am__fastdepCC_FALSE --build --build_cpu --build_vendor --build_os --host --host_cpu --host_vendor --host_os --SED --GREP --EGREP --LN_S --ECHO --AR --RANLIB --CPP --CXX --CXXFLAGS --ac_ct_CXX --CXXDEPMODE --am__fastdepCXX_TRUE --am__fastdepCXX_FALSE --CXXCPP --F77 --FFLAGS --ac_ct_F77 --LIBTOOL --INTLTOOL_DESKTOP_RULE --INTLTOOL_DIRECTORY_RULE --INTLTOOL_KEYS_RULE --INTLTOOL_PROP_RULE --INTLTOOL_OAF_RULE --INTLTOOL_PONG_RULE --INTLTOOL_SERVER_RULE --INTLTOOL_SHEET_RULE --INTLTOOL_SOUNDLIST_RULE --INTLTOOL_UI_RULE --INTLTOOL_XAM_RULE --INTLTOOL_KBD_RULE --INTLTOOL_XML_RULE --INTLTOOL_XML_NOMERGE_RULE --INTLTOOL_CAVES_RULE --INTLTOOL_SCHEMAS_RULE --INTLTOOL_THEME_RULE --INTLTOOL_SERVICE_RULE --INTLTOOL_POLICY_RULE --XGETTEXT --MSGMERGE --MSGFMT --INTLTOOL_EXTRACT --INTLTOOL_MERGE --INTLTOOL_UPDATE --INTLTOOL_PERL --ALL_LINGUAS --DATADIRNAME --WARN_CFLAGS --PKG_CONFIG --HELP_DIR --OMF_DIR --DOC_USER_FORMATS --ENABLE_SK_TRUE --ENABLE_SK_FALSE --DISTCHECK_CONFIGURE_FLAGS --HAVE_GNOME_DOC_UTILS_TRUE --HAVE_GNOME_DOC_UTILS_FALSE --GLIB_GENMARSHAL --GETTEXT_PACKAGE --USE_NLS --MSGFMT_OPTS --GMSGFMT --CATALOGS --CATOBJEXT --GMOFILES --INSTOBJEXT --INTLLIBS --PO_IN_DATADIR_TRUE --PO_IN_DATADIR_FALSE --POFILES --POSUB --MKINSTALLDIRS --GLIB_REQUIRED --GTK_REQUIRED --GDK_REQUIRED --LIBGNOME_REQUIRED --LIBGNOMEUI_REQUIRED --HAL_REQUIRED --DBUS_REQUIRED --LIBGLADE_REQUIRED --LIBNOTIFY_REQUIRED --LIBWNCK_REQUIRED --CAIRO_REQUIRED --UNIQUE_REQUIRED --LIBPANEL_REQUIRED --GSTREAMER_REQUIRED --XRANDR_REQUIRED --POLKIT_GNOME_REQUIRED --GLIB_CFLAGS --GLIB_LIBS --HAL_CFLAGS --HAL_LIBS --GSTREAMER_CFLAGS --GSTREAMER_LIBS --DBUS_CFLAGS --DBUS_LIBS --GNOME_CFLAGS --GNOME_LIBS --GDK_CFLAGS --GDK_LIBS --XRANDR_CFLAGS --XRANDR_LIBS --GCONFTOOL --GCONF_SCHEMA_CONFIG_SOURCE --GCONF_SCHEMA_FILE_DIR --GCONF_SCHEMAS_INSTALL_TRUE --GCONF_SCHEMAS_INSTALL_FALSE --XMKMF --X_CFLAGS --X_PRE_LIBS --X_LIBS --X_EXTRA_LIBS --SYSCONFDIR --DATADIR --BINDIR --SBINDIR --DOCDIR --POLKIT_CFLAGS --POLKIT_LIBS --HAVE_TESTS_TRUE --HAVE_TESTS_FALSE --POLKIT_GNOME_CFLAGS --POLKIT_GNOME_LIBS --HAVE_GCONF_DEFAULTS_TRUE --HAVE_GCONF_DEFAULTS_FALSE --HAVE_APPLETS_TRUE --HAVE_APPLETS_FALSE --XMLTO --DOCBOOK_DOCS_ENABLED_TRUE --DOCBOOK_DOCS_ENABLED_FALSE --DBUS_SERVICES_DIR --LIBNOTIFY_CFLAGS --LIBNOTIFY_LIBS --HAVE_LIBNOTIFY_TRUE --HAVE_LIBNOTIFY_FALSE --UNIQUE_CFLAGS --UNIQUE_LIBS --HAVE_UNIQUE_TRUE --HAVE_UNIQUE_FALSE --GPM_EXTRA_LIBS --DOCBOOK2MAN --HAVE_DOCBOOK2MAN_TRUE --HAVE_DOCBOOK2MAN_FALSE -+ac_subst_vars='LTLIBOBJS - LIBOBJS --LTLIBOBJS' -+HAVE_DOCBOOK2MAN_FALSE -+HAVE_DOCBOOK2MAN_TRUE -+DOCBOOK2MAN -+GPM_EXTRA_LIBS -+HAVE_UNIQUE_FALSE -+HAVE_UNIQUE_TRUE -+UNIQUE_LIBS -+UNIQUE_CFLAGS -+HAVE_LIBNOTIFY_FALSE -+HAVE_LIBNOTIFY_TRUE -+LIBNOTIFY_LIBS -+LIBNOTIFY_CFLAGS -+DBUS_SERVICES_DIR -+DOCBOOK_DOCS_ENABLED_FALSE -+DOCBOOK_DOCS_ENABLED_TRUE -+XMLTO -+HAVE_APPLETS_FALSE -+HAVE_APPLETS_TRUE -+HAVE_GCONF_DEFAULTS_FALSE -+HAVE_GCONF_DEFAULTS_TRUE -+POLKIT_GNOME_LIBS -+POLKIT_GNOME_CFLAGS -+HAVE_TESTS_FALSE -+HAVE_TESTS_TRUE -+POLKIT_LIBS -+POLKIT_CFLAGS -+DOCDIR -+SBINDIR -+BINDIR -+DATADIR -+SYSCONFDIR -+X_EXTRA_LIBS -+X_LIBS -+X_PRE_LIBS -+X_CFLAGS -+XMKMF -+GCONF_SCHEMAS_INSTALL_FALSE -+GCONF_SCHEMAS_INSTALL_TRUE -+GCONF_SCHEMA_FILE_DIR -+GCONF_SCHEMA_CONFIG_SOURCE -+GCONFTOOL -+XRANDR_LIBS -+XRANDR_CFLAGS -+GDK_LIBS -+GDK_CFLAGS -+GNOME_LIBS -+GNOME_CFLAGS -+DBUS_LIBS -+DBUS_CFLAGS -+GSTREAMER_LIBS -+GSTREAMER_CFLAGS -+HAL_LIBS -+HAL_CFLAGS -+GLIB_LIBS -+GLIB_CFLAGS -+POLKIT_GNOME_REQUIRED -+XRANDR_REQUIRED -+GSTREAMER_REQUIRED -+LIBPANEL_REQUIRED -+UNIQUE_REQUIRED -+CAIRO_REQUIRED -+LIBWNCK_REQUIRED -+LIBNOTIFY_REQUIRED -+LIBGLADE_REQUIRED -+DBUS_REQUIRED -+HAL_REQUIRED -+LIBGNOMEUI_REQUIRED -+LIBGNOME_REQUIRED -+GDK_REQUIRED -+GTK_REQUIRED -+GLIB_REQUIRED -+MKINSTALLDIRS -+POSUB -+POFILES -+PO_IN_DATADIR_FALSE -+PO_IN_DATADIR_TRUE -+INTLLIBS -+INSTOBJEXT -+GMOFILES -+CATOBJEXT -+CATALOGS -+GMSGFMT -+MSGFMT_OPTS -+USE_NLS -+GETTEXT_PACKAGE -+GLIB_GENMARSHAL -+HAVE_GNOME_DOC_UTILS_FALSE -+HAVE_GNOME_DOC_UTILS_TRUE -+DISTCHECK_CONFIGURE_FLAGS -+ENABLE_SK_FALSE -+ENABLE_SK_TRUE -+DOC_USER_FORMATS -+OMF_DIR -+HELP_DIR -+PKG_CONFIG -+WARN_CFLAGS -+DATADIRNAME -+ALL_LINGUAS -+INTLTOOL_PERL -+INTLTOOL_UPDATE -+INTLTOOL_MERGE -+INTLTOOL_EXTRACT -+MSGFMT -+MSGMERGE -+XGETTEXT -+INTLTOOL_POLICY_RULE -+INTLTOOL_SERVICE_RULE -+INTLTOOL_THEME_RULE -+INTLTOOL_SCHEMAS_RULE -+INTLTOOL_CAVES_RULE -+INTLTOOL_XML_NOMERGE_RULE -+INTLTOOL_XML_RULE -+INTLTOOL_KBD_RULE -+INTLTOOL_XAM_RULE -+INTLTOOL_UI_RULE -+INTLTOOL_SOUNDLIST_RULE -+INTLTOOL_SHEET_RULE -+INTLTOOL_SERVER_RULE -+INTLTOOL_PONG_RULE -+INTLTOOL_OAF_RULE -+INTLTOOL_PROP_RULE -+INTLTOOL_KEYS_RULE -+INTLTOOL_DIRECTORY_RULE -+INTLTOOL_DESKTOP_RULE -+LIBTOOL -+ac_ct_F77 -+FFLAGS -+F77 -+CXXCPP -+am__fastdepCXX_FALSE -+am__fastdepCXX_TRUE -+CXXDEPMODE -+ac_ct_CXX -+CXXFLAGS -+CXX -+CPP -+RANLIB -+AR -+ECHO -+LN_S -+EGREP -+GREP -+SED -+host_os -+host_vendor -+host_cpu -+host -+build_os -+build_vendor -+build_cpu -+build -+am__fastdepCC_FALSE -+am__fastdepCC_TRUE -+CCDEPMODE -+AMDEPBACKSLASH -+AMDEP_FALSE -+AMDEP_TRUE -+am__quote -+am__include -+DEPDIR -+OBJEXT -+EXEEXT -+ac_ct_CC -+CPPFLAGS -+LDFLAGS -+CFLAGS -+CC -+am__untar -+am__tar -+AMTAR -+am__leading_dot -+SET_MAKE -+AWK -+mkdir_p -+MKDIR_P -+INSTALL_STRIP_PROGRAM -+STRIP -+install_sh -+MAKEINFO -+AUTOHEADER -+AUTOMAKE -+AUTOCONF -+ACLOCAL -+VERSION -+PACKAGE -+CYGPATH_W -+am__isrc -+INSTALL_DATA -+INSTALL_SCRIPT -+INSTALL_PROGRAM -+target_alias -+host_alias -+build_alias -+LIBS -+ECHO_T -+ECHO_N -+ECHO_C -+DEFS -+mandir -+localedir -+libdir -+psdir -+pdfdir -+dvidir -+htmldir -+infodir -+docdir -+oldincludedir -+includedir -+localstatedir -+sharedstatedir -+sysconfdir -+datadir -+datarootdir -+libexecdir -+sbindir -+bindir -+program_transform_name -+prefix -+exec_prefix -+PACKAGE_BUGREPORT -+PACKAGE_STRING -+PACKAGE_VERSION -+PACKAGE_TARNAME -+PACKAGE_NAME -+PATH_SEPARATOR -+SHELL' - ac_subst_files='' -+ac_user_opts=' -+enable_option_checking -+enable_dependency_tracking -+enable_shared -+enable_static -+enable_fast_install -+with_gnu_ld -+enable_libtool_lock -+with_pic -+with_tags -+enable_compile_warnings -+enable_iso_c -+with_help_dir -+with_omf_dir -+with_help_formats -+enable_scrollkeeper -+with_gconf_source -+with_gconf_schema_file_dir -+enable_schemas_install -+with_x -+with_doc_dir -+enable_policykit -+enable_checkfg -+enable_xevents -+enable_tests -+enable_gconf_defaults -+enable_applets -+enable_docbook_docs -+with_dbus_services -+with_dpms_ext -+enable_more_warnings -+' - ac_precious_vars='build_alias - host_alias - target_alias -@@ -1040,6 +1095,8 @@ - # Initialize some variables set by options. - ac_init_help= - ac_init_version=false -+ac_unrecognized_opts= -+ac_unrecognized_sep= - # The variables have the same names as the options, with - # dashes changed to underlines. - cache_file=/dev/null -@@ -1138,13 +1195,21 @@ - datarootdir=$ac_optarg ;; - - -disable-* | --disable-*) -- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` -- eval enable_$ac_feature=no ;; -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval enable_$ac_useropt=no ;; - - -docdir | --docdir | --docdi | --doc | --do) - ac_prev=docdir ;; -@@ -1157,13 +1222,21 @@ - dvidir=$ac_optarg ;; - - -enable-* | --enable-*) -- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` -- eval enable_$ac_feature=\$ac_optarg ;; -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval enable_$ac_useropt=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -@@ -1354,22 +1427,38 @@ - ac_init_version=: ;; - - -with-* | --with-*) -- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package | sed 's/[-.]/_/g'` -- eval with_$ac_package=\$ac_optarg ;; -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval with_$ac_useropt=\$ac_optarg ;; - - -without-* | --without-*) -- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package | sed 's/[-.]/_/g'` -- eval with_$ac_package=no ;; -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval with_$ac_useropt=no ;; - - --x) - # Obsolete; use --with-x. -@@ -1389,7 +1478,7 @@ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - -- -*) { echo "$as_me: error: unrecognized option: $ac_option -+ -*) { $as_echo "$as_me: error: unrecognized option: $ac_option - Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } - ;; -@@ -1398,16 +1487,16 @@ - 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 && -- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 -+ { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } - eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. -- echo "$as_me: WARNING: you should use --build, --host, --target" >&2 -+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && -- echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} - ;; - -@@ -1416,22 +1505,38 @@ - - if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` -- { echo "$as_me: error: missing argument to $ac_option" >&2 -+ { $as_echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } - fi - --# Be sure to have absolute directory names. -+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; }; } ;; -+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; -+ esac -+fi -+ -+# Check all directory arguments for consistency. - for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir - do - eval ac_val=\$$ac_var -+ # Remove trailing slashes. -+ case $ac_val in -+ */ ) -+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` -+ eval $ac_var=\$ac_val;; -+ esac -+ # Be sure to have absolute directory names. - case $ac_val in - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac -- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -+ { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } - done - -@@ -1446,7 +1551,7 @@ - if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe -- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. -+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes -@@ -1462,10 +1567,10 @@ - ac_pwd=`pwd` && test -n "$ac_pwd" && - ac_ls_di=`ls -di .` && - ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -- { echo "$as_me: error: Working directory cannot be determined" >&2 -+ { $as_echo "$as_me: error: working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } - test "X$ac_ls_di" = "X$ac_pwd_ls_di" || -- { echo "$as_me: error: pwd does not report name of working directory" >&2 -+ { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } - - -@@ -1473,12 +1578,12 @@ - if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then the parent directory. -- ac_confdir=`$as_dirname -- "$0" || --$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$0" : 'X\(//\)[^/]' \| \ -- X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)' \| . 2>/dev/null || --echo X"$0" | -+ ac_confdir=`$as_dirname -- "$as_myself" || -+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_myself" : 'X\(//\)[^/]' \| \ -+ X"$as_myself" : 'X\(//\)$' \| \ -+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_myself" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q -@@ -1505,12 +1610,12 @@ - fi - if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -+ { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } - fi - ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" - ac_abs_confdir=`( -- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 -+ cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } - pwd)` - # When building in place, set srcdir=. -@@ -1559,9 +1664,9 @@ - - Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX -- [$ac_default_prefix] -+ [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -- [PREFIX] -+ [PREFIX] - - By default, \`make install' will install all the files in - \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -@@ -1571,25 +1676,26 @@ - For better control, use the options below. - - Fine tuning of the installation directories: -- --bindir=DIR user executables [EPREFIX/bin] -- --sbindir=DIR system admin executables [EPREFIX/sbin] -- --libexecdir=DIR program executables [EPREFIX/libexec] -- --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -- --localstatedir=DIR modifiable single-machine data [PREFIX/var] -- --libdir=DIR object code libraries [EPREFIX/lib] -- --includedir=DIR C header files [PREFIX/include] -- --oldincludedir=DIR C header files for non-gcc [/usr/include] -- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] -- --datadir=DIR read-only architecture-independent data [DATAROOTDIR] -- --infodir=DIR info documentation [DATAROOTDIR/info] -- --localedir=DIR locale-dependent data [DATAROOTDIR/locale] -- --mandir=DIR man documentation [DATAROOTDIR/man] -- --docdir=DIR documentation root [DATAROOTDIR/doc/gnome-power-manager] -- --htmldir=DIR html documentation [DOCDIR] -- --dvidir=DIR dvi documentation [DOCDIR] -- --pdfdir=DIR pdf documentation [DOCDIR] -- --psdir=DIR ps documentation [DOCDIR] -+ --bindir=DIR user executables [EPREFIX/bin] -+ --sbindir=DIR system admin executables [EPREFIX/sbin] -+ --libexecdir=DIR program executables [EPREFIX/libexec] -+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -+ --localstatedir=DIR modifiable single-machine data [PREFIX/var] -+ --libdir=DIR object code libraries [EPREFIX/lib] -+ --includedir=DIR C header files [PREFIX/include] -+ --oldincludedir=DIR C header files for non-gcc [/usr/include] -+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] -+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] -+ --infodir=DIR info documentation [DATAROOTDIR/info] -+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] -+ --mandir=DIR man documentation [DATAROOTDIR/man] -+ --docdir=DIR documentation root -+ [DATAROOTDIR/doc/gnome-power-manager] -+ --htmldir=DIR html documentation [DOCDIR] -+ --dvidir=DIR dvi documentation [DOCDIR] -+ --pdfdir=DIR pdf documentation [DOCDIR] -+ --psdir=DIR ps documentation [DOCDIR] - _ACEOF - - cat <<\_ACEOF -@@ -1616,6 +1722,7 @@ - cat <<\_ACEOF - - Optional Features: -+ --disable-option-checking ignore unrecognized --enable/--with options - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking speeds up one-time build -@@ -1719,15 +1826,17 @@ - if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue -- test -d "$ac_dir" || continue -+ test -d "$ac_dir" || -+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || -+ continue - ac_builddir=. - - case "$ac_dir" in - .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. -- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` -+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -@@ -1763,7 +1872,7 @@ - echo && - $SHELL "$ac_srcdir/configure" --help=recursive - else -- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi || ac_status=$? - cd "$ac_pwd" || { ac_status=$?; break; } - done -@@ -1773,10 +1882,10 @@ - if $ac_init_version; then - cat <<\_ACEOF - gnome-power-manager configure 2.24.0 --generated by GNU Autoconf 2.61 -+generated by GNU Autoconf 2.63 - - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, --2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - _ACEOF -@@ -1787,7 +1896,7 @@ - running configure, to aid debugging if configure makes a mistake. - - It was created by gnome-power-manager $as_me 2.24.0, which was --generated by GNU Autoconf 2.61. Invocation command line was -+generated by GNU Autoconf 2.63. Invocation command line was - - $ $0 $@ - -@@ -1823,7 +1932,7 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- echo "PATH: $as_dir" -+ $as_echo "PATH: $as_dir" - done - IFS=$as_save_IFS - -@@ -1858,7 +1967,7 @@ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *\'*) -- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -@@ -1910,11 +2019,12 @@ - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( -- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 --echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; -+ *_cv_*) { $as_echo "$as_me:$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 ;; - esac ;; - esac -@@ -1944,9 +2054,9 @@ - do - eval ac_val=\$$ac_var - case $ac_val in -- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac -- echo "$ac_var='\''$ac_val'\''" -+ $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - -@@ -1961,9 +2071,9 @@ - do - eval ac_val=\$$ac_var - case $ac_val in -- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac -- echo "$ac_var='\''$ac_val'\''" -+ $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi -@@ -1979,8 +2089,8 @@ - echo - fi - test "$ac_signal" != 0 && -- echo "$as_me: caught signal $ac_signal" -- echo "$as_me: exit $exit_status" -+ $as_echo "$as_me: caught signal $ac_signal" -+ $as_echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && -@@ -2022,21 +2132,24 @@ - - - # Let the site file select an alternate cache file if it wants to. --# Prefer explicitly selected file to automatically selected ones. -+# Prefer an explicitly selected file to automatically selected ones. -+ac_site_file1=NONE -+ac_site_file2=NONE - if test -n "$CONFIG_SITE"; then -- set x "$CONFIG_SITE" -+ ac_site_file1=$CONFIG_SITE - elif test "x$prefix" != xNONE; then -- set x "$prefix/share/config.site" "$prefix/etc/config.site" -+ ac_site_file1=$prefix/share/config.site -+ ac_site_file2=$prefix/etc/config.site - else -- set x "$ac_default_prefix/share/config.site" \ -- "$ac_default_prefix/etc/config.site" -+ ac_site_file1=$ac_default_prefix/share/config.site -+ ac_site_file2=$ac_default_prefix/etc/config.site - fi --shift --for ac_site_file -+for ac_site_file in "$ac_site_file1" "$ac_site_file2" - do -+ test "x$ac_site_file" = xNONE && continue - if test -r "$ac_site_file"; then -- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 --echo "$as_me: loading site script $ac_site_file" >&6;} -+ { $as_echo "$as_me:$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" - fi -@@ -2046,16 +2159,16 @@ - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then -- { echo "$as_me:$LINENO: loading cache $cache_file" >&5 --echo "$as_me: loading cache $cache_file" >&6;} -+ { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 -+$as_echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; - esac - fi - else -- { echo "$as_me:$LINENO: creating cache $cache_file" >&5 --echo "$as_me: creating cache $cache_file" >&6;} -+ { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 -+$as_echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file - fi - -@@ -2069,29 +2182,38 @@ - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) -- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} -+ { $as_echo "$as_me:$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) -- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} -+ { $as_echo "$as_me:$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=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then -- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 --echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 --echo "$as_me: former value: $ac_old_val" >&2;} -- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 --echo "$as_me: current value: $ac_new_val" >&2;} -- ac_cache_corrupted=: -+ # differences in whitespace do not lead to failure. -+ 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: 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: 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: former value: \`$ac_old_val'" >&2;} -+ { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 -+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in -- *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in -@@ -2101,10 +2223,12 @@ - fi - done - if $ac_cache_corrupted; then -- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 --echo "$as_me: error: changes in the environment can compromise the build" >&2;} -- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 --echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} -+ { $as_echo "$as_me:$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: 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; }; } - fi - -@@ -2159,8 +2283,8 @@ - fi - done - if test -z "$ac_aux_dir"; then -- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 --echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} -+ { { $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; }; } - fi - -@@ -2186,11 +2310,12 @@ - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" - # OS/2's system install, which has a completely different semantic - # ./install, which can be erroneously created by make from ./install.sh. --{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 --echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } -+# Reject install programs that cannot install multiple files. -+{ $as_echo "$as_me:$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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH -@@ -2219,17 +2344,29 @@ - # program-specific install script used by HP pwplus--don't use. - : - else -- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -- break 3 -+ rm -rf conftest.one conftest.two conftest.dir -+ echo one > conftest.one -+ echo two > conftest.two -+ mkdir conftest.dir -+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && -+ test -s conftest.one && test -s conftest.two && -+ test -s conftest.dir/conftest.one && -+ test -s conftest.dir/conftest.two -+ then -+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -+ break 3 -+ fi - fi - fi - done - done - ;; - esac -+ - done - IFS=$as_save_IFS - -+rm -rf conftest.one conftest.two conftest.dir - - fi - if test "${ac_cv_path_install+set}" = set; then -@@ -2242,8 +2379,8 @@ - INSTALL=$ac_install_sh - fi - fi --{ echo "$as_me:$LINENO: result: $INSTALL" >&5 --echo "${ECHO_T}$INSTALL" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 -+$as_echo "$INSTALL" >&6; } - - # Use test -z because SunOS4 sh mishandles braces in ${var-val}. - # It thinks the first close brace ends the variable substitution. -@@ -2253,8 +2390,8 @@ - - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - --{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 --echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -+$as_echo_n "checking whether build environment is sane... " >&6; } - # Just in case - sleep 1 - echo timestamp > conftest.file -@@ -2277,9 +2414,9 @@ - # 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". -- { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -+ { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken - alias in your environment" >&5 --echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -+$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; }; } - fi -@@ -2290,26 +2427,23 @@ - # Ok. - : - else -- { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! -+ { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! - Check your system clock" >&5 --echo "$as_me: error: newly created file is older than distributed files! -+$as_echo "$as_me: error: newly created file is older than distributed files! - Check your system clock" >&2;} - { (exit 1); exit 1; }; } - fi --{ echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -+{ $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } - test "$program_prefix" != NONE && - program_transform_name="s&^&$program_prefix&;$program_transform_name" - # Use a double $ so make ignores it. - test "$program_suffix" != NONE && - program_transform_name="s&\$&$program_suffix&;$program_transform_name" --# Double any \ or $. echo might interpret backslashes. -+# Double any \ or $. - # By default was `s,x,x', remove it if useless. --cat <<\_ACEOF >conftest.sed --s/[\\$]/&&/g;s/;s,x,x,$// --_ACEOF --program_transform_name=`echo $program_transform_name | sed -f conftest.sed` --rm -f conftest.sed -+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' -+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` - - # expand $ac_aux_dir to an absolute path - am_aux_dir=`cd $ac_aux_dir && pwd` -@@ -2320,15 +2454,15 @@ - am_missing_run="$MISSING --run " - else - am_missing_run= -- { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 --echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 -+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} - fi - --{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 --echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin -@@ -2363,8 +2497,8 @@ - MKDIR_P="$ac_install_sh -d" - fi - fi --{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 --echo "${ECHO_T}$MKDIR_P" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 -+$as_echo "$MKDIR_P" >&6; } - - mkdir_p="$MKDIR_P" - case $mkdir_p in -@@ -2376,10 +2510,10 @@ - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_AWK+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -@@ -2392,7 +2526,7 @@ - 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" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -2403,22 +2537,23 @@ - fi - AWK=$ac_cv_prog_AWK - if test -n "$AWK"; then -- { echo "$as_me:$LINENO: result: $AWK" >&5 --echo "${ECHO_T}$AWK" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $AWK" >&5 -+$as_echo "$AWK" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - - test -n "$AWK" && break - done - --{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 --echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } --set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -+{ $as_echo "$as_me:$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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.make <<\_ACEOF - SHELL = /bin/sh -@@ -2435,12 +2570,12 @@ - rm -f conftest.make - fi - if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } - SET_MAKE= - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" - fi - -@@ -2459,8 +2594,8 @@ - am__isrc=' -I$(srcdir)' - # test to see if srcdir already configured - if test -f $srcdir/config.status; then -- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 --echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} -+ { { $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; }; } - fi - fi -@@ -2515,10 +2650,10 @@ - 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_STRIP+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -@@ -2531,7 +2666,7 @@ - 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" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -2542,11 +2677,11 @@ - fi - STRIP=$ac_cv_prog_STRIP - if test -n "$STRIP"; then -- { echo "$as_me:$LINENO: result: $STRIP" >&5 --echo "${ECHO_T}$STRIP" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 -+$as_echo "$STRIP" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -2555,10 +2690,10 @@ - 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -@@ -2571,7 +2706,7 @@ - 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" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -2582,11 +2717,11 @@ - fi - ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP - if test -n "$ac_ct_STRIP"; then -- { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 --echo "${ECHO_T}$ac_ct_STRIP" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -+$as_echo "$ac_ct_STRIP" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - if test "x$ac_ct_STRIP" = x; then -@@ -2594,12 +2729,8 @@ - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools --whose name does not start with the host triplet. If you think this --configuration is useful to you, please write to autoconf@gnu.org." >&5 --echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools --whose name does not start with the host triplet. If you think this --configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+{ $as_echo "$as_me:$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 - STRIP=$ac_ct_STRIP -@@ -2635,10 +2766,10 @@ - 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -2651,7 +2782,7 @@ - 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" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -2662,11 +2793,11 @@ - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -2675,10 +2806,10 @@ - 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -2691,7 +2822,7 @@ - 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" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -2702,11 +2833,11 @@ - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+$as_echo "$ac_ct_CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - if test "x$ac_ct_CC" = x; then -@@ -2714,12 +2845,8 @@ - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools --whose name does not start with the host triplet. If you think this --configuration is useful to you, please write to autoconf@gnu.org." >&5 --echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools --whose name does not start with the host triplet. If you think this --configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+{ $as_echo "$as_me:$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 - CC=$ac_ct_CC -@@ -2732,10 +2859,10 @@ - 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -2748,7 +2875,7 @@ - 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" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -2759,11 +2886,11 @@ - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -2772,10 +2899,10 @@ - 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -2793,7 +2920,7 @@ - continue - fi - ac_cv_prog_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -2816,11 +2943,11 @@ - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -2831,10 +2958,10 @@ - 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -2847,7 +2974,7 @@ - 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" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -2858,11 +2985,11 @@ - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -2875,10 +3002,10 @@ - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -2891,7 +3018,7 @@ - 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" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -2902,11 +3029,11 @@ - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+$as_echo "$ac_ct_CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -2918,12 +3045,8 @@ - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools --whose name does not start with the host triplet. If you think this --configuration is useful to you, please write to autoconf@gnu.org." >&5 --echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools --whose name does not start with the host triplet. If you think this --configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+{ $as_echo "$as_me:$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 - CC=$ac_ct_CC -@@ -2933,44 +3056,50 @@ - fi - - --test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -+test -z "$CC" && { { $as_echo "$as_me:$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 --echo "$as_me: error: no acceptable C compiler found in \$PATH -+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ { (exit 1); exit 1; }; }; } - - # Provide some information about the compiler. --echo "$as_me:$LINENO: checking for C compiler version" >&5 --ac_compiler=`set X $ac_compile; echo $2` -+$as_echo "$as_me:$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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - - cat >conftest.$ac_ext <<_ACEOF -@@ -2989,27 +3118,22 @@ - } - _ACEOF - ac_clean_files_save=$ac_clean_files --ac_clean_files="$ac_clean_files a.out a.exe b.out" -+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.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. --{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 --echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } --ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` --# --# List of possible output files, starting from the most likely. --# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) --# only as a last resort. b.out is created by i960 compilers. --ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' --# --# The IRIX 6 linker writes into existing files which may not be --# executable, retaining their permissions. Remove them first so a --# subsequent execution test works. -+{ $as_echo "$as_me:$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[^ ]*//'` -+ -+# The possible output files: -+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" -+ - ac_rmfiles= - for ac_file in $ac_files - do - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - * ) ac_rmfiles="$ac_rmfiles $ac_file";; - esac - done -@@ -3020,10 +3144,11 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link_default") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; 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' -@@ -3034,7 +3159,7 @@ - do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most -@@ -3061,25 +3186,27 @@ - ac_file='' - fi - --{ echo "$as_me:$LINENO: result: $ac_file" >&5 --echo "${ECHO_T}$ac_file" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 -+$as_echo "$ac_file" >&6; } - if test -z "$ac_file"; then -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { echo "$as_me:$LINENO: error: C compiler cannot create executables -+{ { $as_echo "$as_me:$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 --echo "$as_me: error: C compiler cannot create executables -+$as_echo "$as_me: error: C compiler cannot create executables - See \`config.log' for more details." >&2;} -- { (exit 77); exit 77; }; } -+ { (exit 77); exit 77; }; }; } - 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. --{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 --echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$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 -@@ -3088,49 +3215,53 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else -- { { echo "$as_me:$LINENO: error: cannot run C compiled programs. -+ { { $as_echo "$as_me:$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. - If you meant to cross compile, use \`--host'. - See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run C compiled programs. -+$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; }; } -+ { (exit 1); exit 1; }; }; } - fi - fi - fi --{ echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -+{ $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } - --rm -f a.out a.exe conftest$ac_cv_exeext b.out -+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.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. --{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 --echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } --{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 --echo "${ECHO_T}$cross_compiling" >&6; } -+{ $as_echo "$as_me:$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 "$cross_compiling" >&6; } - --{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 --echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 -+$as_echo_n "checking for suffix of executables... " >&6; } - if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # If both `conftest.exe' and `conftest' are `present' (well, observable) - # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -@@ -3139,31 +3270,33 @@ - for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - break;; - * ) break;; - esac - done - else -- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -+ { { $as_echo "$as_me:$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 --echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -+$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; }; } -+ { (exit 1); exit 1; }; }; } - fi - - rm -f conftest$ac_cv_exeext --{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 --echo "${ECHO_T}$ac_cv_exeext" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -+$as_echo "$ac_cv_exeext" >&6; } - - rm -f conftest.$ac_ext - EXEEXT=$ac_cv_exeext - ac_exeext=$EXEEXT --{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 --echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -3186,40 +3319,43 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac - done - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -+{ { $as_echo "$as_me:$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 --echo "$as_me: error: cannot compute suffix of object files: cannot compile -+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ { (exit 1); exit 1; }; }; } - fi - - rm -f conftest.$ac_cv_objext conftest.$ac_ext - fi --{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 --echo "${ECHO_T}$ac_cv_objext" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -+$as_echo "$ac_cv_objext" >&6; } - OBJEXT=$ac_cv_objext - ac_objext=$OBJEXT --{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -3245,20 +3381,21 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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_compiler_gnu=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -@@ -3268,15 +3405,19 @@ - ac_cv_c_compiler_gnu=$ac_compiler_gnu - - fi --{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } --GCC=`test $ac_compiler_gnu = yes && echo yes` -+{ $as_echo "$as_me:$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 -+else -+ GCC= -+fi - ac_test_CFLAGS=${CFLAGS+set} - ac_save_CFLAGS=$CFLAGS --{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 --echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes -@@ -3303,20 +3444,21 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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_prog_cc_g=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" -@@ -3341,20 +3483,21 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_c_werror_flag=$ac_save_c_werror_flag -@@ -3380,20 +3523,21 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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_prog_cc_g=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - -@@ -3408,8 +3552,8 @@ - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag - fi --{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } -+{ $as_echo "$as_me:$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 - elif test $ac_cv_prog_cc_g = yes; then -@@ -3425,10 +3569,10 @@ - CFLAGS= - fi - fi --{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 --echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_cv_prog_cc_c89=no - ac_save_CC=$CC -@@ -3499,20 +3643,21 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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_prog_cc_c89=$ac_arg - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - -@@ -3528,15 +3673,15 @@ - # AC_CACHE_VAL - case "x$ac_cv_prog_cc_c89" in - x) -- { echo "$as_me:$LINENO: result: none needed" >&5 --echo "${ECHO_T}none needed" >&6; } ;; -+ { $as_echo "$as_me:$LINENO: result: none needed" >&5 -+$as_echo "none needed" >&6; } ;; - xno) -- { echo "$as_me:$LINENO: result: unsupported" >&5 --echo "${ECHO_T}unsupported" >&6; } ;; -+ { $as_echo "$as_me:$LINENO: result: unsupported" >&5 -+$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" -- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; -+ { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; - esac - - -@@ -3557,8 +3702,8 @@ - .PHONY: am__doit - END - # If we don't find an include directive, just comment out the code. --{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 --echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$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= - _am_result=none -@@ -3585,8 +3730,8 @@ - fi - - --{ echo "$as_me:$LINENO: result: $_am_result" >&5 --echo "${ECHO_T}$_am_result" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 -+$as_echo "$_am_result" >&6; } - rm -f confinc confmf - - # Check whether --enable-dependency-tracking was given. -@@ -3610,10 +3755,10 @@ - - depcc="$CC" am_compiler_list= - --{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 --echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up -@@ -3701,8 +3846,8 @@ - fi - - fi --{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 --echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } -+{ $as_echo "$as_me:$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 - - if -@@ -3717,16 +3862,16 @@ - - - if test "x$CC" != xcc; then -- { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5 --echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5 -+$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } - else -- { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5 --echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5 -+$as_echo_n "checking whether cc understands -c and -o together... " >&6; } - fi --set dummy $CC; ac_cc=`echo $2 | -+set dummy $CC; ac_cc=`$as_echo "$2" | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` - if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -3752,19 +3897,21 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - test -f conftest2.$ac_objext && { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; - then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes -@@ -3775,10 +3922,11 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' - rm -f conftest2.* -@@ -3786,19 +3934,21 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - test -f conftest2.$ac_objext && { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; - then - # cc works too. -@@ -3816,11 +3966,11 @@ - - fi - if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - - cat >>confdefs.h <<\_ACEOF - #define NO_MINUS_C_MINUS_O 1 -@@ -3856,11 +4006,12 @@ - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" - # OS/2's system install, which has a completely different semantic - # ./install, which can be erroneously created by make from ./install.sh. --{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 --echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } -+# Reject install programs that cannot install multiple files. -+{ $as_echo "$as_me:$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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH -@@ -3889,17 +4040,29 @@ - # program-specific install script used by HP pwplus--don't use. - : - else -- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -- break 3 -+ rm -rf conftest.one conftest.two conftest.dir -+ echo one > conftest.one -+ echo two > conftest.two -+ mkdir conftest.dir -+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && -+ test -s conftest.one && test -s conftest.two && -+ test -s conftest.dir/conftest.one && -+ test -s conftest.dir/conftest.two -+ then -+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -+ break 3 -+ fi - fi - fi - done - done - ;; - esac -+ - done - IFS=$as_save_IFS - -+rm -rf conftest.one conftest.two conftest.dir - - fi - if test "${ac_cv_path_install+set}" = set; then -@@ -3912,8 +4075,8 @@ - INSTALL=$ac_install_sh - fi - fi --{ echo "$as_me:$LINENO: result: $INSTALL" >&5 --echo "${ECHO_T}$INSTALL" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 -+$as_echo "$INSTALL" >&6; } - - # Use test -z because SunOS4 sh mishandles braces in ${var-val}. - # It thinks the first close brace ends the variable substitution. -@@ -3997,34 +4160,34 @@ - - # Make sure we can run config.sub. - $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || -- { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 --echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} -+ { { $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; }; } - --{ echo "$as_me:$LINENO: checking build system type" >&5 --echo $ECHO_N "checking build system type... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking build system type" >&5 -+$as_echo_n "checking build system type... " >&6; } - if test "${ac_cv_build+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $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 && -- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 --echo "$as_me: error: cannot guess build type; you must specify one" >&2;} -+ { { $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; }; } - ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || -- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 --echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} -+ { { $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; }; } - - fi --{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 --echo "${ECHO_T}$ac_cv_build" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -+$as_echo "$ac_cv_build" >&6; } - case $ac_cv_build in - *-*-*) ;; --*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 --echo "$as_me: error: invalid value of canonical build" >&2;} -+*) { { $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; }; };; - esac - build=$ac_cv_build -@@ -4041,27 +4204,27 @@ - case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - --{ echo "$as_me:$LINENO: checking host system type" >&5 --echo $ECHO_N "checking host system type... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking host system type" >&5 -+$as_echo_n "checking host system type... " >&6; } - if test "${ac_cv_host+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $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` || -- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 --echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} -+ { { $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; }; } - fi - - fi --{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 --echo "${ECHO_T}$ac_cv_host" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -+$as_echo "$ac_cv_host" >&6; } - case $ac_cv_host in - *-*-*) ;; --*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 --echo "$as_me: error: invalid value of canon