--- pygtk-2.14.1.orig/debian/docs +++ pygtk-2.14.1/debian/docs @@ -0,0 +1,5 @@ +NEWS +README +TODO +MAPPING +THREADS --- pygtk-2.14.1.orig/debian/control +++ pygtk-2.14.1/debian/control @@ -0,0 +1,144 @@ +Source: pygtk +Section: python +Priority: optional +Maintainer: Sebastien Bacher +Uploaders: Torsten Landschoff , + Debian GNOME Maintainers , Josselin Mouette , Loic Minier +Build-Depends: debhelper (>= 5), + python-support (>= 0.7.6), + gnome-pkg-tools (>= 0.10), + cdbs, + autotools-dev, + quilt, + xvfb (>= 2:1.6.0), xauth, xfonts-base, + python2.5-dev (>= 2.5.2-5), + python-all-dev (>= 2.5), + python-all-dbg, + libgtk2.0-dev (>= 2.13.6), + libglib2.0-dev (>= 2.8.0), + libpango1.0-dev (>= 1.16.0), + libatk1.0-dev (>= 1.12.0), + libglade2-dev (>= 2.5.0), + python-numpy-dbg (>= 1:1.0.4-1~), + python-cairo-dev (>= 1.0.2), + python-gobject-dev (>= 2.15.3), + xsltproc, + docbook-xsl, + autotools-dev, + gnome-icon-theme +XS-Python-Version: >= 2.5 +Standards-Version: 3.8.0 +Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/experimental/pygtk/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/experimental/pygtk/ +Homepage: http://www.pygtk.org/ + +Package: python-gtk2 +Architecture: any +Depends: ${python:Depends}, + python2.5 (>= 2.5.2-5), + ${shlibs:Depends}, + ${misc:Depends} +Python-Depends: python-cairo (>= 1.0.2-1.1), + python-gobject (>= 2.15.3), + python-numpy +Suggests: python-gtk2-doc +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Conflicts: python-gdk-imlib, + python-glade, + python-gnome, + python-gtk, + python2.3-gtk2, + python2.4-gtk2, + python-gtk-1.2 (<< 0.6.12-7) +Description: Python bindings for the GTK+ widget set + This archive contains modules that allow you to use GTK+ in Python + programs. This package contains the bindings for the version 2.0 + of that toolkit. + +Package: python-gtk2-dbg +Architecture: any +Priority: extra +Section: debug +Depends: python-gtk2 (= ${binary:Version}), + python-glade2 (= ${binary:Version}), + python-dbg, + python-numpy-dbg, + python-cairo-dbg, + python-gobject-dbg, + ${shlibs:Depends} +Description: Python bindings for the GTK+ widget set (debug extension) + This archive contains modules that allow you to use GTK+ in Python + programs. This package contains the bindings for the version 2.0 + of that toolkit. + . + This package contains the extension built for the Python debug interpreter. + +Package: python-gtk2-dev +Architecture: all +Depends: ${python:Depends}, + python-gtk2 (>= ${source:Version}), + libglib2.0-dev (>= 2.8), + libgtk2.0-dev (>= 2.13.6), + python2.5-dev (>= 2.5.2-5), + python-dev, + python-gobject-dev (>= 2.15.3) +Recommends: python-gtk2-doc +Replaces: python2.2-gtk2 (<< 1.99.17-4), + python2.3-gtk2 (<< 1.99.17-4), + python2.2-glade2 (<< 1.99.17-4), + python2.3-glade2 (<< 1.99.17-4) +Conflicts: python2.2-gtk2 (<< 1.99.17-4), + python2.3-gtk2 (<< 1.99.17-4), + python2.2-glade2 (<< 1.99.17-4), + python2.3-glade2 (<< 1.99.17-4), + python-gdk-imlib, + python-glade, + python-gnome, + python-gtk +Description: GTK+ bindings: devel files + This archive contains files that allow you to build wrappers for addons + that interoperate with python-gtk2 (pygtk). + +Package: python-glade2 +Architecture: any +Depends: ${python:Depends}, + ${shlibs:Depends}, + ${misc:Depends}, + python-gtk2 (= ${binary:Version}) +Suggests: python-gtk2-doc +Conflicts: python-gdk-imlib, + python-glade, + python-gnome, + python-gtk, + python2.3-glade2, + python2.4-glade2 +Provides: ${python:Provides} +Description: GTK+ bindings: Glade support + Contains bindings for the glade library from use within Python. Glade + makes it very easy to create a user interface. In the target + application you just need to load the interface description from + the .glade file instead of constructing the GUI at runtime. + +Package: python-gtk2-doc +Architecture: all +Section: doc +XB-Python-Version: ${python:Versions} +Depends: ${misc:Depends}, + ${python:Depends}, + python-gtk2, +Conflicts: python-gtk2 (<< 2.10.4-3) +Recommends: python-gobject, + python-cairo, + python-glade2 +Suggests: devhelp +Description: Python bindings for the GTK+ widget set - documentation + This package contains the documentation and API reference for the + Python bindings of the Pango, ATK, GDK, GTK+ and Glade libraries. + It is well structured and easy to use. + . + The documentation can be browsed with the devhelp documentation + browser, or with a regular web browser. + . + This package also provides several examples showing how to use these + bindings to build simple GUI applications. --- pygtk-2.14.1.orig/debian/rules +++ pygtk-2.14.1/debian/rules @@ -0,0 +1,189 @@ +#!/usr/bin/make -f + +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2) + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +configure_flags += --prefix=/usr --enable-thread --build=$(DEB_BUILD_GNU_TYPE) + +ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) + configure_flags += --host=$(DEB_HOST_GNU_TYPE) +endif + +PYDEFAULTVER := $(shell pyversions --default --version) +PYVERS := $(shell pyversions --requested --version debian/control) +PYVERS := $(filter-out $(PYDEFAULTVER), $(PYVERS)) $(PYDEFAULTVER) + +.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp + +# how to call quilt +PATCH_DIR := $(CURDIR)/debian/patches +QUILT := QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null + +patch-stamp: + dh_testdir + # apply patches + $(QUILT) push -a || test $$? = 2 + # backup the original files to restore them in the clean target + [ ! -r config.sub ] || \ + (cp config.sub config.sub.orig && \ + cp /usr/share/misc/config.sub config.sub) + [ ! -r config.guess ] || \ + (cp config.guess config.guess.orig && \ + cp /usr/share/misc/config.guess config.guess) + touch $@ + +patch: patch-stamp + +unpatch: + rm -f patch-stamp + # restore files from backup (before unpatching) + [ ! -r config.sub.orig ] || \ + cp config.sub.orig config.sub + [ ! -r config.guess.orig ] || \ + cp config.guess.orig config.guess + # unapply patches, if any + $(QUILT) pop -a || test $$? = 2 + rm -rf .pc + +build-%/configure-stamp: patch-stamp + dh_testdir + mkdir -p build-$* + cd build-$* && \ + PYTHON=/usr/bin/python$* CFLAGS="$(CFLAGS)" \ + $(CURDIR)/configure $(configure_flags) + touch $@ + +build-%/build-stamp: build-%/configure-stamp + dh_testdir + PYTHON=/usr/bin/python$* $(MAKE) -C build-$* pyexecdir=/var/lib/python-support/python$* + xvfb-run -s -noreset $(MAKE) -C build-$* check + touch $@ + +dbg-build-%/configure-stamp: patch-stamp + dh_testdir + mkdir -p dbg-build-$* + cd dbg-build-$* && \ + PYTHON=/usr/bin/python$*-dbg CFLAGS="$(CFLAGS) -O0" \ + $(CURDIR)/configure $(configure_flags) + touch $@ + +dbg-build-%/build-stamp: dbg-build-%/configure-stamp + dh_testdir + PYTHON=/usr/bin/python$*-dbg $(MAKE) -C dbg-build-$* + touch $@ + +build: $(PYVERS:%=build-%/build-stamp) $(PYVERS:%=dbg-build-%/build-stamp) + +build-%/install-stamp: build-%/build-stamp + dh_testdir + dh_testroot + PYTHON=/usr/bin/python$* $(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp pyexecdir=/var/lib/python-support/python$* + # move installed files to a per python runtime location to allow + # comparison of the resulting files across runtimes or shipping + # multiple versions + # pkg-config file (this is shipped twice because of varying pyexecdir) + mkdir debian/tmp/usr/lib/pkgconfig/python$* + mv debian/tmp/usr/lib/pkgconfig/*.pc debian/tmp/usr/lib/pkgconfig/python$* + # defs files, should be the same whatever the build-time python runtime + mkdir debian/tmp/usr/share/pygtk/2.0/defs/python$* + mv debian/tmp/usr/share/pygtk/2.0/defs/*.defs debian/tmp/usr/share/pygtk/2.0/defs/python$* + # headers, should be the same whatever the build-time python runtime + mkdir debian/tmp/usr/include/python$* + mv debian/tmp/usr/include/pygtk-2.0 debian/tmp/usr/include/python$* + +dbg-build-%/install-stamp: dbg-build-%/build-stamp + dh_testdir + dh_testroot + PYTHON=/usr/bin/python$* $(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-gtk2-dbg + find debian/python-gtk2-dbg ! -type d ! -name '*.so' | xargs rm -f + find debian/python-gtk2-dbg -depth -empty -exec rmdir {} \; + touch $@ + +install-stamp: + dh_testdir + dh_testroot + # remove the install stamps to force a reinstall (since dh_clean is + # removing the package dirs) + dh_clean -k $(PYVERS:%=build-%/install-stamp) $(PYVERS:%=dbg-build-%/install-stamp) + $(MAKE) -f debian/rules $(PYVERS:%=build-%/install-stamp) $(PYVERS:%=dbg-build-%/install-stamp) + # check that all builds with various Python runtimes produced the same + # *.defs files (or fail) + for v in $(PYVERS); do \ + echo "Comparing defs files for the default Python version ($(PYDEFAULTVER)) with defs files for Python $$v"; \ + diff --brief --recursive debian/tmp/usr/share/pygtk/2.0/defs/python$(PYDEFAULTVER) debian/tmp/usr/share/pygtk/2.0/defs/python$$v; \ + echo "Comparing headers for the default Python version ($(PYDEFAULTVER)) with headers for Python $$v"; \ + diff --brief --recursive debian/tmp/usr/include/python$(PYDEFAULTVER) debian/tmp/usr/include/python$$v; \ + done + # since all Python runtimes produced the same files, only keep one set + echo "Cleaning up" + mv debian/tmp/usr/share/pygtk/2.0/defs/python$(PYDEFAULTVER)/*.defs debian/tmp/usr/share/pygtk/2.0/defs + mv debian/tmp/usr/include/python$(PYDEFAULTVER)/* debian/tmp/usr/include + for v in $(PYVERS); do \ + rm --force --recursive debian/tmp/usr/share/pygtk/2.0/defs/python$$v; \ + rm --force --recursive debian/tmp/usr/share/include/python$$v; \ + done + # finally, install files from DESTDIR in the per-package dirs + dh_install + # install rtupdate script to handle Python default runtime change + install -d debian/python-gtk2-dev/usr/share/python/runtime.d + install debian/python-gtk2-dev.rtupdate debian/python-gtk2-dev/usr/share/python/runtime.d + for i in $$(find debian/python-*-dbg -name '*.so'); do \ + b=$$(basename $$i .so); \ + mv $$i $$(dirname $$i)/$${b}_d.so; \ + done + +install: install-stamp + +clean:: + dh_testdir + dh_testroot + rm -f install-stamp + rm -rf debian/tmp-* + rm -rf build-* dbg-build-* + $(MAKE) -f debian/rules unpatch + dh_clean + +binary-indep: build install + dh_testdir + dh_testroot + dh_installdocs -i + dh_installexamples -i + find debian/python-gtk2-doc/usr/share/doc -name '*.py[co]' -delete + dh_installchangelogs -i ChangeLog + dh_link -i + dh_compress -i -X.py -X.glade + dh_fixperms -i + # More permission fixing + grep -rlZ "^#\!.*python" debian/python-gtk2-dev/usr | xargs -0r chmod 755 + dh_pysupport -ppython-gtk2-doc /usr/share/pygtk + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs -s + dh_installexamples -s + dh_installchangelogs ChangeLog -s + dh_strip -s -Npython-gtk2-dbg --dbg-package=python-gtk2-dbg + rm -rf debian/python-gtk2-dbg/usr/share/doc/python-gtk2-dbg + ln -s python-gtk2 debian/python-gtk2-dbg/usr/share/doc/python-gtk2-dbg + dh_link -s + dh_compress -s -X.py -X.glade + dh_fixperms -s + dh_pysupport -s + dh_installdeb -s + dh_shlibdeps -s + dh_gencontrol -s + dh_md5sums -s + dh_builddeb -s + +binary: binary-arch binary-indep +.PHONY: patch unpatch build install clean binary-indep binary-arch binary --- pygtk-2.14.1.orig/debian/watch +++ pygtk-2.14.1/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://ftp.gnome.org/pub/GNOME/sources/pygtk/([\d\.]+)[02468]/pygtk-([\d\.]+)\.tar\.gz --- pygtk-2.14.1.orig/debian/python-gtk2-doc.postinst +++ pygtk-2.14.1/debian/python-gtk2-doc.postinst @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +olddir=/usr/share/doc/python-gtk2-doc/html +newdir=../../gtk-doc/html/pygtk + +if [ -d $olddir ] && ! [ -L $olddir ]; then + rmdir --ignore-fail-on-non-empty $olddir && ln -s $newdir $olddir +fi + +#DEBHELPER# --- pygtk-2.14.1.orig/debian/python-gtk2-doc.install +++ pygtk-2.14.1/debian/python-gtk2-doc.install @@ -0,0 +1,3 @@ +debian/tmp/usr/share/gtk-doc +debian/tmp/usr/bin/pygtk-demo +debian/tmp/usr/lib/pygtk/2.0 usr/share/pygtk --- pygtk-2.14.1.orig/debian/changelog +++ pygtk-2.14.1/debian/changelog @@ -0,0 +1,829 @@ +pygtk (2.14.1-3) unstable; urgency=low + + [ Josselin Mouette ] + * Fix section for debug package. + + [ Emilio Pozuelo Monfort ] + * Stop build-depending on libgl1-mesa-dri, it was a workaround. + Instead, require an Xvfb that isn't problematic. Closes: #524543. + + [ Josselin Mouette ] + * 10_maintainer_mode: define AM_MAINTAINER_MODE to avoid re-running + the autotools during the build process. + * 70_autoconf.patch renamed to 70_autotools.patch: run the whole + autotools stack, not just autoconf. + * Together, closes: #527858. + + -- Josselin Mouette Fri, 29 May 2009 09:26:13 +0200 + +pygtk (2.14.1-2) unstable; urgency=low + + * Bring back python-numpy to Depends since get_pixels_array can be + used even from an application that doesn’t import numpy explicitly. + Closes: #519233. + + -- Josselin Mouette Thu, 09 Apr 2009 18:59:37 +0200 + +pygtk (2.14.1-1) unstable; urgency=low + + * New upstream release. + + 65_bogus-python-includes.patch: removed, merged upstream. + + 70_autoconf.patch: regenerated. + + -- Josselin Mouette Mon, 09 Mar 2009 11:43:13 +0100 + +pygtk (2.13.0-3) unstable; urgency=low + + [ Loic Minier ] + * Pass PYTHON to $(MAKE) runs for robustness in case of timestamp skews; see + #509192; thanks Colin Watson for the original patch. + * Don't purge /usr/share/doc/python-gtk2-doc/examples/demos during first + configuration. + * Rework patch and config.sub/.guess handling: backup config.guess and .sub, + call quilt instead of relying on cdbs' quilt patchsys, restore + config.guess and .sub after unpatching. This avoids config.guess and + .subin the diff, and allows control over fully working and fully patched + trees. + * Don't strip python-gtk2-dbg. + * Rework install rules and dependencies completely to avoid .PHONY implicit + targets. + + [ Josselin Mouette ] + * 65_bogus-python-includes.patch: patch from Loïc Minier. Don’t + override PYTHON_INCLUDES, already set by AM_CHECK_PYTHON_HEADERS. + Closes: #512345. + * 70_autoconf.patch: refreshed. + * Only recommend python-numpy, it can be detected at runtime. + * Install files to the python-support directory so that the debugging + symbols are usable. + * Fix quilt invocation so that patches are applied. + + -- Josselin Mouette Sun, 08 Mar 2009 14:51:09 +0100 + +pygtk (2.13.0-2) experimental; urgency=low + + * 03_testsuite_filechooser.patch: new patch. Disable the test of the + file chooser since it requires a writable home. Closes: #506909. + + -- Josselin Mouette Wed, 26 Nov 2008 00:14:32 +0100 + +pygtk (2.13.0-1) experimental; urgency=low + + [ Emilio Pozuelo Monfort ] + * Merge -dbg packages and running the test suite from Ubuntu, + thanks to Sebastien Bacher: + - debian/control.in: + + Build-depend on python-all-dbg + + Add python-gtk2-dbg and python-glade2-dbg packages. Closes: #470805. + + python-gtk2 suggests python-gtk2-dbg + + Build-depend on xvfb, needed to run make check during the build. + - debian/rules: + + Add -dbg magic. + + Run the test suite. + - debian/python-gtk2-dev.install: + + Install pygtk-codegen-2.0, which will try to launch + pygobject-codegen-2.0. This is for backwards compatibility. + - debian/python-gtk2-doc.install: + + Install pygtk-demo. + + * Merge new upstream release and fixes from Ubuntu, thanks to Loïc Minier: + - debian/control.in: + + Require libgtk2.0-dev >= 2.13.6 and python-gobject-dev >= 2.15.3. + + Build-depend on xauth, xfonts-base, needed by xvfb, and on + libgl1-mesa-dri too, until Xvfb can start without AIGLX support or it + depends on this package. + + Build-depend on gnome-icon-theme, since some buildds might have + optical drives which require a special icon in the file chooser + (needed for the test suite). + - debian/patches/10_use-default-python.patch: + + Removed, codegen copy has been dropped from pygtk. + - debian/patches/50_wakeupfd-curruption.patch: + + Removed, fixed upstream. + - debian/python-gtk2-dev.install, + debian/rules: + + Drop all codegen related code. + - debian/rules: + + Change permission fixup constructs (chmod 755) to use xargs and not + run if nothing has to be fixed. + + * debian/control.in: + - Bump Standards-Version to 3.8.0. + - Move Homepage to its own field. + - python-glade2 suggests python-glade2-dbg. + - Add Vcs-Browser and Vcs-Svn fields. + - python-gtk2-doc depends on python:Depends and python-gtk2, + needed for pygtk-demo. + - python-gtk2-doc recommends python-gobject and python-cairo, needed + by some examples. + - python-gtk2-doc recommends python-glade2 for the examples, instead + of suggest it. + - Add XB-Python-Version to python-gtk2-doc per Python policy. + * debian/python-gtk2-doc.install: + - Install examples needed by pygtk-demo in /usr/lib/pygtk/2.0 + (their original place) so that pygtk-demo doesn't rely on + /usr/share/doc being available. + * debian/python-gtk2-doc.links, + debian/python-gtk2-doc.preinst: + - Link /usr/share/doc/python-gtk2-doc/examples/demos to /usr/lib/pygtk/2.0 + so that examples are still available in /usr/share/doc. + - Make sure /usr/share/doc/python-gtk2-doc/examples/demos doesn't exist + before upgrading to 2.13.0-1, so that the link is successfully created. + * debian/rules: + - Call dh_pysupport for python-gtk2-doc, so example scripts are + byte-compiled. + - Make $(PYVERS) have the default Python version at the end, so that + the last pygtk build is with the default Python version and + pygtk-demo has the default Python in the hashbang. Also this avoids + python-gtk2-doc depending on a non-default Python version. + Closes: #500118. + * debian/copyright: + - Add Copyright holders. + + [ Loic Minier ] + * Pass -s -noreset to xvfb-run as otherwise Xvfb will reset when the first + client (test) disconnects and xvfb-run will fail killing Xvfb. + + [ Josselin Mouette ] + * Require python 2.5 since pygobject requires it already. + * Do not split debug packages for glade. + * Do not suggest the -dbg packages. + * 01_pygtk-demo.patch: new patch. + + Use /usr/bin/python instead of python2.X. + + Put data in /usr/share. + * Install the demos in /usr/share/pygtk accordingly. + * Rename the demos symlink in examples/ into demo, to avoid doing the + symbolic link dance. + * Switch to quilt for patch handling, build-depend on quilt. + * 02_numpy.patch: new patch, mostly taken from Gentoo. Port to numpy. + Closes: #478452. + * 70_autoconf.patch: run autoconf on top of it. + * Switch all dependencies to python-numpy. + * Build-depend on python-numpy-dbg for the debugging build. + * Copy config.{sub,guess} at config time and clean them later to avoid + having them in the diff. + * Build-depend on autotools-dev. + + -- Josselin Mouette Wed, 12 Nov 2008 17:36:25 +0100 + +pygtk (2.12.1-6) unstable; urgency=low + + * 60_pygtk-wakeupfd-fix.patch: do not use the wakeup fd in + non-threaded applications, which is uninitialised and becomes + stdin. Closes: #484654, #481480. + + -- Josselin Mouette Sat, 07 Jun 2008 14:15:51 +0200 + +pygtk (2.12.1-5) unstable; urgency=low + + * Revert 2.12.1-4 upload, re-add the fix, as anyway wakeupfd is used + since python now supports it. + * 50_wakeupfd-curruption.patch: fix memory corruption that occurs + when using the wakeupfd API, and makes pygtk mostly unusable on + some arches. + + -- Josselin Mouette Tue, 03 Jun 2008 23:08:31 +0200 + +pygtk (2.12.1-4) unstable; urgency=low + + * Also add an explicit python2.5 (>= 2.5.2-5) dep; closes: #481977. + * Drop patch 60_pygtk-wakeupfd-fix, it seems to expose some python2.5 + 64-bits issue; revert build-deps and deps bumps from 2.12.1-3 and -4. + + -- Loic Minier Tue, 27 May 2008 16:21:53 +0200 + +pygtk (2.12.1-3) unstable; urgency=low + + * Bump Standards-Version to 3.7.3. + * s/python/Python in description + * Update 60_pygtk-wakeupfd-fix to use more ifdefs for python without the + wakeupfd support; closes: #481457. + * Build-dep and dep on python2.5-dev >= 2.5.2-5 for wakeupfd support. + + -- Loic Minier Thu, 15 May 2008 21:59:27 +0200 + +pygtk (2.12.1-2) unstable; urgency=low + + * New patch, 60_pygtk-wakeupfd-fix, similar to the fix to the initial + SETWAKEUPFD support in GNOME #481569. + + -- Loic Minier Thu, 15 May 2008 15:28:29 +0200 + +pygtk (2.12.1-1) unstable; urgency=low + + * New upstream release. + + Bump pygobject dependencies to 2.14.0. + + Drop 01_glade_example_README.patch, merged upstream. + + Same for 30_ship_gtk-extrafuncs.defs.patch. + * Wrap Python-Depends; build-depend on python-support 0.7.6. + + -- Josselin Mouette Sat, 12 Jan 2008 04:03:14 +0100 + +pygtk (2.12.0-2) unstable; urgency=low + + [ Josselin Mouette ] + * python-gtk2-doc.postinst: do the symbolic link dance, as the + symbolic link used to be a directory containing the documentation in + the split-out package. Closes: #445600. + + [ Loic Minier ] + * Downgrade Recommends on python-gtk2-doc to Suggests in python-gtk2 and + python-glade2 and let python-gtk2-dev Recommend python-gtk2-doc. + + [ Josselin Mouette ] + * Remove .py[co] files in python-gtk2-doc. Closes: #452844. + + [ Loic Minier ] + * New patch, 30_ship_gtk-extrafuncs.defs, from Ubuntu; fixes missing + gtk-extrafuncs.defs; closes: #454247. + + -- Loic Minier Tue, 04 Dec 2007 11:25:42 +0100 + +pygtk (2.12.0-1) unstable; urgency=low + + * New upstream release. + * Use Python-Depends to generate python dependencies; build-depend on + python-support 0.7.3. + * Build-depend on GTK+ 2.12 to get the 2.12 specific features. + * Bump pango and atk build-dependencies. + + -- Josselin Mouette Sat, 22 Sep 2007 13:08:29 +0200 + +pygtk (2.10.6-1) unstable; urgency=low + + * New upstream release; bug fix. + - Drop patch 60_missing-codegen-fixes, merged upstream. + + -- Loic Minier Tue, 10 Jul 2007 14:31:31 +0200 + +pygtk (2.10.5-2) unstable; urgency=high + + * New patch, 60_missing-codegen-fixes, fixes TypeError crashes in misc apps + such as gnome-sudoku and deskbar-applet which were due to an incomplete + backport of a codegen change; GNOME #455468. + + -- Loic Minier Tue, 10 Jul 2007 13:25:26 +0200 + +pygtk (2.10.5-1) unstable; urgency=low + + * New upstream stable release; bug fixes. + * Misc cleanups. + + -- Loic Minier Thu, 05 Jul 2007 13:43:29 +0200 + +pygtk (2.10.4-3) unstable; urgency=low + + * Split the documentation in the python-gtk2-doc package as it is + really large. Incidentally closes: #428579. + * python:Version -> python:Versions. + * Use source:Version and binary:Version. + * Fix X[SB]-Python-Version mess. + + -- Josselin Mouette Tue, 12 Jun 2007 21:21:57 +0200 + +pygtk (2.10.4-2) unstable; urgency=low + + * Honor CFLAGS we set in rules, doh! + * Set some sane default CFLAGS and honor noopt in DEB_BUILD_OPTIONS. + * Wrap build-deps and deps. + * Upload to unstable; drop check-dist include. + * Fix URL in copyright. + * Add XS and XB-Python-Version. + * Only pass --host to configure if DEB_HOST_GNU_TYPE and DEB_BUILD_GNU_TYPE + differ. + * Cleanups. + + -- Loic Minier Mon, 16 Apr 2007 13:02:48 +0200 + +pygtk (2.10.4-1) experimental; urgency=low + + * Cleanup rules. + * Build-depend on autotools-dev. + * New upstream stable release. + - Drop patch 02_doc_licensing, mostly merged upstream. + + -- Loic Minier Sun, 11 Mar 2007 17:22:53 +0100 + +pygtk (2.10.3-2) experimental; urgency=low + + * Add a get-orig-source target to retrieve the upstream tarball. + * Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + * Bump up libgtk2.0-dev dep to >= 2.10.0. + + -- Loic Minier Fri, 26 Jan 2007 18:29:33 +0100 + +pygtk (2.10.3-1) experimental; urgency=low + + * New upstream release. + + -- Josselin Mouette Thu, 4 Jan 2007 20:53:33 +0100 + +pygtk (2.10.1-3) experimental; urgency=low + + * python-gtk2-dev depends on python-dev (closes: #401896). + * rules: remove .py[co] files created in the examples directory. + * Build-depend on docbook-xsl (closes: #397811). + * python-gtk2-dev depends on python-gobject-dev (closes: #405348). + + -- Josselin Mouette Tue, 2 Jan 2007 22:26:06 +0100 + +pygtk (2.10.1-2) experimental; urgency=low + + * Switch to cdbs for patch handling. + * 02_doc_licensing.patch: stolen from upstream CVS. Upstream agreed to + relicense the documentation to LGPL. + * copyright: document that. + * rules: binary-indep depends on build and install. + + -- Josselin Mouette Thu, 12 Oct 2006 22:19:30 +0200 + +pygtk (2.10.1-1) experimental; urgency=low + + * New upstream release. + * Update watch file. + * Depend on python-gobject. + * Remove uses of dh_python and pycompat. + * Add appropriate build-dependencies. + * python-gtk2.examples: install all examples. + * python-gtk2.{install,links}: install documentation. + + -- Josselin Mouette Wed, 27 Sep 2006 23:36:13 +0200 + +pygtk (2.8.6-6) unstable; urgency=low + + * Drop alternatives usage (closes: #384189, #385027). + + python-gtk2.install: install pygtk.py in the standard directory. + + python-gtk2.prerm: removed. + + python-gtk2.postinst: remove the alternatives call. + * Add a conflict against python-gtk-1.2 (<< 0.6.12-7). + * Remove abusive Replaces: python-gtk-1.2. + + -- Josselin Mouette Fri, 22 Sep 2006 21:18:07 +0200 + +pygtk (2.8.6-5) unstable; urgency=low + + * Add debian/control to the pyversions -r call since it's mandatory, even if + the man page claims it's optional. + * Update rtupdate script to handle calls with three arguments. + + -- Loic Minier Sat, 5 Aug 2006 22:54:26 +0200 + +pygtk (2.8.6-4) unstable; urgency=low + + * Attempt at supporting pkg-config files for multiple Python runtimes: + - Move *.pc files for each runtime in /usr/lib/pkg-config/pythonXXX. + - Symlink the *.pc files for the default runtime in /usr/lib/pkg-config + during python-gtk2-dev's postinst and remove the symlinks in prerm. + - Delete and re-create the symlinks on default runtime change via a + *.rtupdate script shipped by python-gtk2-dev. + * Misc cleanups in rules. + * Drop useless dh_installdirs call. + * Check that all builds with various Python runtimes produced the same + *.defs files, codegen, and headers, and ship files produced by the default + Python version. + + -- Loic Minier Fri, 21 Jul 2006 22:26:15 +0200 + +pygtk (2.8.6-3) unstable; urgency=low + + * New dpatch, 10_use-default-python, to use $PYTHON when non-empty or the + /usr/bin/python interpreter otherise in pygtk-codegen-2.0 instead of using + the build-time Python interpreter. (Closes: #376013, #376027) + + -- Loic Minier Fri, 30 Jun 2006 18:28:01 +0200 + +pygtk (2.8.6-2) unstable; urgency=low + + * python-gtk2.prerm: run update-python-modules before the alternative + removal. + + -- Josselin Mouette Sun, 25 Jun 2006 15:57:05 +0200 + +pygtk (2.8.6-1) unstable; urgency=low + + [ Marco Cabizza ] + * New upstream version + * Added the watch file + * debian/control, debian/control.in: + - Standards-Version is 3.7.2 + * debian/compat: + - Debhelper compatibility is 5 + + [ Josselin Mouette ] + * Revert changes from the NMU (closes: #374804, #374811). + * Require debhelper 5.0.37.2 and python-support 0.3.4. + * Make package binNMU-able by having python-gtk2-dev depend on + python-gtk2 >= ${Source-Version}. + * pycompat: python standards = 2. + * pyversions: we need python >= 2.3. + * Make the package comply with the new policy: + + Remove python2.3-* and python2.4-* packages. + + Correct package descriptions accordingly. + * Replace the multiple alternatives in the postinst by a single + alternative pointing to /usr/share/python-support/python-gtk. + * python-glade2.examples: move examples one directory up. + * rules: rework and simplify. + * Remove move_files and use *.install files instead. + + Don't install the .la files, which are useless anyway. + * rules: don't use config.status as the configure target because of + the stupid way make treats intermediary files. + * Require some minimum versions for python-cairo and python-numeric. + * python-gtk2.postinst: cleanup pygtk.py[co] from the former package, + as they were not handled. + + -- Josselin Mouette Sat, 24 Jun 2006 12:26:15 +0200 + +pygtk (2.8.2-3) unstable; urgency=low + + * Upload to unstable. + + -- Jordi Mallach Mon, 9 Jan 2006 18:29:31 +0100 + +pygtk (2.8.2-2) experimental; urgency=low + + * debian/control.in: + - python-gtk2-dev Depends on libglib2.0-dev libgtk2.0-dev. + - updated the requirements on glib/gtk. + * debian/rules: + - install the example files to the versionned packages. + + -- Sebastien Bacher Thu, 20 Oct 2005 11:06:23 +0200 + +pygtk (2.8.2-1) experimental; urgency=low + + * New upstream release. + + -- Loic Minier Tue, 18 Oct 2005 17:25:11 +0200 + +pygtk (2.8.1-1) experimental; urgency=low + + * New upstream release. + * Copy python2.3-glade2.examples to python2.4-glade2.examples. + (Closes: #331403) [debian/python2.4-glade2.examples] + * Fix python 2.3 / 2.4 substitution, patch by Roland Stigge. + (Closes: #331402) [debian/rules] + + -- Loic Minier Sun, 9 Oct 2005 13:54:06 +0200 + +pygtk (2.8.0-1) experimental; urgency=low + + * New upstream version (Closes: #325986) + * debian/control.in: + - Build-Dep on gtk+ >= 2.8.0, libxrender-dev (added) + - Build-Dep on python-cairo-dev + - python2.?-gtk2 Depend on the corresponding python2.?-cairo packages + + -- Gustavo Noronha Silva Tue, 27 Sep 2005 14:38:26 -0300 + +pygtk (2.6.3-1) unstable; urgency=low + + * New upstream version + * debian/patches/01_glade_example_README.dpatch (added), debian/rules: + - fix name of the script to be called on the README and do not compress + the sample glade files (Closes: #270478) + * debian/copyright: + - fix FSF's address + * debian/control.in: + - upgraded Standards-Version to 3.6.2 with no changes + + -- Gustavo Noronha Silva Wed, 21 Sep 2005 14:35:43 -0300 + +pygtk (2.6.2-3) UNRELEASED; urgency=low + + * debian/control.in, debian/rules, python2.4-gtk2.{postinst,prerm}: + - support 2.4 versions of the packages (Closes: #292796, #329029) + - some help from Bastian Kleineidam 's patch and + advice from Ross Burton and Sebastien Bacher were used + * debian/rules: + - readded the code to update config.{sub,guess} + * debian/control.in, debian/changelog, debian/README.Debian: + - change source package name + + -- Gustavo Noronha Silva Wed, 21 Sep 2005 11:00:19 -0300 + +python-gtk2 (2.6.2-2) UNRELEASED; urgency=low + + * Move source to pkg-gnome, and add GNOME Team to uploaders + * Remove useless Mesa build-dep + * Add missing libglib2.0-dev build-dep + * Remove useless (I hope) patch to config.sub/config.guess + + -- Ross Burton Fri, 9 Sep 2005 17:31:51 +0100 + +python-gtk2 (2.6.2-1) unstable; urgency=low + + * New upstream version. + + -- Sebastien Bacher Mon, 9 May 2005 23:53:44 +0200 + +python-gtk2 (2.6.1-2) unstable; urgency=low + + * CVS patch to fix the crash when argv is not set (Closes: #299328). + + -- Sebastien Bacher Thu, 17 Mar 2005 17:08:41 +0100 + +python-gtk2 (2.6.1-1) unstable; urgency=low + + * New upstream release. + * CVS patch to fix the crash when argv is not set (Closes: #299328). + + -- Sebastien Bacher Thu, 17 Mar 2005 15:17:17 +0100 + +python-gtk2 (2.6.0-1) unstable; urgency=low + + * New upstream release. + * debian/control: + - updated the Build-Depends. + * debian/python2.3-gtk2.examples: + - now pygtk-demo is in the standard installation. + * debian/rules: + - install pygtk-demo in /usr/bin. + + -- Sebastien Bacher Wed, 9 Mar 2005 19:11:55 +0100 + +python-gtk2 (2.4.1-2) unstable; urgency=low + + * debian/control: + - python-gtk2 depends on the current version of python2.3-gtk2 + (Closes: #281488). + * debian/install-examples: + - not needed since the examples are uncompressed now. + * debian/rules: + - dont' compress examples (Closes: #279604). + - removed extra .pyc files (Closes: #276353). + + -- Sebastien Bacher Mon, 22 Nov 2004 11:48:19 +0100 + +python-gtk2 (2.4.1-1) unstable; urgency=low + + * New upstream release. + + -- Sebastien Bacher Sun, 7 Nov 2004 18:08:22 +0100 + +python-gtk2 (2.4.0-2) unstable; urgency=low + + * apply the CVS fix to not use "typename" which is a C++ keyword + (Closes: #276518). + + -- Sebastien Bacher Thu, 14 Oct 2004 19:20:01 +0200 + +python-gtk2 (2.4.0-1) unstable; urgency=low + + * New upstream release. + + -- Sebastien Bacher Mon, 4 Oct 2004 00:08:21 +0200 + +python-gtk2 (2.3.97-1) experimental; urgency=low + + * New upstream release. + + -- Sebastien Bacher Tue, 28 Sep 2004 17:34:16 +0200 + +python-gtk2 (2.3.96-1) experimental; urgency=low + + * New upstream version + - fixes the crash with gtk.icon_size_register (Closes: #261109). + * debian/control: + - Build-Depends on python2.3-numeric. + * debian/move_files: + - fixed the regexp to get python versions to use. + + -- Sebastien Bacher Fri, 6 Aug 2004 19:19:57 +0200 + +python-gtk2 (2.3.95-1) experimental; urgency=low + + * New upstream release + - require python 2.3 and gtk+ 2.4. + * debian/control: + - removed the python2.2-* packages. + - updated the Build-Depends. + * debian/python2.2*: + - removed. + * debian/rules: + - removed python2.2-* build. + + -- Sebastien Bacher Mon, 2 Aug 2004 14:25:53 +0200 + +python-gtk2 (2.3.94-1) experimental; urgency=low + + * New upstream release. + + -- Sebastien Bacher Thu, 22 Jul 2004 00:16:46 +0200 + +python-gtk2 (2.3.93-2) experimental; urgency=low + + * CVS patch to fix the libglade problem. + + -- Sebastien Bacher Tue, 20 Jul 2004 16:53:28 +0200 + +python-gtk2 (2.3.93-1) experimental; urgency=low + + * New upstream release: + - fix gtk.gdk.window_lookup assertion (Closes: #237125). + * debian/control: + - Build-Depends on python. + + -- Sebastien Bacher Mon, 19 Jul 2004 18:45:30 +0200 + +python-gtk2 (2.3.92-1) experimental; urgency=low + + * New upstream release. + + -- Sebastien Bacher Sat, 22 May 2004 13:12:10 +0200 + +python-gtk2 (2.3.91-1) experimental; urgency=low + + * New upstream release. + + -- Sebastien Bacher Fri, 16 Apr 2004 21:38:01 +0200 + +python-gtk2 (2.3.90-1) experimental; urgency=low + + * New upstream release. + + -- Sebastien Bacher Wed, 7 Apr 2004 23:39:54 +0200 + +python-gtk2 (2.2.0-1) unstable; urgency=low + + * New upstream release: + + removed gtkgl bindings. + * debian/control: + + remove gtkgl packages. + * debian/patches/01pixmap_foreign_new_leak.dpatch: + + removed since the changes are in new version. + + -- Sebastien Bacher Thu, 11 Mar 2004 23:10:34 +0100 + +python-gtk2 (2.0.0-4) unstable; urgency=low + + * debian/patches/01pixmap_foreign_new_leak.dpatch: + + patch to fix a mem leak with pixmaps. + + -- Sebastien Bacher Sun, 22 Feb 2004 22:39:34 +0100 + +python-gtk2 (2.0.0-3) unstable; urgency=low + + * Removed pygtk.py[co] (Closes: #222473, #222985). + + -- Sebastien Bacher Fri, 5 Dec 2003 17:27:46 +0100 + +python-gtk2 (2.0.0-2) unstable; urgency=low + + * Removed python2.2-gtkgl2 since python-opengl is only for python2.3. + * Removed pygtk 1.2 examples (Closes: #210987). + + -- Sebastien Bacher Wed, 17 Sep 2003 16:41:58 +0200 + +python-gtk2 (2.0.0-1) unstable; urgency=low + + * New upstream. + * Stable version is out, it's time to switch pygtk default version + from 1.2 to 2 (Closes: #163253). + * Fixed install-examples (Closes: #208234). + + -- Sebastien Bacher Mon, 1 Sep 2003 18:15:40 +0200 + +python-gtk2 (1.99.18-1) unstable; urgency=low + + * New upstream release. + * Updated to Standards-Version 3.6.1.0. + + -- Sebastien Bacher Sun, 24 Aug 2003 17:41:23 +0200 + +python-gtk2 (1.99.17-6) unstable; urgency=low + + * Added missing depends on python-numeric (Closes: #205362). + + -- Sebastien Bacher Thu, 14 Aug 2003 13:42:58 +0200 + +python-gtk2 (1.99.17-5) unstable; urgency=low + + * Added missing pygtk-codegen-2.0 to python-gtk2-dev. + + -- Sebastien Bacher Thu, 14 Aug 2003 01:45:33 +0200 + +python-gtk2 (1.99.17-4) unstable; urgency=low + + * Fixed overwrite problem (Closes: #205176). + * Added python-gtk2-dev package with devel files. + + -- Sebastien Bacher Wed, 13 Aug 2003 14:38:32 +0200 + +python-gtk2 (1.99.17-3) unstable; urgency=low + + * Fixed depends. + * debian/rules + + Changed header of py files with Matthias Klose's script. + + -- Sebastien Bacher Tue, 12 Aug 2003 22:09:50 +0200 + +python-gtk2 (1.99.17-2) unstable; urgency=low + + * Now python 2.3 is the default version. + * Use dh_python. + + -- Sebastien Bacher Mon, 11 Aug 2003 13:19:09 +0200 + +python-gtk2 (1.99.17-1) unstable; urgency=low + + * New upstream release. + * I've more interest on pygtk than Torsten for the moment, so we switch + maintainer and uploaders field. + + -- Sebastien Bacher Thu, 31 Jul 2003 18:38:46 +0200 + +python-gtk2 (1.99.16-3) unstable; urgency=low + + * Added Depends on python-opengl for python-gtkgl2 (Closes: #196064). + * Added a "install-examples" script in examples dir to install gunzip + demos (Closes: #193841) + * Updated to standards version 3.6.0. + * Added homepage and author to the description. + + -- Sebastien Bacher Fri, 13 Jun 2003 22:29:49 +0200 + +python-gtk2 (1.99.16-2) unstable; urgency=low + + * Fixed libglade example (Closes: #189321). + * Updated to standards version 3.5.9. + * Added Depends on ${misc:Depends}. + * Changed section to python. + + -- Sebastien Bacher Fri, 2 May 2003 12:22:29 +0200 + +python-gtk2 (1.99.16-1) unstable; urgency=low + + * New upstream release. + + -- Sebastien Bacher Mon, 24 Mar 2003 01:44:07 +0100 + +python-gtk2 (1.99.15-2) unstable; urgency=low + + * Remove *.pyc and *.pyo from the package. These files are compiled after + the installation (that change the size of the files and make the debsums + failed), so we don't need to have them in the package (Closes: #181211). + + -- Sebastien Bacher Sat, 22 Feb 2003 15:25:25 +0100 + +python-gtk2 (1.99.15-1) unstable; urgency=low + + * Co-maintainer upload. + * New upstream version. + * Depends on a versioned python2.2-gtk2 (Closes: #179376). + * Updated to standards-version 3.5.8. + + -- Sebastien Bacher Fri, 21 Feb 2003 17:50:28 +0100 + +python-gtk2 (1.99.14-1) unstable; urgency=low + + * Co-maintainer upload. + * New upstream version. (Closes: #174997). + * Package is compiled with thread support (Closes: #163037). + * Corrected depend on libgtk2.0-0 (Closes: #162382). + * Added a README.Debian file (Closes: #160342). + * Corrected descriptions in control file to fix some lintian error. + * Fixed examples (Closes: #171982, #167945, #163794). + + -- Sebastien Bacher Fri, 31 Jan 2003 18:12:00 +0100 + +python-gtk2 (1.99.13-4) unstable; urgency=low + + * Rebuild against latest python2.3 (closes: #173819). + + -- Torsten Landschoff Sat, 21 Dec 2002 02:28:41 +0100 + +python-gtk2 (1.99.13-3) unstable; urgency=low + + * debian/rules: Explicitely enable threading support since the default + seems to disable it. Noticed by Matthias Urlichs - I did not notice + I was missing something. + + -- Torsten Landschoff Wed, 2 Oct 2002 00:06:29 +0200 + +python-gtk2 (1.99.13-2) unstable; urgency=low + + * debian/move_files: Fix the check_completeness function (find's return + code is not really useful it seems). + * debian/control: + + Add Sebastien Bacher as co-maintainer. + + Make the package conflict with older python-gtk versions that + don't support the pygtk.py alternative. + * debian/python2.*-gtk2.{postinst,prerm}: Manage the pygtk.py alternatives. + + -- Torsten Landschoff Sat, 31 Aug 2002 19:04:24 +0200 + +python-gtk2 (1.99.13-1) unstable; urgency=low + + * New upstream release. + * Build modules for python 2.2 as well as for 2.3. + * Create dummy packages python-* to pull the right package for + the default python release. + + -- Torsten Landschoff Fri, 30 Aug 2002 18:47:09 +0200 + +python-gtk2 (1.99.12-1) unstable; urgency=low + + * Initial Release. + + -- Torsten Landschoff Tue, 6 Aug 2002 21:50:17 +0200 + --- pygtk-2.14.1.orig/debian/python-gtk2-dev.prerm +++ pygtk-2.14.1/debian/python-gtk2-dev.prerm @@ -0,0 +1,24 @@ +#!/bin/sh + +set -e + +PYTHON_DEFAULT=$(pyversions --default) + +this="python-gtk2-dev" + +pc_files() { + runtime="$1" + + dpkg -L "$this" | sed -n -e "s#^/usr/lib/pkgconfig/$runtime/##p" +} + +if [ "$1" = "remove" ]; then + cd /usr/lib/pkgconfig + + for f in $(pc_files $PYTHON_DEFAULT); do + rm -f "$f" + done +fi + +#DEBHELPER# + --- pygtk-2.14.1.orig/debian/python-gtk2-doc.preinst +++ pygtk-2.14.1/debian/python-gtk2-doc.preinst @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if dpkg --compare-versions "$2" lt-nl "2.13.0-1"; then + rm -rf /usr/share/doc/python-gtk2-doc/examples/demos +fi + +#DEBHELPER# --- pygtk-2.14.1.orig/debian/compat +++ pygtk-2.14.1/debian/compat @@ -0,0 +1 @@ +5 --- pygtk-2.14.1.orig/debian/python-gtk2-doc.links +++ pygtk-2.14.1/debian/python-gtk2-doc.links @@ -0,0 +1,2 @@ +/usr/share/gtk-doc/html/pygtk /usr/share/doc/python-gtk2-doc/html +/usr/share/pygtk/2.0/demos /usr/share/doc/python-gtk2-doc/examples/demo --- pygtk-2.14.1.orig/debian/python-gtk2-dev.rtupdate +++ pygtk-2.14.1/debian/python-gtk2-dev.rtupdate @@ -0,0 +1,46 @@ +#!/bin/sh + +# this script updates symlinks to pkg-config files after a Python default +# runtime change + +if [ "$#" != 3 ]; then + echo "Usage: $0 {pre-rtupdate|post-rtupdate|rtupdate} " >&2 + exit 1 +fi + +action="$1" +oldruntime="$2" +newruntime="$3" + +this="python-gtk2-dev" + +pc_files() { + runtime="$1" + + dpkg -L "$this" | sed -n -e "s#^/usr/lib/pkgconfig/$runtime/##p" +} + +case "$action" in + pre-rtupdate) + ;; + post-rtupdate) + ;; + rtupdate) + echo "Updating *.pc symlinks for $this..." + + cd /usr/lib/pkgconfig + + for f in $(pc_files $oldruntime); do + rm -f "$f" + done + + for f in $(pc_files $newruntime); do + ln -s "$newruntime/$f" + done + ;; + *) + echo "$0 called with unknown argument \`$action'" >&2 + exit 0 + ;; +esac + --- pygtk-2.14.1.orig/debian/README.Debian +++ pygtk-2.14.1/debian/README.Debian @@ -0,0 +1,11 @@ +pygtk for Debian +---------------- + +To use the new gtk, you'll need to use the following code: + +import pygtk +pygtk.require('2.0') +import gtk + + + -- Gustavo Noronha Silva , Wed Sep 21 10:59:53 2005 --- pygtk-2.14.1.orig/debian/control.in +++ pygtk-2.14.1/debian/control.in @@ -0,0 +1,144 @@ +Source: pygtk +Section: python +Priority: optional +Maintainer: Sebastien Bacher +Uploaders: Torsten Landschoff , + @GNOME_TEAM@ +Build-Depends: debhelper (>= 5), + python-support (>= 0.7.6), + gnome-pkg-tools (>= 0.10), + cdbs, + autotools-dev, + quilt, + xvfb (>= 2:1.6.0), xauth, xfonts-base, + python2.5-dev (>= 2.5.2-5), + python-all-dev (>= 2.5), + python-all-dbg, + libgtk2.0-dev (>= 2.13.6), + libglib2.0-dev (>= 2.8.0), + libpango1.0-dev (>= 1.16.0), + libatk1.0-dev (>= 1.12.0), + libglade2-dev (>= 2.5.0), + python-numpy-dbg (>= 1:1.0.4-1~), + python-cairo-dev (>= 1.0.2), + python-gobject-dev (>= 2.15.3), + xsltproc, + docbook-xsl, + autotools-dev, + gnome-icon-theme +XS-Python-Version: >= 2.5 +Standards-Version: 3.8.0 +Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/experimental/pygtk/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/experimental/pygtk/ +Homepage: http://www.pygtk.org/ + +Package: python-gtk2 +Architecture: any +Depends: ${python:Depends}, + python2.5 (>= 2.5.2-5), + ${shlibs:Depends}, + ${misc:Depends} +Python-Depends: python-cairo (>= 1.0.2-1.1), + python-gobject (>= 2.15.3), + python-numpy +Suggests: python-gtk2-doc +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Conflicts: python-gdk-imlib, + python-glade, + python-gnome, + python-gtk, + python2.3-gtk2, + python2.4-gtk2, + python-gtk-1.2 (<< 0.6.12-7) +Description: Python bindings for the GTK+ widget set + This archive contains modules that allow you to use GTK+ in Python + programs. This package contains the bindings for the version 2.0 + of that toolkit. + +Package: python-gtk2-dbg +Architecture: any +Priority: extra +Section: debug +Depends: python-gtk2 (= ${binary:Version}), + python-glade2 (= ${binary:Version}), + python-dbg, + python-numpy-dbg, + python-cairo-dbg, + python-gobject-dbg, + ${shlibs:Depends} +Description: Python bindings for the GTK+ widget set (debug extension) + This archive contains modules that allow you to use GTK+ in Python + programs. This package contains the bindings for the version 2.0 + of that toolkit. + . + This package contains the extension built for the Python debug interpreter. + +Package: python-gtk2-dev +Architecture: all +Depends: ${python:Depends}, + python-gtk2 (>= ${source:Version}), + libglib2.0-dev (>= 2.8), + libgtk2.0-dev (>= 2.13.6), + python2.5-dev (>= 2.5.2-5), + python-dev, + python-gobject-dev (>= 2.15.3) +Recommends: python-gtk2-doc +Replaces: python2.2-gtk2 (<< 1.99.17-4), + python2.3-gtk2 (<< 1.99.17-4), + python2.2-glade2 (<< 1.99.17-4), + python2.3-glade2 (<< 1.99.17-4) +Conflicts: python2.2-gtk2 (<< 1.99.17-4), + python2.3-gtk2 (<< 1.99.17-4), + python2.2-glade2 (<< 1.99.17-4), + python2.3-glade2 (<< 1.99.17-4), + python-gdk-imlib, + python-glade, + python-gnome, + python-gtk +Description: GTK+ bindings: devel files + This archive contains files that allow you to build wrappers for addons + that interoperate with python-gtk2 (pygtk). + +Package: python-glade2 +Architecture: any +Depends: ${python:Depends}, + ${shlibs:Depends}, + ${misc:Depends}, + python-gtk2 (= ${binary:Version}) +Suggests: python-gtk2-doc +Conflicts: python-gdk-imlib, + python-glade, + python-gnome, + python-gtk, + python2.3-glade2, + python2.4-glade2 +Provides: ${python:Provides} +Description: GTK+ bindings: Glade support + Contains bindings for the glade library from use within Python. Glade + makes it very easy to create a user interface. In the target + application you just need to load the interface description from + the .glade file instead of constructing the GUI at runtime. + +Package: python-gtk2-doc +Architecture: all +Section: doc +XB-Python-Version: ${python:Versions} +Depends: ${misc:Depends}, + ${python:Depends}, + python-gtk2, +Conflicts: python-gtk2 (<< 2.10.4-3) +Recommends: python-gobject, + python-cairo, + python-glade2 +Suggests: devhelp +Description: Python bindings for the GTK+ widget set - documentation + This package contains the documentation and API reference for the + Python bindings of the Pango, ATK, GDK, GTK+ and Glade libraries. + It is well structured and easy to use. + . + The documentation can be browsed with the devhelp documentation + browser, or with a regular web browser. + . + This package also provides several examples showing how to use these + bindings to build simple GUI applications. --- pygtk-2.14.1.orig/debian/python-gtk2-doc.examples +++ pygtk-2.14.1/debian/python-gtk2-doc.examples @@ -0,0 +1,6 @@ +examples/atk +examples/glade +examples/gtk +examples/ide +examples/pango +examples/simple --- pygtk-2.14.1.orig/debian/python-gtk2-dev.postinst +++ pygtk-2.14.1/debian/python-gtk2-dev.postinst @@ -0,0 +1,24 @@ +#!/bin/sh + +set -e + +PYTHON_DEFAULT=$(pyversions --default) + +this="python-gtk2-dev" + +pc_files() { + runtime="$1" + + dpkg -L "$this" | sed -n -e "s#^/usr/lib/pkgconfig/$runtime/##p" +} + +if [ "$1" = "configure" ]; then + cd /usr/lib/pkgconfig + + for f in $(pc_files $PYTHON_DEFAULT); do + ln -f -s "$PYTHON_DEFAULT/$f" + done +fi + +#DEBHELPER# + --- pygtk-2.14.1.orig/debian/python-gtk2-dev.install +++ pygtk-2.14.1/debian/python-gtk2-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/include +debian/tmp/usr/bin/pygtk-codegen-2.0 +debian/tmp/usr/lib/pkgconfig +debian/tmp/usr/share/pygtk --- pygtk-2.14.1.orig/debian/python-gtk2.postinst +++ pygtk-2.14.1/debian/python-gtk2.postinst @@ -0,0 +1,7 @@ +#! /bin/sh +set -e + +# Cleanup for bytecompiled files in the former package version +rm -f /usr/lib/python2.[34]/site-packages/pygtk.py[co] + +#DEBHELPER# --- pygtk-2.14.1.orig/debian/copyright +++ pygtk-2.14.1/debian/copyright @@ -0,0 +1,36 @@ +This package was debianized by Torsten Landschoff on +Tue, 6 Aug 2002 21:50:17 +0200. + +It was downloaded from: + + +Upstream Author: James Henstridge + +Copyright (C) 1998-2006 James Henstridge +Copyright (C) 2004-2006 Johan Dahlin +Copyright (C) 2005-2006 John Finlay +Copyright (C) 2005 Gustavo Carneiro +Copyright (C) 2007 Gian Mario Tagliaretti + +Copyright: + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + On Debian systems you should have a local copy of the GNU Library + General Public License in /usr/share/common-licenses/LGPL-2. If you + downloaded the source you will find it in the file COPYING; if not, + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +Note: the documentation used to be licensed under the Creative Commons +Attribution-ShareAlike License version 1.0, and was re-licensed to LGPL +on oct 12, 2006. --- pygtk-2.14.1.orig/debian/python-gtk2.install +++ pygtk-2.14.1/debian/python-gtk2.install @@ -0,0 +1,3 @@ +debian/tmp/var/lib/python-support/*/gtk-2.0/*.so +debian/tmp/var/lib/python-support/*/gtk-2.0/gtk/_gtk.so +debian/tmp/var/lib/python-support/*/gtk-2.0/gtk/*.py --- pygtk-2.14.1.orig/debian/python-glade2.install +++ pygtk-2.14.1/debian/python-glade2.install @@ -0,0 +1 @@ +debian/tmp/var/lib/python-support/*/gtk-2.0/gtk/glade.so --- pygtk-2.14.1.orig/debian/patches/60_pygtk-wakeupfd-fix.patch +++ pygtk-2.14.1/debian/patches/60_pygtk-wakeupfd-fix.patch @@ -0,0 +1,55 @@ +Index: pygtk-2.13.0/gtk/gtk.override +=================================================================== +--- pygtk-2.13.0.orig/gtk/gtk.override 2008-11-12 17:59:15.427489178 +0100 ++++ pygtk-2.13.0/gtk/gtk.override 2008-11-12 17:59:19.103489690 +0100 +@@ -37,6 +37,8 @@ extern PyTypeObject PyGdkCairoContext_Ty + + #include "pygtk-private.h" + ++#include ++ + #define PYGTK_CONTAINER_FOREACH 0 + #define PYGTK_CONTAINER_FORALL 1 + #define countof(array) (sizeof(array)/sizeof(array[0])) +@@ -1069,7 +1071,10 @@ static gboolean + pygtk_main_watch_prepare(GSource *source, + int *timeout) + { ++#ifdef HAVE_PYSIGNAL_SETWAKEUPFD + PySignalWatchSource *real_source = (PySignalWatchSource *)source; ++ int flag; ++#endif + + /* Python only invokes signal handlers from the main thread, + * so if a thread other than the main thread receives the signal +@@ -1103,6 +1108,11 @@ pygtk_main_watch_prepare(GSource *source + real_source->fd.events = G_IO_IN | G_IO_HUP | G_IO_ERR; + g_source_add_poll(source, &real_source->fd); + ++ /* Make the read end of the fd non blocking */ ++ flag = fcntl(real_source->fds[0], F_GETFL, 0); ++ flag |= O_NONBLOCK; ++ fcntl(real_source->fds[0], F_SETFL, flag); ++ + PySignal_SetWakeupFd(real_source->fds[1]); + + #else /* !HAVE_PYSIGNAL_SETWAKEUPFD */ +@@ -1122,8 +1132,18 @@ pygtk_main_watch_check(GSource *source) + { + PyGILState_STATE state; + ++#ifdef HAVE_PYSIGNAL_SETWAKEUPFD ++ PySignalWatchSource *real_source = (PySignalWatchSource *)source; ++ char buf[1]; ++#endif ++ + state = pyg_gil_state_ensure(); + ++#ifdef HAVE_PYSIGNAL_SETWAKEUPFD ++ if (real_source->fds[0]) ++ read(real_source->fds[0], &buf, 1); ++#endif ++ + if (PyErr_CheckSignals() == -1 && gtk_main_level() > 0) { + PyErr_SetNone(PyExc_KeyboardInterrupt); + gtk_main_quit(); --- pygtk-2.14.1.orig/debian/patches/01_pygtk-demo.patch +++ pygtk-2.14.1/debian/patches/01_pygtk-demo.patch @@ -0,0 +1,14 @@ +Index: pygtk-2.13.0/examples/pygtk-demo/pygtk-demo.in +=================================================================== +--- pygtk-2.13.0.orig/examples/pygtk-demo/pygtk-demo.in 2008-04-27 11:51:14.000000000 +0200 ++++ pygtk-2.13.0/examples/pygtk-demo/pygtk-demo.in 2008-11-12 17:59:10.695490976 +0100 +@@ -1,7 +1,7 @@ +-#! @PYTHON@ ++#! /usr/bin/python + + import sys + import os.path +-pygtklibdir = os.path.join("@libdir@", "pygtk", "2.0") ++pygtklibdir = os.path.join("/usr/share", "pygtk", "2.0") + sys.path.insert(0, pygtklibdir) + execfile(os.path.join(pygtklibdir, "pygtk-demo.py")) --- pygtk-2.14.1.orig/debian/patches/10_maintainer_mode.patch +++ pygtk-2.14.1/debian/patches/10_maintainer_mode.patch @@ -0,0 +1,12 @@ +Index: pygtk-2.14.1/configure.ac +=================================================================== +--- pygtk-2.14.1.orig/configure.ac 2009-05-29 09:19:41.289605923 +0200 ++++ pygtk-2.14.1/configure.ac 2009-05-29 09:19:50.641606178 +0200 +@@ -32,6 +32,7 @@ AC_CONFIG_SRCDIR([gtk/gtkmodule.c]) + AM_CONFIG_HEADER(config.h) + + AM_INIT_AUTOMAKE ++AM_MAINTAINER_MODE + AC_CHECK_FUNCS(bind_textdomain_codeset) + + dnl put the ACLOCAL flags in the makefile --- pygtk-2.14.1.orig/debian/patches/02_numpy.patch +++ pygtk-2.14.1/debian/patches/02_numpy.patch @@ -0,0 +1,81 @@ +Index: pygtk-2.13.0/README +=================================================================== +--- pygtk-2.13.0.orig/README 2008-11-12 18:04:27.870985209 +0100 ++++ pygtk-2.13.0/README 2008-11-12 18:04:34.210985126 +0100 +@@ -54,7 +54,7 @@ Requirements + GTK+ 2.14.0 or higher for 2.14 API + * libglade 2.5.0 or higher (optional) + * pycairo 1.0.2 or higher (optional) +- * Numeric (optional) ++ * numpy (optional) + + This release is supporting the following GTK+ releases: + +Index: pygtk-2.13.0/configure.ac +=================================================================== +--- pygtk-2.13.0.orig/configure.ac 2008-11-12 17:59:44.822987000 +0100 ++++ pygtk-2.13.0/configure.ac 2008-11-12 18:01:50.203309500 +0100 +@@ -336,18 +336,19 @@ case $gdk_target in + esac + + +-dnl checks to see if Numeric Python is installed. ++dnl checks to see if numpy is installed. + AC_ARG_ENABLE(numpy, + AC_HELP_STRING([--disable-numpy], [Disable numeric python features]),, + enable_numpy=yes) + + if test "x$enable_numpy" != xno; then + save_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" +- AC_CHECK_HEADER([Numeric/arrayobject.h], ++ numpy_INCLUDES=`$PYTHON -c "import numpy; print numpy.get_include()"` ++ CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES -I$numpy_INCLUDES" ++ AC_CHECK_HEADER([numpy/arrayobject.h], + [AC_DEFINE(HAVE_NUMPY,,[whether to include numeric python support])],, + [#include ]) +- CPPFLAGS="$save_CPPFLAGS" ++ CPPFLAGS="$save_CPPFLAGS -I$numpy_INCLUDES" + fi + + +Index: pygtk-2.13.0/gtk/gdk.override +=================================================================== +--- pygtk-2.13.0.orig/gtk/gdk.override 2008-11-12 18:04:06.139490006 +0100 ++++ pygtk-2.13.0/gtk/gdk.override 2008-11-12 18:04:11.850987486 +0100 +@@ -43,7 +43,7 @@ headers + #define GDK_DISPLAY(object) (GDK_DISPLAY_OBJECT(object)) + + #ifdef HAVE_NUMPY +-# include ++# include + static int have_numpy(void); + #endif + +Index: pygtk-2.13.0/setup.py +=================================================================== +--- pygtk-2.13.0.orig/setup.py 2008-11-12 18:02:06.030988087 +0100 ++++ pygtk-2.13.0/setup.py 2008-11-12 18:02:57.707318739 +0100 +@@ -228,16 +228,16 @@ if pango.can_build(): + data_files.append((DEFS_DIR, ('pangocairo.defs',))) + GLOBAL_MACROS.append(('HAVE_PYCAIRO',1)) + if gtk.can_build(): +- if '--disable-numeric' in sys.argv: +- sys.argv.remove('--disable-numeric') ++ if '--disable-numpy' in sys.argv: ++ sys.argv.remove('--disable-numpy') + else: + try: +- import Numeric +- Numeric # pyflakes ++ import numpy ++ numpy # pyflakes + GLOBAL_MACROS.append(('HAVE_NUMPY', 1)) + except ImportError: +- print ('* Numeric module could not be found, ' +- 'will build without Numeric support.') ++ print ('* numpy module could not be found, ' ++ 'will build without numpy support.') + ext_modules.append(gtk) + data_files.append((os.path.join(INCLUDE_DIR, 'pygtk'), ('gtk/pygtk.h',))) + data_files.append((DEFS_DIR, ('gtk/gdk.defs', 'gtk/gdk-types.defs', --- pygtk-2.14.1.orig/debian/patches/series +++ pygtk-2.14.1/debian/patches/series @@ -0,0 +1,6 @@ +01_pygtk-demo.patch +02_numpy.patch +03_testsuite_filechooser.patch +10_maintainer_mode.patch +60_pygtk-wakeupfd-fix.patch +70_autotools.patch --- pygtk-2.14.1.orig/debian/patches/03_testsuite_filechooser.patch +++ pygtk-2.14.1/debian/patches/03_testsuite_filechooser.patch @@ -0,0 +1,13 @@ +Index: pygtk-2.13.0/tests/runtests.py +=================================================================== +--- pygtk-2.13.0.orig/tests/runtests.py 2008-11-26 00:13:20.451100628 +0100 ++++ pygtk-2.13.0/tests/runtests.py 2008-11-26 00:13:34.107100762 +0100 +@@ -21,7 +21,7 @@ else: + common.importModules(buildDir=buildDir, + srcDir=srcDir) + +-SKIP_FILES = ['common', 'runtests', 'testmodule'] ++SKIP_FILES = ['common', 'runtests', 'testmodule', 'test_filechooserdialog'] + + dir = os.path.split(os.path.abspath(__file__))[0] + os.chdir(dir) --- pygtk-2.14.1.orig/debian/patches/70_autotools.patch +++ pygtk-2.14.1/debian/patches/70_autotools.patch @@ -0,0 +1,15874 @@ +libtoolize --force --copy +aclocal -I m4 +automake -acf -Wno-portability +autoconf +rm -rf autom4te.cache + +Index: pygtk-2.14.1/configure +=================================================================== +--- pygtk-2.14.1.orig/configure 2009-05-29 09:20:50.753605185 +0200 ++++ pygtk-2.14.1/configure 2009-05-29 09:24:40.817101734 +0200 +@@ -1,11 +1,11 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.61 for pygtk 2.14.1. ++# Generated by GNU Autoconf 2.63 for pygtk 2.14.1. + # + # Report bugs to . + # + # 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. + ## --------------------- ## +@@ -17,7 +17,7 @@ DUALCASE=1; export DUALCASE # for MKS sh + 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 +@@ -39,17 +39,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE + 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. +@@ -65,8 +93,6 @@ fi + # 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. +@@ -89,7 +115,7 @@ if test "x$as_myself" = x; then + 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 + +@@ -102,17 +128,10 @@ PS2='> ' + 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 && +@@ -134,7 +153,7 @@ as_me=`$as_basename -- "$0" || + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +-echo X/"$0" | ++$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q +@@ -160,7 +179,7 @@ else + as_have_required=no + fi + +- if test $as_have_required = yes && (eval ": ++ if test $as_have_required = yes && (eval ": + (as_func_return () { + (exit \$1) + } +@@ -242,7 +261,7 @@ IFS=$as_save_IFS + 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 +@@ -263,7 +282,7 @@ _ASEOF + 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 +@@ -343,10 +362,10 @@ fi + + 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 + + +@@ -415,9 +434,10 @@ fi + + 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. + } + + +@@ -453,7 +473,7 @@ test \$exitcode = 0") || { + 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 +@@ -481,7 +501,6 @@ case `echo -n x` in + *) + ECHO_N='-n';; + esac +- + if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +@@ -494,19 +513,22 @@ if test -d conf$$.dir; then + 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 +@@ -531,10 +553,10 @@ else + 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 +@@ -764,190 +786,210 @@ ac_includes_default="\ + # 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 +-ACLOCAL_AMFLAGS +-PYGTK_MAJOR_VERSION +-PYGTK_MINOR_VERSION +-PYGTK_MICRO_VERSION +-INSTALL_PROGRAM +-INSTALL_SCRIPT +-INSTALL_DATA +-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 +-PLATFORM_WIN32_TRUE +-PLATFORM_WIN32_FALSE +-OS_WIN32_TRUE +-OS_WIN32_FALSE +-AS +-DLLTOOL +-OBJDUMP +-LIBTOOL +-SED +-GREP +-EGREP +-FGREP +-LD +-DUMPBIN +-ac_ct_DUMPBIN +-NM +-LN_S +-AR +-RANLIB +-lt_ECHO +-DSYMUTIL +-NMEDIT +-LIPO +-OTOOL +-OTOOL64 +-CPP +-PYTHON +-PYTHON_VERSION +-PYTHON_PREFIX +-PYTHON_EXEC_PREFIX +-PYTHON_PLATFORM +-pythondir +-pkgpythondir +-pyexecdir +-pkgpyexecdir +-PYTHON_INCLUDES +-XSLTPROC +-ENABLE_DOCS_TRUE +-ENABLE_DOCS_FALSE +-THREADING_CFLAGS +-PKG_CONFIG +-GLIB_CFLAGS +-GLIB_LIBS +-GLIB_GENMARSHAL +-GOBJECT_QUERY +-GLIB_MKENUMS +-PYGOBJECT_CFLAGS +-PYGOBJECT_LIBS +-PYGOBJECT_INCLUDEDIR +-PYGOBJECT_DATADIR +-PYGOBJECT_FIXXREF +-PYGOBJECT_PYGDOCS +-ATK_CFLAGS +-ATK_LIBS +-BUILD_ATK_TRUE +-BUILD_ATK_FALSE +-PANGO_CFLAGS +-PANGO_LIBS +-BUILD_PANGO_TRUE +-BUILD_PANGO_FALSE +-CODEGENDIR +-PYGTK_CODEGEN_DEFINES +-PYCAIRO_CFLAGS +-PYCAIRO_LIBS +-PANGOCAIRO_CFLAGS +-PANGOCAIRO_LIBS +-BUILD_PANGOCAIRO_TRUE +-BUILD_PANGOCAIRO_FALSE +-GTK_CFLAGS +-GTK_LIBS +-BUILD_GTK_TRUE +-BUILD_GTK_FALSE +-GTK210_CFLAGS +-GTK210_LIBS +-HAVE_GTK_2_10_TRUE +-HAVE_GTK_2_10_FALSE +-HAVE_GTK_2_10 +-GTK212_CFLAGS +-GTK212_LIBS +-HAVE_GTK_2_12_TRUE +-HAVE_GTK_2_12_FALSE +-HAVE_GTK_2_12 +-GTK214_CFLAGS +-GTK214_LIBS +-HAVE_GTK_2_14_TRUE +-HAVE_GTK_2_14_FALSE +-HAVE_GTK_2_14 +-LIBGLADE_CFLAGS +-LIBGLADE_LIBS +-BUILD_LIBGLADE_TRUE +-BUILD_LIBGLADE_FALSE +-GTKUNIXPRINT_CFLAGS +-GTKUNIXPRINT_LIBS +-BUILD_GTKUNIXPRINT_TRUE +-BUILD_GTKUNIXPRINT_FALSE ++ac_subst_vars='LTLIBOBJS + LIBOBJS +-LTLIBOBJS' ++BUILD_GTKUNIXPRINT_FALSE ++BUILD_GTKUNIXPRINT_TRUE ++GTKUNIXPRINT_LIBS ++GTKUNIXPRINT_CFLAGS ++BUILD_LIBGLADE_FALSE ++BUILD_LIBGLADE_TRUE ++LIBGLADE_LIBS ++LIBGLADE_CFLAGS ++HAVE_GTK_2_14 ++HAVE_GTK_2_14_FALSE ++HAVE_GTK_2_14_TRUE ++GTK214_LIBS ++GTK214_CFLAGS ++HAVE_GTK_2_12 ++HAVE_GTK_2_12_FALSE ++HAVE_GTK_2_12_TRUE ++GTK212_LIBS ++GTK212_CFLAGS ++HAVE_GTK_2_10 ++HAVE_GTK_2_10_FALSE ++HAVE_GTK_2_10_TRUE ++GTK210_LIBS ++GTK210_CFLAGS ++BUILD_GTK_FALSE ++BUILD_GTK_TRUE ++GTK_LIBS ++GTK_CFLAGS ++BUILD_PANGOCAIRO_FALSE ++BUILD_PANGOCAIRO_TRUE ++PANGOCAIRO_LIBS ++PANGOCAIRO_CFLAGS ++PYCAIRO_LIBS ++PYCAIRO_CFLAGS ++PYGTK_CODEGEN_DEFINES ++CODEGENDIR ++BUILD_PANGO_FALSE ++BUILD_PANGO_TRUE ++PANGO_LIBS ++PANGO_CFLAGS ++BUILD_ATK_FALSE ++BUILD_ATK_TRUE ++ATK_LIBS ++ATK_CFLAGS ++PYGOBJECT_PYGDOCS ++PYGOBJECT_FIXXREF ++PYGOBJECT_DATADIR ++PYGOBJECT_INCLUDEDIR ++PYGOBJECT_LIBS ++PYGOBJECT_CFLAGS ++GLIB_MKENUMS ++GOBJECT_QUERY ++GLIB_GENMARSHAL ++GLIB_LIBS ++GLIB_CFLAGS ++PKG_CONFIG ++THREADING_CFLAGS ++ENABLE_DOCS_FALSE ++ENABLE_DOCS_TRUE ++XSLTPROC ++PYTHON_INCLUDES ++pkgpyexecdir ++pyexecdir ++pkgpythondir ++pythondir ++PYTHON_PLATFORM ++PYTHON_EXEC_PREFIX ++PYTHON_PREFIX ++PYTHON_VERSION ++PYTHON ++CPP ++OTOOL64 ++OTOOL ++LIPO ++NMEDIT ++DSYMUTIL ++lt_ECHO ++RANLIB ++AR ++LN_S ++NM ++ac_ct_DUMPBIN ++DUMPBIN ++LD ++FGREP ++EGREP ++GREP ++SED ++LIBTOOL ++OBJDUMP ++DLLTOOL ++AS ++OS_WIN32_FALSE ++OS_WIN32_TRUE ++PLATFORM_WIN32_FALSE ++PLATFORM_WIN32_TRUE ++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 ++MAINT ++MAINTAINER_MODE_FALSE ++MAINTAINER_MODE_TRUE ++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 ++PYGTK_MICRO_VERSION ++PYGTK_MINOR_VERSION ++PYGTK_MAJOR_VERSION ++ACLOCAL_AMFLAGS ++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_maintainer_mode ++enable_dependency_tracking ++enable_static ++enable_shared ++with_pic ++enable_fast_install ++with_gnu_ld ++enable_libtool_lock ++enable_thread ++enable_docs ++enable_glibtest ++enable_numpy ++' + ac_precious_vars='build_alias + host_alias + target_alias +@@ -985,6 +1027,8 @@ GTKUNIXPRINT_LIBS' + # 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 +@@ -1083,13 +1127,21 @@ do + 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 ;; +@@ -1102,13 +1154,21 @@ do + 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- \ +@@ -1299,22 +1359,38 @@ do + 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. +@@ -1334,7 +1410,7 @@ do + | --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; }; } + ;; +@@ -1343,16 +1419,16 @@ Try \`$0 --help' for more information." + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. + expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && +- { 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} + ;; + +@@ -1361,22 +1437,38 @@ done + + 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 + +@@ -1391,7 +1483,7 @@ target=$target_alias + 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 +@@ -1407,10 +1499,10 @@ test "$silent" = yes && exec 6>/dev/null + 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; }; } + + +@@ -1418,12 +1510,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + 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 +@@ -1450,12 +1542,12 @@ else + 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=. +@@ -1504,9 +1596,9 @@ Configuration: + + 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 +@@ -1516,25 +1608,25 @@ for instance \`--prefix=\$HOME'. + 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/pygtk] +- --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/pygtk] ++ --htmldir=DIR html documentation [DOCDIR] ++ --dvidir=DIR dvi documentation [DOCDIR] ++ --pdfdir=DIR pdf documentation [DOCDIR] ++ --psdir=DIR ps documentation [DOCDIR] + _ACEOF + + cat <<\_ACEOF +@@ -1557,8 +1649,11 @@ if test -n "$ac_init_help"; then + 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] ++ --enable-maintainer-mode enable make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer + --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors + --enable-static[=PKGS] build static libraries [default=no] +@@ -1636,15 +1731,17 @@ fi + 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/ ;; +@@ -1680,7 +1777,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_ + 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 +@@ -1690,10 +1787,10 @@ test -n "$ac_init_help" && exit $ac_stat + if $ac_init_version; then + cat <<\_ACEOF + pygtk configure 2.14.1 +-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 +@@ -1704,7 +1801,7 @@ This file contains any messages produced + running configure, to aid debugging if configure makes a mistake. + + It was created by pygtk $as_me 2.14.1, which was +-generated by GNU Autoconf 2.61. Invocation command line was ++generated by GNU Autoconf 2.63. Invocation command line was + + $ $0 $@ + +@@ -1740,7 +1837,7 @@ for as_dir in $PATH + 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 + +@@ -1775,7 +1872,7 @@ do + | -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'" ;; +@@ -1827,11 +1924,12 @@ _ASBOX + 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 +@@ -1861,9 +1959,9 @@ _ASBOX + 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 + +@@ -1878,9 +1976,9 @@ _ASBOX + 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 +@@ -1896,8 +1994,8 @@ _ASBOX + 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 && +@@ -1939,21 +2037,24 @@ _ACEOF + + + # 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 +@@ -1963,16 +2064,16 @@ if test -r "$cache_file"; then + # 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 + +@@ -1986,29 +2087,38 @@ for ac_var in $ac_precious_vars; do + 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 +@@ -2018,10 +2128,12 @@ echo "$as_me: current value: $ac_new_v + 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 + +@@ -2085,7 +2197,8 @@ PYGTK_MICRO_VERSION=1 + ac_config_headers="$ac_config_headers config.h" + + +-am__api_version="1.9" ++am__api_version='1.10' ++ + ac_aux_dir= + for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then +@@ -2103,8 +2216,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s + 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 + +@@ -2130,11 +2243,12 @@ ac_configure="$SHELL $ac_aux_dir/configu + # 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 +@@ -2163,17 +2277,29 @@ case $as_dir/ in + # 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 +@@ -2186,8 +2312,8 @@ fi + 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. +@@ -2197,8 +2323,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR + + 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 +@@ -2221,9 +2347,9 @@ if ( + # 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 +@@ -2234,26 +2360,23 @@ then + # 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` +@@ -2264,51 +2387,66 @@ if eval "$MISSING --run true"; then + 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 + +-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then +- # We used to keeping the `.' as first argument, in order to +- # allow $(mkdir_p) to be used without argument. As in +- # $(mkdir_p) $(somedir) +- # where $(somedir) is conditionally defined. However this is wrong +- # for two reasons: +- # 1. if the package is installed by a user who cannot write `.' +- # make install will fail, +- # 2. the above comment should most certainly read +- # $(mkdir_p) $(DESTDIR)$(somedir) +- # so it does not work when $(somedir) is undefined and +- # $(DESTDIR) is not. +- # To support the latter case, we have to write +- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), +- # so the `.' trick is pointless. +- mkdir_p='mkdir -p --' +-else +- # On NextStep and OpenStep, the `mkdir' command does not +- # recognize any option. It will interpret all options as +- # directories to create, and then abort because `.' already +- # exists. +- for d in ./-p ./--version; +- do +- test -d $d && rmdir $d +- done +- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. +- if test -f "$ac_aux_dir/mkinstalldirs"; then +- mkdir_p='$(mkinstalldirs)' ++{ $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 ++ $as_echo_n "(cached) " >&6 ++else ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in mkdir gmkdir; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue ++ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( ++ 'mkdir (GNU coreutils) '* | \ ++ 'mkdir (coreutils) '* | \ ++ 'mkdir (fileutils) '4.1*) ++ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext ++ break 3;; ++ esac ++ done ++ done ++done ++IFS=$as_save_IFS ++ ++fi ++ ++ if test "${ac_cv_path_mkdir+set}" = set; then ++ MKDIR_P="$ac_cv_path_mkdir -p" + else +- mkdir_p='$(install_sh) -d' ++ # As a last resort, use the slow shell script. Don't cache a ++ # value for MKDIR_P within a source directory, because that will ++ # break other packages using the cache if that directory is ++ # removed, or if the value is a relative name. ++ test -d ./--version && rmdir ./--version ++ MKDIR_P="$ac_install_sh -d" + fi + fi ++{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 ++$as_echo "$MKDIR_P" >&6; } ++ ++mkdir_p="$MKDIR_P" ++case $mkdir_p in ++ [\\/$]* | ?:[\\/]*) ;; ++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; ++esac + + for ac_prog in gawk mawk nawk awk + 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. +@@ -2321,7 +2459,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AWK="$ac_prog" +- 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 +@@ -2332,22 +2470,23 @@ fi + 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 +@@ -2364,12 +2503,12 @@ esac + 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 + +@@ -2382,12 +2521,16 @@ else + fi + rmdir .tst 2>/dev/null + +-# test to see if srcdir already configured +-if test "`cd $srcdir && pwd`" != "`pwd`" && +- 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;} ++if test "`cd $srcdir && pwd`" != "`pwd`"; then ++ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output ++ # is not polluted with repeated "-I." ++ am__isrc=' -I$(srcdir)' ++ # test to see if srcdir already configured ++ if test -f $srcdir/config.status; then ++ { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 ++$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} + { (exit 1); exit 1; }; } ++ fi + fi + + # test whether we have cygpath +@@ -2430,7 +2573,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru + + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +-install_sh=${install_sh-"$am_aux_dir/install-sh"} ++install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} + + # Installed binaries are usually stripped using `strip' when the user + # run `make install-strip'. However `strip' might not be the right +@@ -2440,10 +2583,10 @@ if test "$cross_compiling" != no; then + 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. +@@ -2456,7 +2599,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" +- 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 +@@ -2467,11 +2610,11 @@ fi + 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 + + +@@ -2480,10 +2623,10 @@ if test -z "$ac_cv_prog_STRIP"; then + 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. +@@ -2496,7 +2639,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" +- 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 +@@ -2507,11 +2650,11 @@ fi + 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 +@@ -2519,12 +2662,8 @@ fi + 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 +@@ -2534,7 +2673,7 @@ else + fi + + fi +-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" ++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. +@@ -2548,6 +2687,28 @@ am__tar='${AMTAR} chof - "$$tardir"'; am + + + ++{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 ++$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } ++ # Check whether --enable-maintainer-mode was given. ++if test "${enable_maintainer_mode+set}" = set; then ++ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval ++else ++ USE_MAINTAINER_MODE=no ++fi ++ ++ { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 ++$as_echo "$USE_MAINTAINER_MODE" >&6; } ++ if test $USE_MAINTAINER_MODE = yes; then ++ MAINTAINER_MODE_TRUE= ++ MAINTAINER_MODE_FALSE='#' ++else ++ MAINTAINER_MODE_TRUE='#' ++ MAINTAINER_MODE_FALSE= ++fi ++ ++ MAINT=$MAINTAINER_MODE_TRUE ++ ++ + DEPDIR="${am__leading_dot}deps" + + ac_config_commands="$ac_config_commands depfiles" +@@ -2560,8 +2721,8 @@ am__doit: + .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 +@@ -2588,8 +2749,8 @@ if test "$am__include" = "#"; then + 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. +@@ -2601,9 +2762,7 @@ if test "x$enable_dependency_tracking" ! + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + fi +- +- +-if test "x$enable_dependency_tracking" != xno; then ++ if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' + else +@@ -2612,7 +2771,6 @@ else + fi + + +- + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -2621,10 +2779,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + 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. +@@ -2637,7 +2795,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" +- 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 +@@ -2648,11 +2806,11 @@ fi + 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 + + +@@ -2661,10 +2819,10 @@ if test -z "$ac_cv_prog_CC"; then + 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. +@@ -2677,7 +2835,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="gcc" +- 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 +@@ -2688,11 +2846,11 @@ fi + 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 +@@ -2700,12 +2858,8 @@ fi + 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 +@@ -2718,10 +2872,10 @@ if test -z "$CC"; then + 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. +@@ -2734,7 +2888,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" +- 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 +@@ -2745,11 +2899,11 @@ fi + 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 + + +@@ -2758,10 +2912,10 @@ fi + 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. +@@ -2779,7 +2933,7 @@ do + 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 +@@ -2802,11 +2956,11 @@ fi + 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 + + +@@ -2817,10 +2971,10 @@ if test -z "$CC"; then + 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. +@@ -2833,7 +2987,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" +- 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 +@@ -2844,11 +2998,11 @@ fi + 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 + + +@@ -2861,10 +3015,10 @@ if test -z "$CC"; then + 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. +@@ -2877,7 +3031,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" +- 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 +@@ -2888,11 +3042,11 @@ fi + 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 + + +@@ -2904,12 +3058,8 @@ done + 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 +@@ -2919,44 +3069,50 @@ fi + 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 +@@ -2975,27 +3131,22 @@ main () + } + _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 +@@ -3006,10 +3157,11 @@ 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_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' +@@ -3020,7 +3172,7 @@ for ac_file in $ac_files '' + 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 +@@ -3047,25 +3199,27 @@ else + 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 +@@ -3074,49 +3228,53 @@ if test "$cross_compiling" != yes; then + *\"* | *\`* | *\\*) 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 +@@ -3125,31 +3283,33 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec + 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. */ +@@ -3172,40 +3332,43 @@ 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_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. */ +@@ -3231,20 +3394,21 @@ 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_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 +@@ -3254,15 +3418,19 @@ rm -f core conftest.err conftest.$ac_obj + 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 +@@ -3289,20 +3457,21 @@ 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_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="" +@@ -3327,20 +3496,21 @@ 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_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 +@@ -3366,20 +3536,21 @@ 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_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 + + +@@ -3394,8 +3565,8 @@ fi + 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 +@@ -3411,10 +3582,10 @@ else + 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 +@@ -3485,20 +3656,21 @@ 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_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 + + +@@ -3514,15 +3686,15 @@ fi + # 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 + + +@@ -3534,10 +3706,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + 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 +@@ -3599,6 +3771,7 @@ else + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +@@ -3624,13 +3797,11 @@ else + 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 ++ if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= +@@ -3645,11 +3816,11 @@ fi + + 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. */ +@@ -3702,35 +3873,42 @@ 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>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 +@@ -3741,34 +3919,34 @@ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" + + # 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 +@@ -3785,27 +3963,27 @@ IFS=$ac_save_IFS + 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 +@@ -3822,8 +4000,8 @@ IFS=$ac_save_IFS + case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + +-{ echo "$as_me:$LINENO: checking for some Win32 platform" >&5 +-echo $ECHO_N "checking for some Win32 platform... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for some Win32 platform" >&5 ++$as_echo_n "checking for some Win32 platform... " >&6; } + case "$host" in + *-*-mingw*|*-*-cygwin*) + platform_win32=yes +@@ -3832,11 +4010,9 @@ case "$host" in + platform_win32=no + ;; + esac +-{ echo "$as_me:$LINENO: result: $platform_win32" >&5 +-echo "${ECHO_T}$platform_win32" >&6; } +- +- +-if test "$platform_win32" = "yes"; then ++{ $as_echo "$as_me:$LINENO: result: $platform_win32" >&5 ++$as_echo "$platform_win32" >&6; } ++ if test "$platform_win32" = "yes"; then + PLATFORM_WIN32_TRUE= + PLATFORM_WIN32_FALSE='#' + else +@@ -3845,8 +4021,8 @@ else + fi + + +-{ echo "$as_me:$LINENO: checking for native Win32" >&5 +-echo $ECHO_N "checking for native Win32... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for native Win32" >&5 ++$as_echo_n "checking for native Win32... " >&6; } + case "$host" in + *-*-mingw*) + os_win32=yes +@@ -3855,11 +4031,9 @@ case "$host" in + os_win32=no + ;; + esac +-{ echo "$as_me:$LINENO: result: $os_win32" >&5 +-echo "${ECHO_T}$os_win32" >&6; } +- +- +-if test "$os_win32" = "yes"; then ++{ $as_echo "$as_me:$LINENO: result: $os_win32" >&5 ++$as_echo "$os_win32" >&6; } ++ if test "$os_win32" = "yes"; then + OS_WIN32_TRUE= + OS_WIN32_FALSE='#' + else +@@ -3905,14 +4079,14 @@ fi + enable_win32_dll=yes + + case $host in +-*-*-cygwin* | *-*-mingw* | *-*-pw32*) ++*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. + set dummy ${ac_tool_prefix}as; 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_AS+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$AS"; then + ac_cv_prog_AS="$AS" # Let the user override the test. +@@ -3925,7 +4099,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AS="${ac_tool_prefix}as" +- 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 +@@ -3936,11 +4110,11 @@ fi + fi + AS=$ac_cv_prog_AS + if test -n "$AS"; then +- { echo "$as_me:$LINENO: result: $AS" >&5 +-echo "${ECHO_T}$AS" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $AS" >&5 ++$as_echo "$AS" >&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 + + +@@ -3949,10 +4123,10 @@ if test -z "$ac_cv_prog_AS"; then + ac_ct_AS=$AS + # Extract the first word of "as", so it can be a program name with args. + set dummy as; 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_AS+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_AS"; then + ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. +@@ -3965,7 +4139,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_AS="as" +- 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 +@@ -3976,11 +4150,11 @@ fi + fi + ac_ct_AS=$ac_cv_prog_ac_ct_AS + if test -n "$ac_ct_AS"; then +- { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 +-echo "${ECHO_T}$ac_ct_AS" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 ++$as_echo "$ac_ct_AS" >&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_AS" = x; then +@@ -3988,12 +4162,8 @@ fi + 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 + AS=$ac_ct_AS +@@ -4005,10 +4175,10 @@ fi + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. + set dummy ${ac_tool_prefix}dlltool; 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_DLLTOOL+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. +@@ -4021,7 +4191,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" +- 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 +@@ -4032,11 +4202,11 @@ fi + fi + DLLTOOL=$ac_cv_prog_DLLTOOL + if test -n "$DLLTOOL"; then +- { echo "$as_me:$LINENO: result: $DLLTOOL" >&5 +-echo "${ECHO_T}$DLLTOOL" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5 ++$as_echo "$DLLTOOL" >&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 + + +@@ -4045,10 +4215,10 @@ if test -z "$ac_cv_prog_DLLTOOL"; then + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. + set dummy dlltool; 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_DLLTOOL+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. +@@ -4061,7 +4231,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" +- 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 +@@ -4072,11 +4242,11 @@ fi + fi + ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL + if test -n "$ac_ct_DLLTOOL"; then +- { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 +-echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 ++$as_echo "$ac_ct_DLLTOOL" >&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_DLLTOOL" = x; then +@@ -4084,12 +4254,8 @@ fi + 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 + DLLTOOL=$ac_ct_DLLTOOL +@@ -4101,10 +4267,10 @@ fi + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. + set dummy ${ac_tool_prefix}objdump; ac_word=$2 +-{ 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_OBJDUMP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$OBJDUMP"; then + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. +@@ -4117,7 +4283,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" +- 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 +@@ -4128,11 +4294,11 @@ fi + fi + OBJDUMP=$ac_cv_prog_OBJDUMP + if test -n "$OBJDUMP"; then +- { echo "$as_me:$LINENO: result: $OBJDUMP" >&5 +-echo "${ECHO_T}$OBJDUMP" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 ++$as_echo "$OBJDUMP" >&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 + + +@@ -4141,10 +4307,10 @@ if test -z "$ac_cv_prog_OBJDUMP"; then + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. + set dummy objdump; ac_word=$2 +-{ 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_OBJDUMP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_OBJDUMP"; then + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. +@@ -4157,7 +4323,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_OBJDUMP="objdump" +- 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 +@@ -4168,11 +4334,11 @@ fi + fi + ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP + if test -n "$ac_ct_OBJDUMP"; then +- { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 +-echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 ++$as_echo "$ac_ct_OBJDUMP" >&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_OBJDUMP" = x; then +@@ -4180,12 +4346,8 @@ fi + 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 + OBJDUMP=$ac_ct_OBJDUMP +@@ -4219,14 +4381,14 @@ test -z "$OBJDUMP" && OBJDUMP=objdump + + case `pwd` in + *\ * | *\ *) +- { echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +-echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; ++ { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 ++$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; + esac + + + +-macro_version='2.2.4' +-macro_revision='1.2976' ++macro_version='2.2.6' ++macro_revision='1.3012' + + + +@@ -4242,48 +4404,43 @@ macro_revision='1.2976' + + ltmain="$ac_aux_dir/ltmain.sh" + +-{ 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 "${ac_cv_path_SED+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done +- echo "$ac_script" | sed 99q >conftest.sed ++ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + $as_unset ac_script || ac_script= +- # Extract the first word of "sed gsed" to use in msg output +-if test -z "$SED"; then +-set dummy sed gsed; ac_prog_name=$2 +-if test "${ac_cv_path_SED+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else ++ if test -z "$SED"; then + ac_path_SED_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 + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in sed gsed; do +- for ac_exec_ext in '' $ac_executable_extensions; do +- ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" +- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue +- # Check for GNU ac_path_SED and select it if it is found. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" ++ { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue ++# Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED + case `"$ac_path_SED" --version 2>&1` in + *GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_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 '' >> "conftest.nl" ++ $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` +@@ -4298,31 +4455,23 @@ case `"$ac_path_SED" --version 2>&1` in + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; + esac + +- +- $ac_path_SED_found && break 3 ++ $ac_path_SED_found && break 3 ++ done + done + done +- +-done + IFS=$as_save_IFS +- +- +-fi +- +-SED="$ac_cv_path_SED" +-if test -z "$SED"; then +- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in \$PATH" >&5 +-echo "$as_me: error: no acceptable $ac_prog_name could be found in \$PATH" >&2;} ++ if test -z "$ac_cv_path_SED"; then ++ { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5 ++$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;} + { (exit 1); exit 1; }; } +-fi +- ++ fi + else + ac_cv_path_SED=$SED + fi + + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 +-echo "${ECHO_T}$ac_cv_path_SED" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 ++$as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed + +@@ -4339,42 +4488,37 @@ Xsed="$SED -e 1s/^X//" + + + +-{ 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` +@@ -4389,74 +4533,60 @@ case `"$ac_path_GREP" --version 2>&1` in + 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` +@@ -4471,75 +4601,61 @@ case `"$ac_path_EGREP" --version 2>&1` i + 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" + + +-{ echo "$as_me:$LINENO: checking for fgrep" >&5 +-echo $ECHO_N "checking for fgrep... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5 ++$as_echo_n "checking for fgrep... " >&6; } + if test "${ac_cv_path_FGREP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 + then ac_cv_path_FGREP="$GREP -F" + else +- # Extract the first word of "fgrep" to use in msg output +-if test -z "$FGREP"; then +-set dummy fgrep; ac_prog_name=$2 +-if test "${ac_cv_path_FGREP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else ++ if test -z "$FGREP"; then + ac_path_FGREP_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 fgrep; do +- for ac_exec_ext in '' $ac_executable_extensions; do +- ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" +- { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue +- # Check for GNU ac_path_FGREP and select it if it is found. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" ++ { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue ++# Check for GNU ac_path_FGREP and select it if it is found. + # Check for GNU $ac_path_FGREP + case `"$ac_path_FGREP" --version 2>&1` in + *GNU*) + ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_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 'FGREP' >> "conftest.nl" ++ $as_echo 'FGREP' >> "conftest.nl" + "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` +@@ -4554,33 +4670,24 @@ case `"$ac_path_FGREP" --version 2>&1` i + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; + esac + +- +- $ac_path_FGREP_found && break 3 ++ $ac_path_FGREP_found && break 3 ++ done + done + done +- +-done + IFS=$as_save_IFS +- +- +-fi +- +-FGREP="$ac_cv_path_FGREP" +-if test -z "$FGREP"; 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_FGREP"; then ++ { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 ++$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +-fi +- ++ fi + else + ac_cv_path_FGREP=$FGREP + fi + +- + fi + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5 +-echo "${ECHO_T}$ac_cv_path_FGREP" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5 ++$as_echo "$ac_cv_path_FGREP" >&6; } + FGREP="$ac_cv_path_FGREP" + + +@@ -4614,8 +4721,8 @@ fi + 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 +@@ -4644,14 +4751,14 @@ echo $ECHO_N "checking for ld used by $C + ;; + 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 +@@ -4681,19 +4788,19 @@ fi + + 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 &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 + + +@@ -4717,10 +4824,10 @@ with_gnu_ld=$lt_cv_prog_gnu_ld + + + +-{ echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 +-echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 ++$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } + if test "${lt_cv_path_NM+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$NM"; then + # Let the user override the test. +@@ -4766,8 +4873,8 @@ else + : ${lt_cv_path_NM=no} + 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; } + if test "$lt_cv_path_NM" != "no"; then + NM="$lt_cv_path_NM" + else +@@ -4777,10 +4884,10 @@ else + 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_DUMPBIN+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$DUMPBIN"; then + ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. +@@ -4793,7 +4900,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" +- 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 +@@ -4804,11 +4911,11 @@ fi + fi + DUMPBIN=$ac_cv_prog_DUMPBIN + if test -n "$DUMPBIN"; then +- { echo "$as_me:$LINENO: result: $DUMPBIN" >&5 +-echo "${ECHO_T}$DUMPBIN" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5 ++$as_echo "$DUMPBIN" >&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 + + +@@ -4821,10 +4928,10 @@ if test -z "$DUMPBIN"; then + 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_DUMPBIN+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_DUMPBIN"; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. +@@ -4837,7 +4944,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" +- 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 +@@ -4848,11 +4955,11 @@ fi + fi + ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN + if test -n "$ac_ct_DUMPBIN"; then +- { echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5 +-echo "${ECHO_T}$ac_ct_DUMPBIN" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5 ++$as_echo "$ac_ct_DUMPBIN" >&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 + + +@@ -4864,12 +4971,8 @@ done + 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 + DUMPBIN=$ac_ct_DUMPBIN +@@ -4888,45 +4991,45 @@ test -z "$NM" && NM=nm + + + +-{ echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5 +-echo $ECHO_N "checking the name lister ($NM) interface... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5 ++$as_echo_n "checking the name lister ($NM) interface... " >&6; } + if test "${lt_cv_nm_interface+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:4898: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:5001: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:4901: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:5004: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:4904: output\"" >&5) ++ (eval echo "\"\$as_me:5007: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi + rm -f conftest* + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5 +-echo "${ECHO_T}$lt_cv_nm_interface" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5 ++$as_echo "$lt_cv_nm_interface" >&6; } + +-{ 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 + + # 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" +@@ -4947,7 +5050,7 @@ else + lt_cv_sys_max_cmd_len=-1; + ;; + +- cygwin* | mingw*) ++ cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, +@@ -5043,11 +5146,11 @@ else + 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 + max_cmd_len=$lt_cv_sys_max_cmd_len + +@@ -5060,8 +5163,8 @@ max_cmd_len=$lt_cv_sys_max_cmd_len + : ${MV="mv -f"} + : ${RM="rm -f"} + +-{ echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5 +-echo $ECHO_N "checking whether the shell understands some XSI constructs... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5 ++$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } + # Try some XSI features + xsi_shell=no + ( _lt_dummy="a/b/c" +@@ -5070,18 +5173,18 @@ xsi_shell=no + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +-{ echo "$as_me:$LINENO: result: $xsi_shell" >&5 +-echo "${ECHO_T}$xsi_shell" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5 ++$as_echo "$xsi_shell" >&6; } + + +-{ echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5 +-echo $ECHO_N "checking whether the shell understands \"+=\"... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5 ++$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } + lt_shell_append=no + ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ + >/dev/null 2>&1 \ + && lt_shell_append=yes +-{ echo "$as_me:$LINENO: result: $lt_shell_append" >&5 +-echo "${ECHO_T}$lt_shell_append" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5 ++$as_echo "$lt_shell_append" >&6; } + + + if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +@@ -5115,44 +5218,142 @@ esac + + + +-{ 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; } +-if test "${lt_cv_ld_reload_flag+set}" = set; then +- echo $ECHO_N "(cached) $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 ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_ld_reload_flag='-r' ++fi ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 ++$as_echo "$lt_cv_ld_reload_flag" >&6; } ++reload_flag=$lt_cv_ld_reload_flag ++case $reload_flag in ++"" | " "*) ;; ++*) reload_flag=" $reload_flag" ;; ++esac ++reload_cmds='$LD$reload_flag -o $output$reload_objs' ++case $host_os in ++ darwin*) ++ if test "$GCC" = yes; then ++ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' ++ else ++ reload_cmds='$LD$reload_flag -o $output$reload_objs' ++ fi ++ ;; ++esac ++ ++ ++ ++ ++ ++ ++ ++ ++ ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. ++set dummy ${ac_tool_prefix}objdump; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_OBJDUMP+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$OBJDUMP"; then ++ ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++OBJDUMP=$ac_cv_prog_OBJDUMP ++if test -n "$OBJDUMP"; then ++ { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 ++$as_echo "$OBJDUMP" >&6; } ++else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_OBJDUMP"; then ++ ac_ct_OBJDUMP=$OBJDUMP ++ # Extract the first word of "objdump", so it can be a program name with args. ++set dummy objdump; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_OBJDUMP"; then ++ ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_OBJDUMP="objdump" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP ++if test -n "$ac_ct_OBJDUMP"; then ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 ++$as_echo "$ac_ct_OBJDUMP" >&6; } + else +- lt_cv_ld_reload_flag='-r' ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 +-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } +-reload_flag=$lt_cv_ld_reload_flag +-case $reload_flag in +-"" | " "*) ;; +-*) reload_flag=" $reload_flag" ;; +-esac +-reload_cmds='$LD$reload_flag -o $output$reload_objs' +-case $host_os in +- darwin*) +- if test "$GCC" = yes; then +- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' +- else +- reload_cmds='$LD$reload_flag -o $output$reload_objs' +- fi +- ;; +-esac +- +- + ++ if test "x$ac_ct_OBJDUMP" = x; then ++ OBJDUMP="false" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ OBJDUMP=$ac_ct_OBJDUMP ++ fi ++else ++ OBJDUMP="$ac_cv_prog_OBJDUMP" ++fi + ++test -z "$OBJDUMP" && OBJDUMP=objdump + + + + + + +-{ 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= +@@ -5202,6 +5403,12 @@ mingw* | pw32*) + fi + ;; + ++cegcc) ++ # use the weaker test based on 'objdump'. See mingw*. ++ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' ++ lt_cv_file_magic_cmd='$OBJDUMP -f' ++ ;; ++ + darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; +@@ -5339,8 +5546,8 @@ tpf*) + 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 +@@ -5359,10 +5566,10 @@ test -z "$deplibs_check_method" && depli + 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. +@@ -5375,7 +5582,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AR="${ac_tool_prefix}ar" +- 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 +@@ -5386,11 +5593,11 @@ fi + 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 + + +@@ -5399,10 +5606,10 @@ if test -z "$ac_cv_prog_AR"; then + 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. +@@ -5415,7 +5622,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_AR="ar" +- 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 +@@ -5426,11 +5633,11 @@ fi + 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 +@@ -5438,12 +5645,8 @@ fi + 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 +@@ -5468,10 +5671,10 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru + 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. +@@ -5484,7 +5687,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" +- 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 +@@ -5495,11 +5698,11 @@ fi + 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 + + +@@ -5508,10 +5711,10 @@ if test -z "$ac_cv_prog_STRIP"; then + 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. +@@ -5524,7 +5727,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" +- 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 +@@ -5535,11 +5738,11 @@ fi + 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 +@@ -5547,12 +5750,8 @@ fi + 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 +@@ -5571,10 +5770,10 @@ test -z "$STRIP" && STRIP=: + 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. +@@ -5587,7 +5786,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" +- 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 +@@ -5598,11 +5797,11 @@ fi + 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 + + +@@ -5611,10 +5810,10 @@ if test -z "$ac_cv_prog_RANLIB"; then + 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. +@@ -5627,7 +5826,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_RANLIB="ranlib" +- 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 +@@ -5638,11 +5837,11 @@ fi + 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 +@@ -5650,12 +5849,8 @@ fi + 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 +@@ -5732,10 +5927,10 @@ compiler=$CC + + + # 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. +@@ -5752,7 +5947,7 @@ case $host_os in + aix*) + symcode='[BCDT]' + ;; +-cygwin* | mingw* | pw32*) ++cygwin* | mingw* | pw32* | cegcc*) + symcode='[ABCDGISTW]' + ;; + hpux*) +@@ -5853,14 +6048,14 @@ _LT_EOF + 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 +@@ -5917,7 +6112,7 @@ _LT_EOF + 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 +@@ -5952,11 +6147,11 @@ if test -z "$lt_cv_sys_global_symbol_pip + 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 + + +@@ -5996,7 +6191,7 @@ ia64-*-hpux*) + 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*) +@@ -6011,11 +6206,11 @@ ia64-*-hpux*) + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 6014 "configure"' > conftest.$ac_ext ++ echo '#line 6209 "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 +@@ -6053,7 +6248,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux* + 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*) +@@ -6103,10 +6298,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux* + # 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' +@@ -6135,26 +6330,30 @@ 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>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 +@@ -6164,8 +6363,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLA + 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" +@@ -6177,7 +6376,7 @@ sparc*-*solaris*) + 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*) +@@ -6204,10 +6403,10 @@ need_locks="$enable_libtool_lock" + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. + set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +-{ 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_DSYMUTIL+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$DSYMUTIL"; then + ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. +@@ -6220,7 +6419,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" +- 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 +@@ -6231,11 +6430,11 @@ fi + fi + DSYMUTIL=$ac_cv_prog_DSYMUTIL + if test -n "$DSYMUTIL"; then +- { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 +-echo "${ECHO_T}$DSYMUTIL" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 ++$as_echo "$DSYMUTIL" >&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 + + +@@ -6244,10 +6443,10 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then + ac_ct_DSYMUTIL=$DSYMUTIL + # Extract the first word of "dsymutil", so it can be a program name with args. + set dummy dsymutil; ac_word=$2 +-{ 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_DSYMUTIL+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_DSYMUTIL"; then + ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. +@@ -6260,7 +6459,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" +- 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 +@@ -6271,11 +6470,11 @@ fi + fi + ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL + if test -n "$ac_ct_DSYMUTIL"; then +- { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 +-echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 ++$as_echo "$ac_ct_DSYMUTIL" >&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_DSYMUTIL" = x; then +@@ -6283,12 +6482,8 @@ fi + 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 + DSYMUTIL=$ac_ct_DSYMUTIL +@@ -6300,10 +6495,10 @@ fi + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. + set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +-{ 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_NMEDIT+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$NMEDIT"; then + ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. +@@ -6316,7 +6511,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" +- 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 +@@ -6327,11 +6522,11 @@ fi + fi + NMEDIT=$ac_cv_prog_NMEDIT + if test -n "$NMEDIT"; then +- { echo "$as_me:$LINENO: result: $NMEDIT" >&5 +-echo "${ECHO_T}$NMEDIT" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5 ++$as_echo "$NMEDIT" >&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 + + +@@ -6340,10 +6535,10 @@ if test -z "$ac_cv_prog_NMEDIT"; then + ac_ct_NMEDIT=$NMEDIT + # Extract the first word of "nmedit", so it can be a program name with args. + set dummy nmedit; ac_word=$2 +-{ 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_NMEDIT+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_NMEDIT"; then + ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. +@@ -6356,7 +6551,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_NMEDIT="nmedit" +- 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 +@@ -6367,11 +6562,11 @@ fi + fi + ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT + if test -n "$ac_ct_NMEDIT"; then +- { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 +-echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 ++$as_echo "$ac_ct_NMEDIT" >&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_NMEDIT" = x; then +@@ -6379,12 +6574,8 @@ fi + 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 + NMEDIT=$ac_ct_NMEDIT +@@ -6396,10 +6587,10 @@ fi + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. + set dummy ${ac_tool_prefix}lipo; ac_word=$2 +-{ 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_LIPO+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$LIPO"; then + ac_cv_prog_LIPO="$LIPO" # Let the user override the test. +@@ -6412,7 +6603,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_LIPO="${ac_tool_prefix}lipo" +- 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 +@@ -6423,11 +6614,11 @@ fi + fi + LIPO=$ac_cv_prog_LIPO + if test -n "$LIPO"; then +- { echo "$as_me:$LINENO: result: $LIPO" >&5 +-echo "${ECHO_T}$LIPO" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $LIPO" >&5 ++$as_echo "$LIPO" >&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 + + +@@ -6436,10 +6627,10 @@ if test -z "$ac_cv_prog_LIPO"; then + ac_ct_LIPO=$LIPO + # Extract the first word of "lipo", so it can be a program name with args. + set dummy lipo; ac_word=$2 +-{ 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_LIPO+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_LIPO"; then + ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. +@@ -6452,7 +6643,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_LIPO="lipo" +- 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 +@@ -6463,11 +6654,11 @@ fi + fi + ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO + if test -n "$ac_ct_LIPO"; then +- { echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5 +-echo "${ECHO_T}$ac_ct_LIPO" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5 ++$as_echo "$ac_ct_LIPO" >&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_LIPO" = x; then +@@ -6475,12 +6666,8 @@ fi + 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 + LIPO=$ac_ct_LIPO +@@ -6492,10 +6679,10 @@ fi + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. + set dummy ${ac_tool_prefix}otool; ac_word=$2 +-{ 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_OTOOL+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$OTOOL"; then + ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. +@@ -6508,7 +6695,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OTOOL="${ac_tool_prefix}otool" +- 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 +@@ -6519,11 +6706,11 @@ fi + fi + OTOOL=$ac_cv_prog_OTOOL + if test -n "$OTOOL"; then +- { echo "$as_me:$LINENO: result: $OTOOL" >&5 +-echo "${ECHO_T}$OTOOL" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5 ++$as_echo "$OTOOL" >&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 + + +@@ -6532,10 +6719,10 @@ if test -z "$ac_cv_prog_OTOOL"; then + ac_ct_OTOOL=$OTOOL + # Extract the first word of "otool", so it can be a program name with args. + set dummy otool; ac_word=$2 +-{ 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_OTOOL+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_OTOOL"; then + ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. +@@ -6548,7 +6735,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_OTOOL="otool" +- 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 +@@ -6559,11 +6746,11 @@ fi + fi + ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL + if test -n "$ac_ct_OTOOL"; then +- { echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5 +-echo "${ECHO_T}$ac_ct_OTOOL" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5 ++$as_echo "$ac_ct_OTOOL" >&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_OTOOL" = x; then +@@ -6571,12 +6758,8 @@ fi + 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 + OTOOL=$ac_ct_OTOOL +@@ -6588,10 +6771,10 @@ fi + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. + set dummy ${ac_tool_prefix}otool64; ac_word=$2 +-{ 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_OTOOL64+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$OTOOL64"; then + ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. +@@ -6604,7 +6787,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" +- 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 +@@ -6615,11 +6798,11 @@ fi + fi + OTOOL64=$ac_cv_prog_OTOOL64 + if test -n "$OTOOL64"; then +- { echo "$as_me:$LINENO: result: $OTOOL64" >&5 +-echo "${ECHO_T}$OTOOL64" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5 ++$as_echo "$OTOOL64" >&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 + + +@@ -6628,10 +6811,10 @@ if test -z "$ac_cv_prog_OTOOL64"; then + ac_ct_OTOOL64=$OTOOL64 + # Extract the first word of "otool64", so it can be a program name with args. + set dummy otool64; ac_word=$2 +-{ 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_OTOOL64+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_OTOOL64"; then + ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. +@@ -6644,7 +6827,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_OTOOL64="otool64" +- 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 +@@ -6655,11 +6838,11 @@ fi + fi + ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 + if test -n "$ac_ct_OTOOL64"; then +- { echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5 +-echo "${ECHO_T}$ac_ct_OTOOL64" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5 ++$as_echo "$ac_ct_OTOOL64" >&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_OTOOL64" = x; then +@@ -6667,12 +6850,8 @@ fi + 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 + OTOOL64=$ac_ct_OTOOL64 +@@ -6707,10 +6886,10 @@ fi + + + +- { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 +-echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 ++$as_echo_n "checking for -single_module linker flag... " >&6; } + if test "${lt_cv_apple_cc_single_mod+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then +@@ -6734,12 +6913,12 @@ else + rm -f conftest.* + fi + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 +-echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } +- { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 +-echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 ++$as_echo "$lt_cv_apple_cc_single_mod" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 ++$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } + if test "${lt_cv_ld_exported_symbols_list+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS +@@ -6766,33 +6945,37 @@ 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>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_ld_exported_symbols_list=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_ld_exported_symbols_list=no + fi + ++rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" + + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 +-echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 ++$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + case $host_os in + rhapsody* | darwin1.[012]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; +@@ -6833,15 +7016,15 @@ ac_cpp='$CPP $CPPFLAGS' + 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" +@@ -6873,20 +7056,21 @@ 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_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. +@@ -6910,13 +7094,14 @@ 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_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 +@@ -6924,7 +7109,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec + # 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. +@@ -6949,8 +7134,8 @@ fi + 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 +@@ -6978,20 +7163,21 @@ 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_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. +@@ -7015,13 +7201,14 @@ 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_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 +@@ -7029,7 +7216,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec + # 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. +@@ -7045,11 +7232,13 @@ rm -f conftest.err conftest.$ac_ext + 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 +@@ -7059,10 +7248,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLA + 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. */ +@@ -7089,20 +7278,21 @@ 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_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 +@@ -7194,37 +7384,40 @@ 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); } && { 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 +@@ -7246,11 +7439,11 @@ fi + 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. */ +@@ -7268,20 +7461,21 @@ 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_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" +@@ -7289,12 +7483,15 @@ fi + + 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 +@@ -7305,11 +7502,11 @@ done + + for ac_header in dlfcn.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. */ +@@ -7327,20 +7524,21 @@ 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_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" +@@ -7348,12 +7546,15 @@ fi + + 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 +@@ -7501,10 +7702,10 @@ if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + 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 +@@ -7516,8 +7717,8 @@ else + 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 + + +@@ -7609,10 +7810,10 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file + 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 + [\\/*] | ?:[\\/]*) +@@ -7662,11 +7863,11 @@ fi + + 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 + + +@@ -7675,10 +7876,10 @@ 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 + [\\/*] | ?:[\\/]*) +@@ -7728,11 +7929,11 @@ fi + + 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 + + +@@ -7808,10 +8009,10 @@ lt_prog_compiler_no_builtin_flag= + if test "$GCC" = yes; then + 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 +@@ -7826,11 +8027,11 @@ else + -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:7829: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8030: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7833: \$? = $ac_status" >&5 ++ echo "$as_me:8034: \$? = $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. +@@ -7843,8 +8044,8 @@ else + $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" +@@ -7863,8 +8064,8 @@ fi + 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,' +@@ -7898,7 +8099,7 @@ echo $ECHO_N "checking for $compiler opt + # PIC is the default for these OSes. + ;; + +- mingw* | cygwin* | pw32* | os2*) ++ mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style +@@ -7913,10 +8114,11 @@ echo $ECHO_N "checking for $compiler opt + ;; + + hpux*) +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. ++ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit ++ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag ++ # sets the default TLS model and affects inlining. + case $host_cpu in +- hppa*64*|ia64*) ++ hppa*64*) + # +Z the default + ;; + *) +@@ -7966,7 +8168,7 @@ echo $ECHO_N "checking for $compiler opt + fi + ;; + +- mingw* | cygwin* | pw32* | os2*) ++ mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic='-DDLL_EXPORT' +@@ -7996,11 +8198,25 @@ echo $ECHO_N "checking for $compiler opt + + linux* | k*bsd*-gnu) + case $cc_basename in +- icc* | ecc* | ifort*) ++ # old Intel for x86_64 which still supported -KPIC. ++ ecc*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-static' + ;; ++ # icc used to be incompatible with GCC. ++ # ICC 10 doesn't accept -KPIC any more. ++ icc* | ifort*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-fPIC' ++ lt_prog_compiler_static='-static' ++ ;; ++ # Lahey Fortran 8.1. ++ lf95*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='--shared' ++ lt_prog_compiler_static='--static' ++ ;; + pgcc* | pgf77* | pgf90* | pgf95*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) +@@ -8120,8 +8336,8 @@ case $host_os in + lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" + ;; + esac +-{ 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; } + + + +@@ -8132,10 +8348,10 @@ echo "${ECHO_T}$lt_prog_compiler_pic" >& + # 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_cv_prog_compiler_pic_works+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_pic_works=no + ac_outfile=conftest.$ac_objext +@@ -8150,11 +8366,11 @@ else + -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:8153: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8369: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8157: \$? = $ac_status" >&5 ++ echo "$as_me:8373: \$? = $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. +@@ -8167,8 +8383,8 @@ else + $RM conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 ++$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } + + if test x"$lt_cv_prog_compiler_pic_works" = xyes; then + case $lt_prog_compiler_pic in +@@ -8191,10 +8407,10 @@ fi + # 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_cv_prog_compiler_static_works+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_static_works=no + save_LDFLAGS="$LDFLAGS" +@@ -8219,8 +8435,8 @@ else + LDFLAGS="$save_LDFLAGS" + + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 ++$as_echo "$lt_cv_prog_compiler_static_works" >&6; } + + if test x"$lt_cv_prog_compiler_static_works" = xyes; then + : +@@ -8234,10 +8450,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 +@@ -8255,11 +8471,11 @@ else + -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:8258: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8474: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:8262: \$? = $ac_status" >&5 ++ echo "$as_me:8478: \$? = $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 +@@ -8281,18 +8497,18 @@ else + $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; } + + + + + + +- { 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 +@@ -8310,11 +8526,11 @@ else + -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:8313: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8529: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:8317: \$? = $ac_status" >&5 ++ echo "$as_me:8533: \$? = $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 +@@ -8336,8 +8552,8 @@ else + $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; } + + + +@@ -8345,19 +8561,19 @@ echo "${ECHO_T}$lt_cv_prog_compiler_c_o" + 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 +@@ -8369,8 +8585,8 @@ 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= +@@ -8414,7 +8630,7 @@ echo $ECHO_N "checking whether the $comp + extract_expsyms_cmds= + + case $host_os in +- cygwin* | mingw* | pw32*) ++ cygwin* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. +@@ -8429,6 +8645,9 @@ echo $ECHO_N "checking whether the $comp + openbsd*) + with_gnu_ld=no + ;; ++ linux* | k*bsd*-gnu) ++ link_all_deplibs=no ++ ;; + esac + + ld_shlibs=yes +@@ -8501,7 +8720,7 @@ _LT_EOF + fi + ;; + +- cygwin* | mingw* | pw32*) ++ cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec='-L$libdir' +@@ -8567,6 +8786,9 @@ _LT_EOF + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; ++ lf95*) # Lahey Fortran 8.1 ++ whole_archive_flag_spec= ++ tmp_sharedflag='--shared' ;; + xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; +@@ -8799,6 +9021,7 @@ _LT_EOF + fi + fi + ++ export_dynamic_flag_spec='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols=yes +@@ -8829,18 +9052,21 @@ 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>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/,/^$/ { +@@ -8855,12 +9081,13 @@ if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi + else +- 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 +@@ -8896,18 +9123,21 @@ 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>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/,/^$/ { +@@ -8922,12 +9152,13 @@ if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi + else +- 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 +@@ -8965,7 +9196,7 @@ if test -z "$aix_libpath"; then aix_libp + export_dynamic_flag_spec=-rdynamic + ;; + +- cygwin* | mingw* | pw32*) ++ cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is +@@ -8996,7 +9227,11 @@ if test -z "$aix_libpath"; then aix_libp + whole_archive_flag_spec='' + link_all_deplibs=yes + allow_undefined_flag="$_lt_dar_allow_undefined" +- if test "$GCC" = "yes"; then ++ case $cc_basename in ++ ifort*) _lt_dar_can_shared=yes ;; ++ *) _lt_dar_can_shared=$GCC ;; ++ esac ++ if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=echo + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +@@ -9088,7 +9323,7 @@ if test -z "$aix_libpath"; then aix_libp + archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) +- archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +@@ -9146,27 +9381,31 @@ 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>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 + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + + else +- 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 + LDFLAGS="$save_LDFLAGS" +@@ -9424,8 +9663,8 @@ rm -f core conftest.err conftest.$ac_obj + fi + 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 + + with_gnu_ld=$with_gnu_ld +@@ -9461,15 +9700,15 @@ x|xyes) + # 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 +@@ -9487,7 +9726,7 @@ echo $ECHO_N "checking whether -lc shoul + 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 +@@ -9499,8 +9738,8 @@ echo $ECHO_N "checking whether -lc shoul + 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 +@@ -9663,8 +9902,8 @@ 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; } + + if test "$GCC" = yes; then + case $host_os in +@@ -9826,14 +10065,14 @@ bsdi[45]*) + # libtool to hard-code these into programs + ;; + +-cygwin* | mingw* | pw32*) ++cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + + case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32*) ++ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ +@@ -9856,7 +10095,7 @@ cygwin* | mingw* | pw32*) + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; +- mingw*) ++ mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +@@ -10106,29 +10345,33 @@ 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>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 + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then + shlibpath_overrides_runpath=yes + 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 + LDFLAGS=$save_LDFLAGS +@@ -10337,7 +10580,7 @@ tpf*) + version_type=linux + need_lib_prefix=no + need_version=no +- library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +@@ -10354,8 +10597,8 @@ uts4*) + 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" +@@ -10456,8 +10699,8 @@ 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" || +@@ -10481,8 +10724,8 @@ else + # 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 || + test "$inherit_rpath" = yes; then +@@ -10514,7 +10757,7 @@ else + lt_cv_dlopen_self=yes + ;; + +- mingw* | pw32*) ++ mingw* | pw32* | cegcc*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; +@@ -10526,10 +10769,10 @@ else + + 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" +@@ -10561,33 +10804,37 @@ 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>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 + +@@ -10600,10 +10847,10 @@ fi + ;; + + *) +- { 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. */ +@@ -10656,38 +10903,42 @@ 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>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" +@@ -10719,39 +10970,43 @@ 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>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="-ldld" + 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. */ +@@ -10804,38 +11059,42 @@ 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>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" +@@ -10867,39 +11126,43 @@ 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>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" +@@ -10931,39 +11194,43 @@ 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>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" +@@ -10995,33 +11262,37 @@ 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>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="-ldld" + fi + +@@ -11060,10 +11331,10 @@ fi + 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 +@@ -11071,7 +11342,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11074 "configure" ++#line 11345 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11112,10 +11383,6 @@ else + # endif + #endif + +-#ifdef __cplusplus +-extern "C" void exit (int); +-#endif +- + void fnord() { int i=42;} + int main () + { +@@ -11131,13 +11398,13 @@ int main () + else + puts (dlerror ()); + +- exit (status); ++ return status; + } + _LT_EOF + 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=$? +@@ -11155,15 +11422,15 @@ rm -fr conftest* + + + 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 +@@ -11171,7 +11438,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11174 "configure" ++#line 11441 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11212,10 +11479,6 @@ else + # endif + #endif + +-#ifdef __cplusplus +-extern "C" void exit (int); +-#endif +- + void fnord() { int i=42;} + int main () + { +@@ -11231,13 +11494,13 @@ int main () + else + puts (dlerror ()); + +- exit (status); ++ return status; + } + _LT_EOF + 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=$? +@@ -11255,8 +11518,8 @@ rm -fr conftest* + + + 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" +@@ -11294,13 +11557,13 @@ fi + + 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 +@@ -11308,16 +11571,16 @@ else + 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 +@@ -11334,13 +11597,13 @@ fi + + + # 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 +@@ -11360,15 +11623,15 @@ echo $ECHO_N "checking whether to build + 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; } + + + +@@ -11409,8 +11672,8 @@ CC="$lt_save_CC" + + if test -n "$PYTHON"; then + # If the user set $PYTHON, use it and don't search something else. +- { echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.3.5" >&5 +-echo $ECHO_N "checking whether $PYTHON version >= 2.3.5... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.3.5" >&5 ++$as_echo_n "checking whether $PYTHON version >= 2.3.5... " >&6; } + prog="import sys, string + # split strings by '.' and convert to numeric. Append some zeros + # because we need at least 4 digits for the hex conversion. +@@ -11423,11 +11686,11 @@ sys.exit(sys.hexversion < minverhex)" + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; 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: error: too old" >&5 +-echo "$as_me: error: too old" >&2;} ++ { { $as_echo "$as_me:$LINENO: error: too old" >&5 ++$as_echo "$as_me: error: too old" >&2;} + { (exit 1); exit 1; }; } + fi + +@@ -11435,10 +11698,10 @@ fi + else + # Otherwise, try each interpreter until we find one that satisfies + # VERSION. +- { echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.3.5" >&5 +-echo $ECHO_N "checking for a Python interpreter with version >= 2.3.5... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.3.5" >&5 ++$as_echo_n "checking for a Python interpreter with version >= 2.3.5... " >&6; } + if test "${am_cv_pathless_PYTHON+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + + for am_cv_pathless_PYTHON in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do +@@ -11460,18 +11723,18 @@ fi + + done + fi +-{ echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5 +-echo "${ECHO_T}$am_cv_pathless_PYTHON" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5 ++$as_echo "$am_cv_pathless_PYTHON" >&6; } + # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. + if test "$am_cv_pathless_PYTHON" = none; then + PYTHON=: + else + # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args. + set dummy $am_cv_pathless_PYTHON; 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_PYTHON+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case $PYTHON in + [\\/]* | ?:[\\/]*) +@@ -11486,7 +11749,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PYTHON="$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 +@@ -11498,11 +11761,11 @@ esac + fi + PYTHON=$ac_cv_path_PYTHON + if test -n "$PYTHON"; then +- { echo "$as_me:$LINENO: result: $PYTHON" >&5 +-echo "${ECHO_T}$PYTHON" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5 ++$as_echo "$PYTHON" >&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 + + +@@ -11512,21 +11775,21 @@ fi + + + if test "$PYTHON" = :; then +- { { echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5 +-echo "$as_me: error: no suitable Python interpreter found" >&2;} ++ { { $as_echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5 ++$as_echo "$as_me: error: no suitable Python interpreter found" >&2;} + { (exit 1); exit 1; }; } + else + + +- { echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5 +-echo $ECHO_N "checking for $am_display_PYTHON version... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5 ++$as_echo_n "checking for $am_display_PYTHON version... " >&6; } + if test "${am_cv_python_version+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"` + fi +-{ echo "$as_me:$LINENO: result: $am_cv_python_version" >&5 +-echo "${ECHO_T}$am_cv_python_version" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $am_cv_python_version" >&5 ++$as_echo "$am_cv_python_version" >&6; } + PYTHON_VERSION=$am_cv_python_version + + +@@ -11537,30 +11800,30 @@ echo "${ECHO_T}$am_cv_python_version" >& + + + +- { echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5 +-echo $ECHO_N "checking for $am_display_PYTHON platform... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5 ++$as_echo_n "checking for $am_display_PYTHON platform... " >&6; } + if test "${am_cv_python_platform+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"` + fi +-{ echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5 +-echo "${ECHO_T}$am_cv_python_platform" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5 ++$as_echo "$am_cv_python_platform" >&6; } + PYTHON_PLATFORM=$am_cv_python_platform + + + + +- { echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5 +-echo $ECHO_N "checking for $am_display_PYTHON script directory... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5 ++$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } + if test "${am_cv_python_pythondir+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null || + echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + fi +-{ echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5 +-echo "${ECHO_T}$am_cv_python_pythondir" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5 ++$as_echo "$am_cv_python_pythondir" >&6; } + pythondir=$am_cv_python_pythondir + + +@@ -11568,16 +11831,16 @@ echo "${ECHO_T}$am_cv_python_pythondir" + pkgpythondir=\${pythondir}/$PACKAGE + + +- { echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5 +-echo $ECHO_N "checking for $am_display_PYTHON extension module directory... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5 ++$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; } + if test "${am_cv_python_pyexecdir+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null || + echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"` + fi +-{ echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5 +-echo "${ECHO_T}$am_cv_python_pyexecdir" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5 ++$as_echo "$am_cv_python_pyexecdir" >&6; } + pyexecdir=$am_cv_python_pyexecdir + + +@@ -11591,8 +11854,8 @@ echo "${ECHO_T}$am_cv_python_pyexecdir" + + + +-{ echo "$as_me:$LINENO: checking for headers required to compile python extensions" >&5 +-echo $ECHO_N "checking for headers required to compile python extensions... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for headers required to compile python extensions" >&5 ++$as_echo_n "checking for headers required to compile python extensions... " >&6; } + py_prefix=`$PYTHON -c "import sys; print sys.prefix"` + py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` + if test -x "$PYTHON-config"; then +@@ -11619,28 +11882,29 @@ 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_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 +- { echo "$as_me:$LINENO: result: found" >&5 +-echo "${ECHO_T}found" >&6; } ++ { $as_echo "$as_me:$LINENO: result: found" >&5 ++$as_echo "found" >&6; } + + 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: not found" >&5 +-echo "${ECHO_T}not found" >&6; } +-{ { echo "$as_me:$LINENO: error: could not find Python headers" >&5 +-echo "$as_me: error: could not find Python headers" >&2;} ++ { $as_echo "$as_me:$LINENO: result: not found" >&5 ++$as_echo "not found" >&6; } ++{ { $as_echo "$as_me:$LINENO: error: could not find Python headers" >&5 ++$as_echo "$as_me: error: could not find Python headers" >&2;} + { (exit 1); exit 1; }; } + fi + +@@ -11648,8 +11912,8 @@ rm -f conftest.err conftest.$ac_ext + CPPFLAGS="$save_CPPFLAGS" + + +-{ echo "$as_me:$LINENO: checking for PySignal_SetWakeupFd in Python.h" >&5 +-echo $ECHO_N "checking for PySignal_SetWakeupFd in Python.h... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for PySignal_SetWakeupFd in Python.h" >&5 ++$as_echo_n "checking for PySignal_SetWakeupFd in Python.h... " >&6; } + py_prefix=`$PYTHON -c "import sys; print sys.prefix"` + old_CPPFLAGS=$CPPFLAGS + CPPFLAGS="-Wall -Werror $PYTHON_INCLUDES" +@@ -11674,28 +11938,29 @@ 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_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 + setwakeupfd_ok=yes + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + setwakeupfd_ok=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ echo "$as_me:$LINENO: result: $setwakeupfd_ok" >&5 +-echo "${ECHO_T}$setwakeupfd_ok" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $setwakeupfd_ok" >&5 ++$as_echo "$setwakeupfd_ok" >&6; } + if test "x$setwakeupfd_ok" != xno; then + + cat >>confdefs.h <<\_ACEOF +@@ -11715,10 +11980,10 @@ fi + + + py_mod_var=`echo thread'_' | sed 'y%./+-%__p_%'` +-{ echo "$as_me:$LINENO: checking for python module thread" >&5 +-echo $ECHO_N "checking for python module thread... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for python module thread" >&5 ++$as_echo_n "checking for python module thread... " >&6; } + if { as_var=py_cv_mod_$py_mod_var; eval "test \"\${$as_var+set}\" = set"; }; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + + prog=" +@@ -11741,11 +12006,11 @@ fi + + py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"` + if test "x$py_val" != xno; 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; } + enable_thread=no + fi + +@@ -11760,10 +12025,10 @@ fi + if test "${enable_docs}" != no; then + # Extract the first word of "xsltproc", so it can be a program name with args. + set dummy xsltproc; 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_XSLTPROC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 + else + case $XSLTPROC in + [\\/]* | ?:[\\/]*) +@@ -11778,7 +12043,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext" +- 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 +@@ -11790,11 +12055,11 @@ esac + fi + XSLTPROC=$ac_cv_path_XSLTPROC + if test -n "$XSLTPROC"; then +- { echo "$as_me:$LINENO: result: $XSLTPROC" >&5 +-echo "${ECHO_T}$XSLTPROC" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $XSLTPROC" >&5 ++$as_echo "$XSLTPROC" >&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 + + +@@ -11803,9 +12068,7 @@ fi + fi + fi + +- +- +-if test x$enable_docs != xno; then ++ if test x$enable_docs != xno; then + ENABLE_DOCS_TRUE= + ENABLE_DOCS_FALSE='#' + else +@@ -11814,18 +12077,18 @@ else + fi + + +-{ echo "$as_me:$LINENO: checking whether to enable threading in pygtk" >&5 +-echo $ECHO_N "checking whether to enable threading in pygtk... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking whether to enable threading in pygtk" >&5 ++$as_echo_n "checking whether to enable threading in pygtk... " >&6; } + if test "x$enable_thread" != xno; then + extra_mods=gthread + THREADING_CFLAGS= +- { 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 + extra_mods= + THREADING_CFLAGS="-DDISABLE_THREADING" +- { 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 + + CPPFLAGS="${CPPFLAGS} $THREADING_CFLAGS" +@@ -11868,10 +12131,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != + 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 + [\\/]* | ?:[\\/]*) +@@ -11886,7 +12149,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" +- 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 +@@ -11898,11 +12161,11 @@ esac + 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 + + +@@ -11911,10 +12174,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the + 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 + [\\/]* | ?:[\\/]*) +@@ -11929,7 +12192,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" +- 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 +@@ -11941,11 +12204,11 @@ esac + 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 +@@ -11953,12 +12216,8 @@ fi + 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 +@@ -11970,14 +12229,14 @@ fi + fi + if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.16 +- { 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 + +@@ -11991,8 +12250,8 @@ fi + fi + + min_glib_version=2.8.0 +- { echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5 +-echo $ECHO_N "checking for GLIB - version >= $min_glib_version... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5 ++$as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; } + + if test x$PKG_CONFIG != xno ; then + ## don't try to run the test against uninstalled libtool libs +@@ -12046,8 +12305,9 @@ main () + { + int major, minor, micro; + char *tmp_version; ++ int ignored; + +- system ("touch conf.glibtest"); ++ ignored = system ("touch conf.glibtest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = g_strdup("$min_glib_version"); +@@ -12115,29 +12375,32 @@ 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); } && { 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 ) + no_glib=yes + 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 + +@@ -12147,12 +12410,12 @@ fi + fi + fi + if test "x$no_glib" = x ; then +- { echo "$as_me:$LINENO: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5 +-echo "${ECHO_T}yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; } ++ { $as_echo "$as_me:$LINENO: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5 ++$as_echo "yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&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; } + if test "$PKG_CONFIG" = "no" ; then + echo "*** A new enough version of pkg-config was not found." + echo "*** See http://www.freedesktop.org/software/pkgconfig/" +@@ -12189,18 +12452,21 @@ 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>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 + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GLIB or finding the wrong" + echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" +@@ -12211,13 +12477,14 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means GLIB is incorrectly installed." + fi + ++rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + CFLAGS="$ac_save_CFLAGS" +@@ -12229,8 +12496,8 @@ rm -f core conftest.err conftest.$ac_obj + GLIB_GENMARSHAL="" + GOBJECT_QUERY="" + GLIB_MKENUMS="" +- { { echo "$as_me:$LINENO: error: gobject is required to build pygtk?" >&5 +-echo "$as_me: error: gobject is required to build pygtk?" >&2;} ++ { { $as_echo "$as_me:$LINENO: error: gobject is required to build pygtk?" >&5 ++$as_echo "$as_me: error: gobject is required to build pygtk?" >&2;} + { (exit 1); exit 1; }; } + fi + +@@ -12246,18 +12513,18 @@ fi + + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for PYGOBJECT" >&5 +-echo $ECHO_N "checking for PYGOBJECT... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for PYGOBJECT" >&5 ++$as_echo_n "checking for PYGOBJECT... " >&6; } + + if test -n "$PKG_CONFIG"; then + if test -n "$PYGOBJECT_CFLAGS"; then + pkg_cv_PYGOBJECT_CFLAGS="$PYGOBJECT_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pygobject-2.0 >= 2.14.0\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pygobject-2.0 >= 2.14.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "pygobject-2.0 >= 2.14.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_PYGOBJECT_CFLAGS=`$PKG_CONFIG --cflags "pygobject-2.0 >= 2.14.0" 2>/dev/null` + else +@@ -12272,10 +12539,10 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_PYGOBJECT_LIBS="$PYGOBJECT_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pygobject-2.0 >= 2.14.0\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pygobject-2.0 >= 2.14.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "pygobject-2.0 >= 2.14.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_PYGOBJECT_LIBS=`$PKG_CONFIG --libs "pygobject-2.0 >= 2.14.0" 2>/dev/null` + else +@@ -12303,7 +12570,7 @@ fi + # Put the nasty error message in config.log where it belongs + echo "$PYGOBJECT_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (pygobject-2.0 >= 2.14.0) were not met: ++ { { $as_echo "$as_me:$LINENO: error: Package requirements (pygobject-2.0 >= 2.14.0) were not met: + + $PYGOBJECT_PKG_ERRORS + +@@ -12314,7 +12581,7 @@ Alternatively, you may set the environme + and PYGOBJECT_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 (pygobject-2.0 >= 2.14.0) were not met: ++$as_echo "$as_me: error: Package requirements (pygobject-2.0 >= 2.14.0) were not met: + + $PYGOBJECT_PKG_ERRORS + +@@ -12327,7 +12594,9 @@ See the pkg-config man page for more det + " >&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. + +@@ -12337,7 +12606,7 @@ See the pkg-config man page for more det + + 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. + +@@ -12347,12 +12616,12 @@ See the pkg-config man page for more det + + To get pkg-config, see . + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { (exit 1); exit 1; }; }; } + else + PYGOBJECT_CFLAGS=$pkg_cv_PYGOBJECT_CFLAGS + PYGOBJECT_LIBS=$pkg_cv_PYGOBJECT_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 + +@@ -12370,18 +12639,18 @@ PYGOBJECT_PYGDOCS="`$PKG_CONFIG --variab + + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for ATK" >&5 +-echo $ECHO_N "checking for ATK... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for ATK" >&5 ++$as_echo_n "checking for ATK... " >&6; } + + if test -n "$PKG_CONFIG"; then + if test -n "$ATK_CFLAGS"; then + pkg_cv_ATK_CFLAGS="$ATK_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"atk >= 1.12.0\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"atk >= 1.12.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "atk >= 1.12.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_ATK_CFLAGS=`$PKG_CONFIG --cflags "atk >= 1.12.0" 2>/dev/null` + else +@@ -12396,10 +12665,10 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_ATK_LIBS="$ATK_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"atk >= 1.12.0\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"atk >= 1.12.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "atk >= 1.12.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_ATK_LIBS=`$PKG_CONFIG --libs "atk >= 1.12.0" 2>/dev/null` + else +@@ -12427,23 +12696,21 @@ fi + # Put the nasty error message in config.log where it belongs + echo "$ATK_PKG_ERRORS" >&5 + +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + have_atk=false + elif test $pkg_failed = untried; then + have_atk=false + else + ATK_CFLAGS=$pkg_cv_ATK_CFLAGS + ATK_LIBS=$pkg_cv_ATK_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; } + have_atk=true + fi + + +- +- +-if $have_atk; then ++ if $have_atk; then + BUILD_ATK_TRUE= + BUILD_ATK_FALSE='#' + else +@@ -12457,18 +12724,18 @@ fi + + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for PANGO" >&5 +-echo $ECHO_N "checking for PANGO... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for PANGO" >&5 ++$as_echo_n "checking for PANGO... " >&6; } + + if test -n "$PKG_CONFIG"; then + if test -n "$PANGO_CFLAGS"; then + pkg_cv_PANGO_CFLAGS="$PANGO_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= 1.16.0\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= 1.16.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "pango >= 1.16.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_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.16.0" 2>/dev/null` + else +@@ -12483,10 +12750,10 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_PANGO_LIBS="$PANGO_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= 1.16.0\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= 1.16.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "pango >= 1.16.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_PANGO_LIBS=`$PKG_CONFIG --libs "pango >= 1.16.0" 2>/dev/null` + else +@@ -12514,23 +12781,21 @@ fi + # Put the nasty error message in config.log where it belongs + echo "$PANGO_PKG_ERRORS" >&5 + +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + have_pango=false + elif test $pkg_failed = untried; then + have_pango=false + else + PANGO_CFLAGS=$pkg_cv_PANGO_CFLAGS + PANGO_LIBS=$pkg_cv_PANGO_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; } + have_pango=true + fi + + +- +- +-if $have_pango; then ++ if $have_pango; then + BUILD_PANGO_TRUE= + BUILD_PANGO_FALSE='#' + else +@@ -12544,17 +12809,17 @@ fi + + + +-{ echo "$as_me:$LINENO: checking for codegen" >&5 +-echo $ECHO_N "checking for codegen... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for codegen" >&5 ++$as_echo_n "checking for codegen... " >&6; } + CODEGENDIR=`$PKG_CONFIG --variable codegendir pygobject-2.0` + + if test -z $CODEGENDIR; then +- { { echo "$as_me:$LINENO: error: unable to find PyGObject codegen" >&5 +-echo "$as_me: error: unable to find PyGObject codegen" >&2;} ++ { { $as_echo "$as_me:$LINENO: error: unable to find PyGObject codegen" >&5 ++$as_echo "$as_me: error: unable to find PyGObject codegen" >&2;} + { (exit 1); exit 1; }; } + else +- { echo "$as_me:$LINENO: result: $CODEGENDIR" >&5 +-echo "${ECHO_T}$CODEGENDIR" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $CODEGENDIR" >&5 ++$as_echo "$CODEGENDIR" >&6; } + fi + + PYGTK_CODEGEN_DEFINES="" +@@ -12563,18 +12828,18 @@ PYGTK_CODEGEN_DEFINES="" + gtk_version="" + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for PYCAIRO" >&5 +-echo $ECHO_N "checking for PYCAIRO... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for PYCAIRO" >&5 ++$as_echo_n "checking for PYCAIRO... " >&6; } + + if test -n "$PKG_CONFIG"; then + if test -n "$PYCAIRO_CFLAGS"; then + pkg_cv_PYCAIRO_CFLAGS="$PYCAIRO_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pycairo >= 1.0.2\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pycairo >= 1.0.2\"") >&5 + ($PKG_CONFIG --exists --print-errors "pycairo >= 1.0.2") 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_PYCAIRO_CFLAGS=`$PKG_CONFIG --cflags "pycairo >= 1.0.2" 2>/dev/null` + else +@@ -12589,10 +12854,10 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_PYCAIRO_LIBS="$PYCAIRO_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pycairo >= 1.0.2\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pycairo >= 1.0.2\"") >&5 + ($PKG_CONFIG --exists --print-errors "pycairo >= 1.0.2") 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_PYCAIRO_LIBS=`$PKG_CONFIG --libs "pycairo >= 1.0.2" 2>/dev/null` + else +@@ -12620,16 +12885,16 @@ fi + # Put the nasty error message in config.log where it belongs + echo "$PYCAIRO_PKG_ERRORS" >&5 + +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + have_pycairo=false + elif test $pkg_failed = untried; then + have_pycairo=false + else + PYCAIRO_CFLAGS=$pkg_cv_PYCAIRO_CFLAGS + PYCAIRO_LIBS=$pkg_cv_PYCAIRO_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; } + have_pycairo=true + fi + +@@ -12660,20 +12925,20 @@ _ACEOF + + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for PANGOCAIRO" >&5 +-echo $ECHO_N "checking for PANGOCAIRO... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for PANGOCAIRO" >&5 ++$as_echo_n "checking for PANGOCAIRO... " >&6; } + + if test -n "$PKG_CONFIG"; then + if test -n "$PANGOCAIRO_CFLAGS"; then + pkg_cv_PANGOCAIRO_CFLAGS="$PANGOCAIRO_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pangocairo >= 1.16.0, ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pangocairo >= 1.16.0, + pycairo >= 1.0.2\"") >&5 + ($PKG_CONFIG --exists --print-errors "pangocairo >= 1.16.0, + pycairo >= 1.0.2") 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_PANGOCAIRO_CFLAGS=`$PKG_CONFIG --cflags "pangocairo >= 1.16.0, + pycairo >= 1.0.2" 2>/dev/null` +@@ -12689,12 +12954,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_PANGOCAIRO_LIBS="$PANGOCAIRO_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pangocairo >= 1.16.0, ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pangocairo >= 1.16.0, + pycairo >= 1.0.2\"") >&5 + ($PKG_CONFIG --exists --print-errors "pangocairo >= 1.16.0, + pycairo >= 1.0.2") 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_PANGOCAIRO_LIBS=`$PKG_CONFIG --libs "pangocairo >= 1.16.0, + pycairo >= 1.0.2" 2>/dev/null` +@@ -12725,28 +12990,26 @@ fi + # Put the nasty error message in config.log where it belongs + echo "$PANGOCAIRO_PKG_ERRORS" >&5 + +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + have_pangocairo=false + elif test $pkg_failed = untried; then + have_pangocairo=false + else + PANGOCAIRO_CFLAGS=$pkg_cv_PANGOCAIRO_CFLAGS + PANGOCAIRO_LIBS=$pkg_cv_PANGOCAIRO_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; } + have_pangocairo=true + fi + if test ! $have_pangocairo + then +- { 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 $have_pangocairo; then ++ if $have_pangocairo; then + BUILD_PANGOCAIRO_TRUE= + BUILD_PANGOCAIRO_FALSE='#' + else +@@ -12761,18 +13024,18 @@ fi + + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for GTK" >&5 +-echo $ECHO_N "checking for GTK... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for GTK" >&5 ++$as_echo_n "checking for GTK... " >&6; } + + if test -n "$PKG_CONFIG"; then + if test -n "$GTK_CFLAGS"; then + pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.8.0\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.8.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.8.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_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.8.0" 2>/dev/null` + else +@@ -12787,10 +13050,10 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_GTK_LIBS="$GTK_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.8.0\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.8.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.8.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_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.8.0" 2>/dev/null` + else +@@ -12818,28 +13081,26 @@ fi + # Put the nasty error message in config.log where it belongs + echo "$GTK_PKG_ERRORS" >&5 + +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + HAVE_GTK="no" + elif test $pkg_failed = untried; then + HAVE_GTK="no" + else + GTK_CFLAGS=$pkg_cv_GTK_CFLAGS + GTK_LIBS=$pkg_cv_GTK_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; } + HAVE_GTK="yes" + fi + if test "x$HAVE_GTK" = "xyes"; then + have_gtk=true + else + have_gtk=false +- { 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 $have_gtk; then ++ if $have_gtk; then + BUILD_GTK_TRUE= + BUILD_GTK_FALSE='#' + else +@@ -12855,18 +13116,18 @@ fi + + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for GTK210" >&5 +-echo $ECHO_N "checking for GTK210... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for GTK210" >&5 ++$as_echo_n "checking for GTK210... " >&6; } + + if test -n "$PKG_CONFIG"; then + if test -n "$GTK210_CFLAGS"; then + pkg_cv_GTK210_CFLAGS="$GTK210_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.10.0\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.10.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.10.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_GTK210_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.10.0" 2>/dev/null` + else +@@ -12881,10 +13142,10 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_GTK210_LIBS="$GTK210_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.10.0\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.10.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.10.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_GTK210_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.10.0" 2>/dev/null` + else +@@ -12912,31 +13173,29 @@ fi + # Put the nasty error message in config.log where it belongs + echo "$GTK210_PKG_ERRORS" >&5 + +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + HAVE_GTK_210="no" + elif test $pkg_failed = untried; then + HAVE_GTK_210="no" + else + GTK210_CFLAGS=$pkg_cv_GTK210_CFLAGS + GTK210_LIBS=$pkg_cv_GTK210_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; } + HAVE_GTK_210="yes" + fi + if test "x$HAVE_GTK_210" = "xyes"; then + gtk_version="2.10" + have_gtk_210=true + 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; } + gtk_version="2.8" + have_gtk_210=false + fi + +- +- +-if $have_gtk_210; then ++ if $have_gtk_210; then + HAVE_GTK_2_10_TRUE= + HAVE_GTK_2_10_FALSE='#' + else +@@ -12953,18 +13212,18 @@ _ACEOF + + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for GTK212" >&5 +-echo $ECHO_N "checking for GTK212... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for GTK212" >&5 ++$as_echo_n "checking for GTK212... " >&6; } + + if test -n "$PKG_CONFIG"; then + if test -n "$GTK212_CFLAGS"; then + pkg_cv_GTK212_CFLAGS="$GTK212_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.11.6\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.11.6\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.11.6") 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_GTK212_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.11.6" 2>/dev/null` + else +@@ -12979,10 +13238,10 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_GTK212_LIBS="$GTK212_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.11.6\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.11.6\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.11.6") 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_GTK212_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.11.6" 2>/dev/null` + else +@@ -13010,16 +13269,16 @@ fi + # Put the nasty error message in config.log where it belongs + echo "$GTK212_PKG_ERRORS" >&5 + +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + HAVE_GTK_212="no" + elif test $pkg_failed = untried; then + HAVE_GTK_212="no" + else + GTK212_CFLAGS=$pkg_cv_GTK212_CFLAGS + GTK212_LIBS=$pkg_cv_GTK212_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; } + HAVE_GTK_212="yes" + fi + +@@ -13028,14 +13287,12 @@ fi + have_gtk_212=true + PYGTK_CODEGEN_DEFINES="$PYGTK_CODEGEN_DEFINES -DHAVE_GTK_2_12" + 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; } + have_gtk_212=false + fi + +- +- +-if $have_gtk_212; then ++ if $have_gtk_212; then + HAVE_GTK_2_12_TRUE= + HAVE_GTK_2_12_FALSE='#' + else +@@ -13052,20 +13309,20 @@ _ACEOF + + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for GTK214" >&5 +-echo $ECHO_N "checking for GTK214... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for GTK214" >&5 ++$as_echo_n "checking for GTK214... " >&6; } + + if test -n "$PKG_CONFIG"; then + if test -n "$GTK214_CFLAGS"; then + pkg_cv_GTK214_CFLAGS="$GTK214_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.13.6, ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.13.6, + pygobject-2.0 >= 2.15.3\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.13.6, + pygobject-2.0 >= 2.15.3") 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_GTK214_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.13.6, + pygobject-2.0 >= 2.15.3" 2>/dev/null` +@@ -13081,12 +13338,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_GTK214_LIBS="$GTK214_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.13.6, ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.13.6, + pygobject-2.0 >= 2.15.3\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.13.6, + pygobject-2.0 >= 2.15.3") 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_GTK214_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.13.6, + pygobject-2.0 >= 2.15.3" 2>/dev/null` +@@ -13117,16 +13374,16 @@ fi + # Put the nasty error message in config.log where it belongs + echo "$GTK214_PKG_ERRORS" >&5 + +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + HAVE_GTK_214="no" + elif test $pkg_failed = untried; then + HAVE_GTK_214="no" + else + GTK214_CFLAGS=$pkg_cv_GTK214_CFLAGS + GTK214_LIBS=$pkg_cv_GTK214_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; } + HAVE_GTK_214="yes" + fi + +@@ -13135,14 +13392,12 @@ fi + have_gtk_214=true + PYGTK_CODEGEN_DEFINES="$PYGTK_CODEGEN_DEFINES -DHAVE_GTK_2_14" + 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; } + have_gtk_214=false + fi + +- +- +-if $have_gtk_214; then ++ if $have_gtk_214; then + HAVE_GTK_2_14_TRUE= + HAVE_GTK_2_14_FALSE='#' + else +@@ -13159,18 +13414,18 @@ _ACEOF + + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for LIBGLADE" >&5 +-echo $ECHO_N "checking for LIBGLADE... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for LIBGLADE" >&5 ++$as_echo_n "checking for LIBGLADE... " >&6; } + + if test -n "$PKG_CONFIG"; then + if test -n "$LIBGLADE_CFLAGS"; then + pkg_cv_LIBGLADE_CFLAGS="$LIBGLADE_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libglade-2.0 >= 2.5.0\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libglade-2.0 >= 2.5.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "libglade-2.0 >= 2.5.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_LIBGLADE_CFLAGS=`$PKG_CONFIG --cflags "libglade-2.0 >= 2.5.0" 2>/dev/null` + else +@@ -13185,10 +13440,10 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_LIBGLADE_LIBS="$LIBGLADE_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libglade-2.0 >= 2.5.0\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libglade-2.0 >= 2.5.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "libglade-2.0 >= 2.5.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_LIBGLADE_LIBS=`$PKG_CONFIG --libs "libglade-2.0 >= 2.5.0" 2>/dev/null` + else +@@ -13216,23 +13471,21 @@ fi + # Put the nasty error message in config.log where it belongs + echo "$LIBGLADE_PKG_ERRORS" >&5 + +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + have_libglade=false + elif test $pkg_failed = untried; then + have_libglade=false + else + LIBGLADE_CFLAGS=$pkg_cv_LIBGLADE_CFLAGS + LIBGLADE_LIBS=$pkg_cv_LIBGLADE_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; } + have_libglade=true + fi + + +- +- +-if $have_libglade; then ++ if $have_libglade; then + BUILD_LIBGLADE_TRUE= + BUILD_LIBGLADE_FALSE='#' + else +@@ -13246,18 +13499,18 @@ fi + + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for GTKUNIXPRINT" >&5 +-echo $ECHO_N "checking for GTKUNIXPRINT... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for GTKUNIXPRINT" >&5 ++$as_echo_n "checking for GTKUNIXPRINT... " >&6; } + + if test -n "$PKG_CONFIG"; then + if test -n "$GTKUNIXPRINT_CFLAGS"; then + pkg_cv_GTKUNIXPRINT_CFLAGS="$GTKUNIXPRINT_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-unix-print-2.0 >= 2.9.0\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-unix-print-2.0 >= 2.9.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-unix-print-2.0 >= 2.9.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_GTKUNIXPRINT_CFLAGS=`$PKG_CONFIG --cflags "gtk+-unix-print-2.0 >= 2.9.0" 2>/dev/null` + else +@@ -13272,10 +13525,10 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_GTKUNIXPRINT_LIBS="$GTKUNIXPRINT_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-unix-print-2.0 >= 2.9.0\"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-unix-print-2.0 >= 2.9.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-unix-print-2.0 >= 2.9.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_GTKUNIXPRINT_LIBS=`$PKG_CONFIG --libs "gtk+-unix-print-2.0 >= 2.9.0" 2>/dev/null` + else +@@ -13303,23 +13556,21 @@ fi + # Put the nasty error message in config.log where it belongs + echo "$GTKUNIXPRINT_PKG_ERRORS" >&5 + +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + have_gtkunixprint=false + elif test $pkg_failed = untried; then + have_gtkunixprint=false + else + GTKUNIXPRINT_CFLAGS=$pkg_cv_GTKUNIXPRINT_CFLAGS + GTKUNIXPRINT_LIBS=$pkg_cv_GTKUNIXPRINT_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; } + have_gtkunixprint=true + fi + + +- +- +-if $have_gtkunixprint; then ++ if $have_gtkunixprint; then + BUILD_GTKUNIXPRINT_TRUE= + BUILD_GTKUNIXPRINT_FALSE='#' + else +@@ -13332,13 +13583,11 @@ fi + fi + + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +- { echo "$as_me:$LINENO: result: not checking for gtk due to missing pycairo" >&5 +-echo "${ECHO_T}not checking for gtk due to missing pycairo" >&6; } +- +- +-if false; then ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: not checking for gtk due to missing pycairo" >&5 ++$as_echo "not checking for gtk due to missing pycairo" >&6; } ++ if false; then + BUILD_PANGOCAIRO_TRUE= + BUILD_PANGOCAIRO_FALSE='#' + else +@@ -13346,9 +13595,7 @@ else + BUILD_PANGOCAIRO_FALSE= + fi + +- +- +-if false; then ++ if false; then + BUILD_GTK_TRUE= + BUILD_GTK_FALSE='#' + else +@@ -13356,9 +13603,7 @@ else + BUILD_GTK_FALSE= + fi + +- +- +-if false; then ++ if false; then + HAVE_GTK_2_10_TRUE= + HAVE_GTK_2_10_FALSE='#' + else +@@ -13366,9 +13611,7 @@ else + HAVE_GTK_2_10_FALSE= + fi + +- +- +-if false; then ++ if false; then + HAVE_GTK_2_12_TRUE= + HAVE_GTK_2_12_FALSE='#' + else +@@ -13376,9 +13619,7 @@ else + HAVE_GTK_2_12_FALSE= + fi + +- +- +-if false; then ++ if false; then + HAVE_GTK_2_14_TRUE= + HAVE_GTK_2_14_FALSE='#' + else +@@ -13386,9 +13627,7 @@ else + HAVE_GTK_2_14_FALSE= + fi + +- +- +-if false; then ++ if false; then + BUILD_LIBGLADE_TRUE= + BUILD_LIBGLADE_FALSE='#' + else +@@ -13396,9 +13635,7 @@ else + BUILD_LIBGLADE_FALSE= + fi + +- +- +-if false; then ++ if false; then + BUILD_GTKUNIXPRINT_TRUE= + BUILD_GTKUNIXPRINT_FALSE='#' + else +@@ -13412,17 +13649,17 @@ fi + have_gtkunixprint=false + fi + +-{ echo "$as_me:$LINENO: checking for GDK target" >&5 +-echo $ECHO_N "checking for GDK target... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for GDK target" >&5 ++$as_echo_n "checking for GDK target... " >&6; } + gdk_target=`$PKG_CONFIG --variable target gdk-2.0` + if test -z $gdk_target; then +- { echo "$as_me:$LINENO: result: (unknown)" >&5 +-echo "${ECHO_T}(unknown)" >&6; } +- { echo "$as_me:$LINENO: WARNING: unable to determine the GDK target system; some functions may not be available" >&5 +-echo "$as_me: WARNING: unable to determine the GDK target system; some functions may not be available" >&2;} ++ { $as_echo "$as_me:$LINENO: result: (unknown)" >&5 ++$as_echo "(unknown)" >&6; } ++ { $as_echo "$as_me:$LINENO: WARNING: unable to determine the GDK target system; some functions may not be available" >&5 ++$as_echo "$as_me: WARNING: unable to determine the GDK target system; some functions may not be available" >&2;} + else +- { echo "$as_me:$LINENO: result: $gdk_target" >&5 +-echo "${ECHO_T}$gdk_target" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $gdk_target" >&5 ++$as_echo "$gdk_target" >&6; } + fi + + case $gdk_target in +@@ -13441,11 +13678,12 @@ fi + + if test "x$enable_numpy" != xno; then + save_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" +- { echo "$as_me:$LINENO: checking for Numeric/arrayobject.h" >&5 +-echo $ECHO_N "checking for Numeric/arrayobject.h... $ECHO_C" >&6; } +-if test "${ac_cv_header_Numeric_arrayobject_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ numpy_INCLUDES=`$PYTHON -c "import numpy; print numpy.get_include()"` ++ CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES -I$numpy_INCLUDES" ++ { $as_echo "$as_me:$LINENO: checking for numpy/arrayobject.h" >&5 ++$as_echo_n "checking for numpy/arrayobject.h... " >&6; } ++if test "${ac_cv_header_numpy_arrayobject_h+set}" = set; then ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -13455,7 +13693,7 @@ cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include + +-#include ++#include + _ACEOF + rm -f conftest.$ac_objext + if { (ac_try="$ac_compile" +@@ -13463,39 +13701,40 @@ 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_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_Numeric_arrayobject_h=yes ++ ac_cv_header_numpy_arrayobject_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_Numeric_arrayobject_h=no ++ ac_cv_header_numpy_arrayobject_h=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_Numeric_arrayobject_h" >&5 +-echo "${ECHO_T}$ac_cv_header_Numeric_arrayobject_h" >&6; } +-if test $ac_cv_header_Numeric_arrayobject_h = yes; then ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_numpy_arrayobject_h" >&5 ++$as_echo "$ac_cv_header_numpy_arrayobject_h" >&6; } ++if test "x$ac_cv_header_numpy_arrayobject_h" = x""yes; then + + cat >>confdefs.h <<\_ACEOF +-#define HAVE_NUMPY ++#define HAVE_NUMPY /**/ + _ACEOF + + fi + + +- CPPFLAGS="$save_CPPFLAGS" ++ CPPFLAGS="$save_CPPFLAGS -I$numpy_INCLUDES" + fi + + +@@ -13507,8 +13746,8 @@ case " $CFLAGS " in + *) + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Wall" +- { echo "$as_me:$LINENO: checking whether $CC understands -Wall" >&5 +-echo $ECHO_N "checking whether $CC understands -Wall... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking whether $CC understands -Wall" >&5 ++$as_echo_n "checking whether $CC understands -Wall... " >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -13530,28 +13769,29 @@ 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_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 + jh_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 + + jh_has_option=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- { echo "$as_me:$LINENO: result: $jh_has_option" >&5 +-echo "${ECHO_T}$jh_has_option" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $jh_has_option" >&5 ++$as_echo "$jh_has_option" >&6; } + if test $jh_has_option = no; then + CFLAGS="$save_CFLAGS" + fi +@@ -13564,8 +13804,8 @@ case " $CFLAGS " in + *) + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -fno-strict-aliasing" +- { echo "$as_me:$LINENO: checking whether $CC understands -fno-strict-aliasing" >&5 +-echo $ECHO_N "checking whether $CC understands -fno-strict-aliasing... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking whether $CC understands -fno-strict-aliasing" >&5 ++$as_echo_n "checking whether $CC understands -fno-strict-aliasing... " >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -13587,28 +13827,29 @@ 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_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 + jh_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 + + jh_has_option=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- { echo "$as_me:$LINENO: result: $jh_has_option" >&5 +-echo "${ECHO_T}$jh_has_option" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $jh_has_option" >&5 ++$as_echo "$jh_has_option" >&6; } + if test $jh_has_option = no; then + CFLAGS="$save_CFLAGS" + fi +@@ -13626,8 +13867,8 @@ case " $CFLAGS " in + *) + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -std=c9x" +- { echo "$as_me:$LINENO: checking whether $CC understands -std=c9x" >&5 +-echo $ECHO_N "checking whether $CC understands -std=c9x... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking whether $CC understands -std=c9x" >&5 ++$as_echo_n "checking whether $CC understands -std=c9x... " >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -13649,28 +13890,29 @@ 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_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 + jh_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 + + jh_has_option=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- { echo "$as_me:$LINENO: result: $jh_has_option" >&5 +-echo "${ECHO_T}$jh_has_option" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $jh_has_option" >&5 ++$as_echo "$jh_has_option" >&6; } + if test $jh_has_option = no; then + CFLAGS="$save_CFLAGS" + fi +@@ -13710,11 +13952,12 @@ _ACEOF + 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 +@@ -13747,12 +13990,12 @@ echo "$as_me: WARNING: Cache variable $a + 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 +@@ -13768,7 +14011,7 @@ ac_ltlibobjs= + 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" +@@ -13779,160 +14022,168 @@ LIBOBJS=$ac_libobjs + LTLIBOBJS=$ac_ltlibobjs + + ++if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then ++ { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi + 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 "${PLATFORM_WIN32_TRUE}" && test -z "${PLATFORM_WIN32_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"PLATFORM_WIN32\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"PLATFORM_WIN32\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"PLATFORM_WIN32\" was never defined. ++$as_echo "$as_me: error: conditional \"PLATFORM_WIN32\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${OS_WIN32_TRUE}" && test -z "${OS_WIN32_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"OS_WIN32\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"OS_WIN32\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"OS_WIN32\" was never defined. ++$as_echo "$as_me: error: conditional \"OS_WIN32\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${ENABLE_DOCS_TRUE}" && test -z "${ENABLE_DOCS_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_DOCS\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_DOCS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"ENABLE_DOCS\" was never defined. ++$as_echo "$as_me: error: conditional \"ENABLE_DOCS\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${BUILD_ATK_TRUE}" && test -z "${BUILD_ATK_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"BUILD_ATK\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_ATK\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"BUILD_ATK\" was never defined. ++$as_echo "$as_me: error: conditional \"BUILD_ATK\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${BUILD_PANGO_TRUE}" && test -z "${BUILD_PANGO_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"BUILD_PANGO\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_PANGO\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"BUILD_PANGO\" was never defined. ++$as_echo "$as_me: error: conditional \"BUILD_PANGO\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${BUILD_PANGOCAIRO_TRUE}" && test -z "${BUILD_PANGOCAIRO_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"BUILD_PANGOCAIRO\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_PANGOCAIRO\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"BUILD_PANGOCAIRO\" was never defined. ++$as_echo "$as_me: error: conditional \"BUILD_PANGOCAIRO\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${BUILD_GTK_TRUE}" && test -z "${BUILD_GTK_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"BUILD_GTK\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_GTK\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"BUILD_GTK\" was never defined. ++$as_echo "$as_me: error: conditional \"BUILD_GTK\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_GTK_2_10_TRUE}" && test -z "${HAVE_GTK_2_10_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"HAVE_GTK_2_10\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GTK_2_10\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"HAVE_GTK_2_10\" was never defined. ++$as_echo "$as_me: error: conditional \"HAVE_GTK_2_10\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_GTK_2_12_TRUE}" && test -z "${HAVE_GTK_2_12_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"HAVE_GTK_2_12\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GTK_2_12\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"HAVE_GTK_2_12\" was never defined. ++$as_echo "$as_me: error: conditional \"HAVE_GTK_2_12\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_GTK_2_14_TRUE}" && test -z "${HAVE_GTK_2_14_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"HAVE_GTK_2_14\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GTK_2_14\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"HAVE_GTK_2_14\" was never defined. ++$as_echo "$as_me: error: conditional \"HAVE_GTK_2_14\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${BUILD_LIBGLADE_TRUE}" && test -z "${BUILD_LIBGLADE_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"BUILD_LIBGLADE\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_LIBGLADE\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"BUILD_LIBGLADE\" was never defined. ++$as_echo "$as_me: error: conditional \"BUILD_LIBGLADE\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${BUILD_GTKUNIXPRINT_TRUE}" && test -z "${BUILD_GTKUNIXPRINT_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"BUILD_GTKUNIXPRINT\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_GTKUNIXPRINT\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"BUILD_GTKUNIXPRINT\" was never defined. ++$as_echo "$as_me: error: conditional \"BUILD_GTKUNIXPRINT\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${BUILD_PANGOCAIRO_TRUE}" && test -z "${BUILD_PANGOCAIRO_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"BUILD_PANGOCAIRO\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_PANGOCAIRO\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"BUILD_PANGOCAIRO\" was never defined. ++$as_echo "$as_me: error: conditional \"BUILD_PANGOCAIRO\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${BUILD_GTK_TRUE}" && test -z "${BUILD_GTK_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"BUILD_GTK\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_GTK\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"BUILD_GTK\" was never defined. ++$as_echo "$as_me: error: conditional \"BUILD_GTK\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_GTK_2_10_TRUE}" && test -z "${HAVE_GTK_2_10_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"HAVE_GTK_2_10\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GTK_2_10\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"HAVE_GTK_2_10\" was never defined. ++$as_echo "$as_me: error: conditional \"HAVE_GTK_2_10\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_GTK_2_12_TRUE}" && test -z "${HAVE_GTK_2_12_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"HAVE_GTK_2_12\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GTK_2_12\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"HAVE_GTK_2_12\" was never defined. ++$as_echo "$as_me: error: conditional \"HAVE_GTK_2_12\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_GTK_2_14_TRUE}" && test -z "${HAVE_GTK_2_14_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"HAVE_GTK_2_14\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GTK_2_14\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"HAVE_GTK_2_14\" was never defined. ++$as_echo "$as_me: error: conditional \"HAVE_GTK_2_14\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${BUILD_LIBGLADE_TRUE}" && test -z "${BUILD_LIBGLADE_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"BUILD_LIBGLADE\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_LIBGLADE\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"BUILD_LIBGLADE\" was never defined. ++$as_echo "$as_me: error: conditional \"BUILD_LIBGLADE\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${BUILD_GTKUNIXPRINT_TRUE}" && test -z "${BUILD_GTKUNIXPRINT_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"BUILD_GTKUNIXPRINT\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_GTKUNIXPRINT\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"BUILD_GTKUNIXPRINT\" was never defined. ++$as_echo "$as_me: error: conditional \"BUILD_GTKUNIXPRINT\" 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. +@@ -13945,7 +14196,7 @@ ac_cs_silent=false + SHELL=\${CONFIG_SHELL-$SHELL} + _ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + ## --------------------- ## + ## M4sh Initialization. ## + ## --------------------- ## +@@ -13955,7 +14206,7 @@ DUALCASE=1; export DUALCASE # for MKS sh + 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 +@@ -13977,17 +14228,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE + 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. +@@ -14003,8 +14282,6 @@ fi + # 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. +@@ -14027,7 +14304,7 @@ if test "x$as_myself" = x; then + 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 + +@@ -14040,17 +14317,10 @@ PS2='> ' + 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 && +@@ -14072,7 +14342,7 @@ as_me=`$as_basename -- "$0" || + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +-echo X/"$0" | ++$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q +@@ -14123,7 +14393,7 @@ $as_unset CDPATH + 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 +@@ -14151,7 +14421,6 @@ case `echo -n x` in + *) + ECHO_N='-n';; + esac +- + if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +@@ -14164,19 +14433,22 @@ if test -d conf$$.dir; then + 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 +@@ -14201,10 +14473,10 @@ else + 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 +@@ -14227,7 +14499,7 @@ exec 6>&1 + # values after options handling. + ac_log=" + This file was extended by pygtk $as_me 2.14.1, 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 +@@ -14240,7 +14512,16 @@ on `(hostname || uname -n) 2>/dev/null | + + _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" +@@ -14248,22 +14529,23 @@ config_commands="$ac_config_commands" + + _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 +@@ -14277,24 +14559,26 @@ $config_commands + Report bugs to ." + + _ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_version="\\ + pygtk config.status 2.14.1 +-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." + + ac_pwd='$ac_pwd' + 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 +@@ -14316,30 +14600,36 @@ do + -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; }; } ;; + +@@ -14358,27 +14648,29 @@ if $ac_cs_silent; then + 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 + # +@@ -14642,7 +14934,7 @@ fi + + _ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + + # Handling of arguments. + for ac_config_target in $ac_config_targets +@@ -14662,8 +14954,8 @@ do + "pygtk.spec") CONFIG_FILES="$CONFIG_FILES pygtk.spec" ;; + "PKG-INFO") CONFIG_FILES="$CONFIG_FILES PKG-INFO" ;; + +- *) { { 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 +@@ -14704,289 +14996,144 @@ $debug || + (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_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 ++ ++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 +-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 +-ACLOCAL_AMFLAGS!$ACLOCAL_AMFLAGS$ac_delim +-PYGTK_MAJOR_VERSION!$PYGTK_MAJOR_VERSION$ac_delim +-PYGTK_MINOR_VERSION!$PYGTK_MINOR_VERSION$ac_delim +-PYGTK_MICRO_VERSION!$PYGTK_MICRO_VERSION$ac_delim +-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim +-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim +-INSTALL_DATA!$INSTALL_DATA$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 +-PLATFORM_WIN32_TRUE!$PLATFORM_WIN32_TRUE$ac_delim +-PLATFORM_WIN32_FALSE!$PLATFORM_WIN32_FALSE$ac_delim +-OS_WIN32_TRUE!$OS_WIN32_TRUE$ac_delim +-OS_WIN32_FALSE!$OS_WIN32_FALSE$ac_delim +-AS!$AS$ac_delim +-DLLTOOL!$DLLTOOL$ac_delim +-OBJDUMP!$OBJDUMP$ac_delim +-LIBTOOL!$LIBTOOL$ac_delim +-SED!$SED$ac_delim +-GREP!$GREP$ac_delim +-EGREP!$EGREP$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-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 ++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 ++ } + +-ac_delim='%!_!# ' +-for ac_last_try in false false false false false :; do +- cat >conf$$subs.sed <<_ACEOF +-FGREP!$FGREP$ac_delim +-LD!$LD$ac_delim +-DUMPBIN!$DUMPBIN$ac_delim +-ac_ct_DUMPBIN!$ac_ct_DUMPBIN$ac_delim +-NM!$NM$ac_delim +-LN_S!$LN_S$ac_delim +-AR!$AR$ac_delim +-RANLIB!$RANLIB$ac_delim +-lt_ECHO!$lt_ECHO$ac_delim +-DSYMUTIL!$DSYMUTIL$ac_delim +-NMEDIT!$NMEDIT$ac_delim +-LIPO!$LIPO$ac_delim +-OTOOL!$OTOOL$ac_delim +-OTOOL64!$OTOOL64$ac_delim +-CPP!$CPP$ac_delim +-PYTHON!$PYTHON$ac_delim +-PYTHON_VERSION!$PYTHON_VERSION$ac_delim +-PYTHON_PREFIX!$PYTHON_PREFIX$ac_delim +-PYTHON_EXEC_PREFIX!$PYTHON_EXEC_PREFIX$ac_delim +-PYTHON_PLATFORM!$PYTHON_PLATFORM$ac_delim +-pythondir!$pythondir$ac_delim +-pkgpythondir!$pkgpythondir$ac_delim +-pyexecdir!$pyexecdir$ac_delim +-pkgpyexecdir!$pkgpyexecdir$ac_delim +-PYTHON_INCLUDES!$PYTHON_INCLUDES$ac_delim +-XSLTPROC!$XSLTPROC$ac_delim +-ENABLE_DOCS_TRUE!$ENABLE_DOCS_TRUE$ac_delim +-ENABLE_DOCS_FALSE!$ENABLE_DOCS_FALSE$ac_delim +-THREADING_CFLAGS!$THREADING_CFLAGS$ac_delim +-PKG_CONFIG!$PKG_CONFIG$ac_delim +-GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim +-GLIB_LIBS!$GLIB_LIBS$ac_delim +-GLIB_GENMARSHAL!$GLIB_GENMARSHAL$ac_delim +-GOBJECT_QUERY!$GOBJECT_QUERY$ac_delim +-GLIB_MKENUMS!$GLIB_MKENUMS$ac_delim +-PYGOBJECT_CFLAGS!$PYGOBJECT_CFLAGS$ac_delim +-PYGOBJECT_LIBS!$PYGOBJECT_LIBS$ac_delim +-PYGOBJECT_INCLUDEDIR!$PYGOBJECT_INCLUDEDIR$ac_delim +-PYGOBJECT_DATADIR!$PYGOBJECT_DATADIR$ac_delim +-PYGOBJECT_FIXXREF!$PYGOBJECT_FIXXREF$ac_delim +-PYGOBJECT_PYGDOCS!$PYGOBJECT_PYGDOCS$ac_delim +-ATK_CFLAGS!$ATK_CFLAGS$ac_delim +-ATK_LIBS!$ATK_LIBS$ac_delim +-BUILD_ATK_TRUE!$BUILD_ATK_TRUE$ac_delim +-BUILD_ATK_FALSE!$BUILD_ATK_FALSE$ac_delim +-PANGO_CFLAGS!$PANGO_CFLAGS$ac_delim +-PANGO_LIBS!$PANGO_LIBS$ac_delim +-BUILD_PANGO_TRUE!$BUILD_PANGO_TRUE$ac_delim +-BUILD_PANGO_FALSE!$BUILD_PANGO_FALSE$ac_delim +-CODEGENDIR!$CODEGENDIR$ac_delim +-PYGTK_CODEGEN_DEFINES!$PYGTK_CODEGEN_DEFINES$ac_delim +-PYCAIRO_CFLAGS!$PYCAIRO_CFLAGS$ac_delim +-PYCAIRO_LIBS!$PYCAIRO_LIBS$ac_delim +-PANGOCAIRO_CFLAGS!$PANGOCAIRO_CFLAGS$ac_delim +-PANGOCAIRO_LIBS!$PANGOCAIRO_LIBS$ac_delim +-BUILD_PANGOCAIRO_TRUE!$BUILD_PANGOCAIRO_TRUE$ac_delim +-BUILD_PANGOCAIRO_FALSE!$BUILD_PANGOCAIRO_FALSE$ac_delim +-GTK_CFLAGS!$GTK_CFLAGS$ac_delim +-GTK_LIBS!$GTK_LIBS$ac_delim +-BUILD_GTK_TRUE!$BUILD_GTK_TRUE$ac_delim +-BUILD_GTK_FALSE!$BUILD_GTK_FALSE$ac_delim +-GTK210_CFLAGS!$GTK210_CFLAGS$ac_delim +-GTK210_LIBS!$GTK210_LIBS$ac_delim +-HAVE_GTK_2_10_TRUE!$HAVE_GTK_2_10_TRUE$ac_delim +-HAVE_GTK_2_10_FALSE!$HAVE_GTK_2_10_FALSE$ac_delim +-HAVE_GTK_2_10!$HAVE_GTK_2_10$ac_delim +-GTK212_CFLAGS!$GTK212_CFLAGS$ac_delim +-GTK212_LIBS!$GTK212_LIBS$ac_delim +-HAVE_GTK_2_12_TRUE!$HAVE_GTK_2_12_TRUE$ac_delim +-HAVE_GTK_2_12_FALSE!$HAVE_GTK_2_12_FALSE$ac_delim +-HAVE_GTK_2_12!$HAVE_GTK_2_12$ac_delim +-GTK214_CFLAGS!$GTK214_CFLAGS$ac_delim +-GTK214_LIBS!$GTK214_LIBS$ac_delim +-HAVE_GTK_2_14_TRUE!$HAVE_GTK_2_14_TRUE$ac_delim +-HAVE_GTK_2_14_FALSE!$HAVE_GTK_2_14_FALSE$ac_delim +-HAVE_GTK_2_14!$HAVE_GTK_2_14$ac_delim +-LIBGLADE_CFLAGS!$LIBGLADE_CFLAGS$ac_delim +-LIBGLADE_LIBS!$LIBGLADE_LIBS$ac_delim +-BUILD_LIBGLADE_TRUE!$BUILD_LIBGLADE_TRUE$ac_delim +-BUILD_LIBGLADE_FALSE!$BUILD_LIBGLADE_FALSE$ac_delim +-GTKUNIXPRINT_CFLAGS!$GTKUNIXPRINT_CFLAGS$ac_delim +-GTKUNIXPRINT_LIBS!$GTKUNIXPRINT_LIBS$ac_delim +-BUILD_GTKUNIXPRINT_TRUE!$BUILD_GTKUNIXPRINT_TRUE$ac_delim +-BUILD_GTKUNIXPRINT_FALSE!$BUILD_GTKUNIXPRINT_FALSE$ac_delim +-LIBOBJS!$LIBOBJS$ac_delim +-LTLIBOBJS!$LTLIBOBJS$ac_delim +-_ACEOF ++ print line ++} + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 86; 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;} ++_ACAWK ++_ACEOF ++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-2.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 +@@ -15002,19 +15149,133 @@ s/^[^=]*=[ ]*$// + }' + 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;; +@@ -15043,26 +15304,38 @@ echo "$as_me: error: Invalid tag $ac_tag + [\\/$]*) 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 +@@ -15072,7 +15345,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^ + 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 +@@ -15098,7 +15371,7 @@ echo X"$ac_file" | + 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" +@@ -15107,7 +15380,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/ + 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 +@@ -15128,17 +15401,17 @@ echo X"$as_dir" | + 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/ ;; +@@ -15176,14 +15449,20 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_ + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac ++ ac_MKDIR_P=$MKDIR_P ++ case $MKDIR_P in ++ [\\/$]* | ?:[\\/]* ) ;; ++ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; ++ 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 + } +@@ -15192,13 +15471,14 @@ case `sed -n '/datarootdir/ { + /@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 +@@ -15212,15 +15492,16 @@ _ACEOF + # 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 +@@ -15229,136 +15510,77 @@ s&@builddir@&$ac_builddir&;t t + s&@abs_builddir@&$ac_abs_builddir&;t t + s&@abs_top_builddir@&$ac_abs_top_builddir&;t t + 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" >$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. ++# 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 +- $ac_file | $ac_file:* ) ++ $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac + done +-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || +-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X$ac_file : 'X\(//\)[^/]' \| \ +- X$ac_file : 'X\(//\)$' \| \ +- X$ac_file : 'X\(/\)' \| . 2>/dev/null || +-echo X$ac_file | ++echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || ++$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$_am_arg" : 'X\(//\)[^/]' \| \ ++ X"$_am_arg" : 'X\(//\)$' \| \ ++ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$_am_arg" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -15378,14 +15600,23 @@ echo X$ac_file | + 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 + + + case $ac_file$ac_mode in +- "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do ++ "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files ++# are listed without --file. Let's play safe and only enable the eval ++# if we detect the quoting. ++case $CONFIG_FILES in ++*\'*) eval set x "$CONFIG_FILES" ;; ++*) set x $CONFIG_FILES ;; ++esac ++shift ++for mf ++do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. +@@ -15393,14 +15624,15 @@ echo "$as_me: executing $ac_file command + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. +- # So let's grep whole file. +- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || + $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| . 2>/dev/null || +-echo X"$mf" | ++$as_echo X"$mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -15444,7 +15676,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| . 2>/dev/null || +-echo X"$file" | ++$as_echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -15470,7 +15702,7 @@ echo X"$file" | + 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" +@@ -15479,7 +15711,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/ + 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 +@@ -15500,8 +15732,8 @@ echo X"$as_dir" | + 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" +@@ -16159,6 +16391,11 @@ _ACEOF + chmod +x $CONFIG_STATUS + ac_clean_files=$ac_clean_files_save + ++test $ac_write_fail = 0 || ++ { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 ++$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} ++ { (exit 1); exit 1; }; } ++ + + # configure is writing to config.log, and then calls config.status. + # config.status does its own redirection, appending to config.log. +@@ -16180,6 +16417,10 @@ if test "$no_create" != yes; then + # 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 +Index: pygtk-2.14.1/INSTALL +=================================================================== +--- pygtk-2.14.1.orig/INSTALL 2009-05-29 09:25:12.013611703 +0200 ++++ pygtk-2.14.1/INSTALL 2009-05-29 09:24:32.577603008 +0200 +@@ -1,16 +1,19 @@ + Installation Instructions + ************************* + +-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free +-Software Foundation, Inc. ++Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, ++2006, 2007, 2008 Free Software Foundation, Inc. + +-This file is free documentation; the Free Software Foundation gives ++ This file is free documentation; the Free Software Foundation gives + unlimited permission to copy, distribute and modify it. + + Basic Installation + ================== + +-These are generic installation instructions. ++ Briefly, the shell commands `./configure; make; make install' should ++configure, build, and install this package. The following ++more-detailed instructions are generic; see the `README' file for ++instructions specific to this package. + + The `configure' shell script attempts to guess correct values for + various system-dependent variables used during compilation. It uses +@@ -23,9 +26,9 @@ debugging `configure'). + + It can also use an optional file (typically called `config.cache' + and enabled with `--cache-file=config.cache' or simply `-C') that saves +-the results of its tests to speed up reconfiguring. (Caching is ++the results of its tests to speed up reconfiguring. Caching is + disabled by default to prevent problems with accidental use of stale +-cache files.) ++cache files. + + If you need to do unusual things to compile the package, please try + to figure out how `configure' could check whether to do them, and mail +@@ -35,20 +38,17 @@ some point `config.cache' contains resul + may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +-`configure' by a program called `autoconf'. You only need +-`configure.ac' if you want to change it or regenerate `configure' using +-a newer version of `autoconf'. ++`configure' by a program called `autoconf'. You need `configure.ac' if ++you want to change it or regenerate `configure' using a newer version ++of `autoconf'. + + The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type +- `./configure' to configure the package for your system. If you're +- using `csh' on an old version of System V, you might need to type +- `sh ./configure' instead to prevent `csh' from trying to execute +- `configure' itself. ++ `./configure' to configure the package for your system. + +- Running `configure' takes awhile. While running, it prints some +- messages telling which features it is checking for. ++ Running `configure' might take a while. While running, it prints ++ some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + +@@ -67,42 +67,57 @@ The simplest way to compile this package + all sorts of other programs in order to regenerate files that came + with the distribution. + ++ 6. Often, you can also type `make uninstall' to remove the installed ++ files again. ++ + Compilers and Options + ===================== + +-Some systems require unusual options for compilation or linking that the +-`configure' script does not know about. Run `./configure --help' for +-details on some of the pertinent environment variables. ++ Some systems require unusual options for compilation or linking that ++the `configure' script does not know about. Run `./configure --help' ++for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters + by setting variables in the command line or in the environment. Here + is an example: + +- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix ++ ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + + Compiling For Multiple Architectures + ==================================== + +-You can compile the package for more than one kind of computer at the ++ You can compile the package for more than one kind of computer at the + same time, by placing the object files for each architecture in their +-own directory. To do this, you must use a version of `make' that +-supports the `VPATH' variable, such as GNU `make'. `cd' to the ++own directory. To do this, you can use GNU `make'. `cd' to the + directory where you want the object files and executables to go and run + the `configure' script. `configure' automatically checks for the + source code in the directory that `configure' is in and in `..'. + +- If you have to use a `make' that does not support the `VPATH' +-variable, you have to compile the package for one architecture at a +-time in the source code directory. After you have installed the +-package for one architecture, use `make distclean' before reconfiguring +-for another architecture. ++ With a non-GNU `make', it is safer to compile the package for one ++architecture at a time in the source code directory. After you have ++installed the package for one architecture, use `make distclean' before ++reconfiguring for another architecture. ++ ++ On MacOS X 10.5 and later systems, you can create libraries and ++executables that work on multiple system types--known as "fat" or ++"universal" binaries--by specifying multiple `-arch' options to the ++compiler but only a single `-arch' option to the preprocessor. Like ++this: ++ ++ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ ++ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ ++ CPP="gcc -E" CXXCPP="g++ -E" ++ ++ This is not guaranteed to produce working output in all cases, you ++may have to build one architecture at a time and combine the results ++using the `lipo' tool if you have problems. + + Installation Names + ================== + +-By default, `make install' installs the package's commands under ++ By default, `make install' installs the package's commands under + `/usr/local/bin', include files under `/usr/local/include', etc. You + can specify an installation prefix other than `/usr/local' by giving + `configure' the option `--prefix=PREFIX'. +@@ -125,7 +140,7 @@ option `--program-prefix=PREFIX' or `--p + Optional Features + ================= + +-Some packages pay attention to `--enable-FEATURE' options to ++ Some packages pay attention to `--enable-FEATURE' options to + `configure', where FEATURE indicates an optional part of the package. + They may also pay attention to `--with-PACKAGE' options, where PACKAGE + is something like `gnu-as' or `x' (for the X Window System). The +@@ -137,14 +152,36 @@ find the X include and library files aut + you can use the `configure' options `--x-includes=DIR' and + `--x-libraries=DIR' to specify their locations. + ++Particular systems ++================== ++ ++ On HP-UX, the default C compiler is not ANSI C compatible. If GNU ++CC is not installed, it is recommended to use the following options in ++order to use an ANSI C compiler: ++ ++ ./configure CC="cc -Ae" ++ ++and if that doesn't work, install pre-built binaries of GCC for HP-UX. ++ ++ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot ++parse its `' header file. The option `-nodtk' can be used as ++a workaround. If GNU CC is not installed, it is therefore recommended ++to try ++ ++ ./configure CC="cc" ++ ++and if that doesn't work, try ++ ++ ./configure CC="cc -nodtk" ++ + Specifying the System Type + ========================== + +-There may be some features `configure' cannot figure out automatically, +-but needs to determine by the type of machine the package will run on. +-Usually, assuming the package is built to be run on the _same_ +-architectures, `configure' can figure that out, but if it prints a +-message saying it cannot guess the machine type, give it the ++ There may be some features `configure' cannot figure out ++automatically, but needs to determine by the type of machine the package ++will run on. Usually, assuming the package is built to be run on the ++_same_ architectures, `configure' can figure that out, but if it prints ++a message saying it cannot guess the machine type, give it the + `--build=TYPE' option. TYPE can either be a short name for the system + type, such as `sun4', or a canonical name which has the form: + +@@ -170,9 +207,9 @@ eventually be run) with `--host=TYPE'. + Sharing Defaults + ================ + +-If you want to set default values for `configure' scripts to share, you +-can create a site shell script called `config.site' that gives default +-values for variables like `CC', `cache_file', and `prefix'. ++ If you want to set default values for `configure' scripts to share, ++you can create a site shell script called `config.site' that gives ++default values for variables like `CC', `cache_file', and `prefix'. + `configure' looks for `PREFIX/share/config.site' if it exists, then + `PREFIX/etc/config.site' if it exists. Or, you can set the + `CONFIG_SITE' environment variable to the location of the site script. +@@ -181,7 +218,7 @@ A warning: not all `configure' scripts l + Defining Variables + ================== + +-Variables not defined in a site shell script can be set in the ++ Variables not defined in a site shell script can be set in the + environment passed to `configure'. However, some packages may run + configure again during the build, and the customized values of these + variables may be lost. In order to avoid this problem, you should set +@@ -190,21 +227,29 @@ them in the `configure' command line, us + ./configure CC=/usr/local2/bin/gcc + + causes the specified `gcc' to be used as the C compiler (unless it is +-overridden in the site shell script). Here is a another example: ++overridden in the site shell script). + +- /bin/bash ./configure CONFIG_SHELL=/bin/bash ++Unfortunately, this technique does not work for `CONFIG_SHELL' due to ++an Autoconf bug. Until the bug is fixed you can use this workaround: + +-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent +-configuration-related scripts to be executed by `/bin/bash'. ++ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + + `configure' Invocation + ====================== + +-`configure' recognizes the following options to control how it operates. ++ `configure' recognizes the following options to control how it ++operates. + + `--help' + `-h' +- Print a summary of the options to `configure', and exit. ++ Print a summary of all of the options to `configure', and exit. ++ ++`--help=short' ++`--help=recursive' ++ Print a summary of the options unique to this package's ++ `configure', and exit. The `short' variant lists options used ++ only in the top level, while the `recursive' variant lists options ++ also present in any nested packages. + + `--version' + `-V' +@@ -231,6 +276,16 @@ configuration-related scripts to be exec + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + ++`--prefix=DIR' ++ Use DIR as the installation prefix. *Note Installation Names:: ++ for more details, including other options available for fine-tuning ++ the installation locations. ++ ++`--no-create' ++`-n' ++ Run the configure checks, but stop before creating any output ++ files. ++ + `configure' also accepts some other, not widely useful, options. Run + `configure --help' for more details. + +Index: pygtk-2.14.1/Makefile.in +=================================================================== +--- pygtk-2.14.1.orig/Makefile.in 2009-05-29 09:25:11.765105036 +0200 ++++ pygtk-2.14.1/Makefile.in 2009-05-29 09:24:32.741604218 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,15 +16,11 @@ + + + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = . + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -45,6 +41,7 @@ host_triplet = @host@ + @BUILD_PANGO_TRUE@am__append_5 = $(PANGO_DEFS) + @BUILD_PANGOCAIRO_TRUE@am__append_6 = pangocairo.la + @BUILD_PANGOCAIRO_TRUE@am__append_7 = $(PANGOCAIRO_DEFS) ++subdir = . + DIST_COMMON = README $(am__configure_deps) $(noinst_PYTHON) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/PKG-INFO.in $(srcdir)/config.h.in \ +@@ -53,14 +50,13 @@ DIST_COMMON = README $(am__configure_dep + $(top_srcdir)/docs/reference/entities.docbook.in AUTHORS \ + COPYING ChangeLog INSTALL NEWS TODO compile config.guess \ + config.sub depcomp install-sh ltmain.sh missing py-compile +-subdir = . + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/jhflags.m4 \ + $(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ +- configure.lineno configure.status.lineno ++ configure.lineno config.status.lineno + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = config.h + CONFIG_CLEAN_FILES = pygtk-2.0.pc pygtk-codegen-2.0 \ +@@ -82,31 +78,41 @@ atk_la_DEPENDENCIES = $(am__DEPENDENCIES + am_atk_la_OBJECTS = atk_la-atkmodule.lo + nodist_atk_la_OBJECTS = atk_la-atk.lo + atk_la_OBJECTS = $(am_atk_la_OBJECTS) $(nodist_atk_la_OBJECTS) ++atk_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(atk_la_CFLAGS) $(CFLAGS) \ ++ $(atk_la_LDFLAGS) $(LDFLAGS) -o $@ + @BUILD_ATK_TRUE@am_atk_la_rpath = -rpath $(pkgpyexecdir) + pango_la_DEPENDENCIES = $(am__DEPENDENCIES_1) + am_pango_la_OBJECTS = pango_la-pangomodule.lo + nodist_pango_la_OBJECTS = pango_la-pango.lo + pango_la_OBJECTS = $(am_pango_la_OBJECTS) $(nodist_pango_la_OBJECTS) ++pango_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(pango_la_CFLAGS) $(CFLAGS) \ ++ $(pango_la_LDFLAGS) $(LDFLAGS) -o $@ + @BUILD_PANGO_TRUE@am_pango_la_rpath = -rpath $(pkgpyexecdir) + pangocairo_la_DEPENDENCIES = $(am__DEPENDENCIES_1) + am_pangocairo_la_OBJECTS = pangocairo_la-pangocairomodule.lo + nodist_pangocairo_la_OBJECTS = pangocairo_la-pangocairo.lo + pangocairo_la_OBJECTS = $(am_pangocairo_la_OBJECTS) \ + $(nodist_pangocairo_la_OBJECTS) ++pangocairo_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(pangocairo_la_CFLAGS) \ ++ $(CFLAGS) $(pangocairo_la_LDFLAGS) $(LDFLAGS) -o $@ + @BUILD_PANGOCAIRO_TRUE@am_pangocairo_la_rpath = -rpath $(pkgpyexecdir) + binSCRIPT_INSTALL = $(INSTALL_SCRIPT) + SCRIPTS = $(bin_SCRIPTS) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I. ++DEFAULT_INCLUDES = -I.@am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(atk_la_SOURCES) $(nodist_atk_la_SOURCES) \ + $(pango_la_SOURCES) $(nodist_pango_la_SOURCES) \ + $(pangocairo_la_SOURCES) $(nodist_pangocairo_la_SOURCES) +@@ -114,14 +120,17 @@ DIST_SOURCES = $(atk_la_SOURCES) $(pango + $(pangocairo_la_SOURCES) + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ +- install-exec-recursive install-info-recursive \ +- install-recursive installcheck-recursive installdirs-recursive \ +- pdf-recursive ps-recursive uninstall-info-recursive \ +- uninstall-recursive ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive + py_compile = $(top_srcdir)/py-compile + defsDATA_INSTALL = $(INSTALL_DATA) + pkgconfigDATA_INSTALL = $(INSTALL_DATA) + DATA = $(defs_DATA) $(pkgconfig_DATA) ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = . gtk examples tests docs +@@ -138,8 +147,6 @@ distuninstallcheck_listfiles = find . -t + distcleancheck_listfiles = find . -type f -print + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -149,18 +156,6 @@ AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-BUILD_ATK_FALSE = @BUILD_ATK_FALSE@ +-BUILD_ATK_TRUE = @BUILD_ATK_TRUE@ +-BUILD_GTKUNIXPRINT_FALSE = @BUILD_GTKUNIXPRINT_FALSE@ +-BUILD_GTKUNIXPRINT_TRUE = @BUILD_GTKUNIXPRINT_TRUE@ +-BUILD_GTK_FALSE = @BUILD_GTK_FALSE@ +-BUILD_GTK_TRUE = @BUILD_GTK_TRUE@ +-BUILD_LIBGLADE_FALSE = @BUILD_LIBGLADE_FALSE@ +-BUILD_LIBGLADE_TRUE = @BUILD_LIBGLADE_TRUE@ +-BUILD_PANGOCAIRO_FALSE = @BUILD_PANGOCAIRO_FALSE@ +-BUILD_PANGOCAIRO_TRUE = @BUILD_PANGOCAIRO_TRUE@ +-BUILD_PANGO_FALSE = @BUILD_PANGO_FALSE@ +-BUILD_PANGO_TRUE = @BUILD_PANGO_TRUE@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +@@ -177,8 +172,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +-ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ + EXEEXT = @EXEEXT@ + FGREP = @FGREP@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -198,14 +191,9 @@ GTKUNIXPRINT_LIBS = @GTKUNIXPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HAVE_GTK_2_10 = @HAVE_GTK_2_10@ +-HAVE_GTK_2_10_FALSE = @HAVE_GTK_2_10_FALSE@ +-HAVE_GTK_2_10_TRUE = @HAVE_GTK_2_10_TRUE@ + HAVE_GTK_2_12 = @HAVE_GTK_2_12@ +-HAVE_GTK_2_12_FALSE = @HAVE_GTK_2_12_FALSE@ +-HAVE_GTK_2_12_TRUE = @HAVE_GTK_2_12_TRUE@ + HAVE_GTK_2_14 = @HAVE_GTK_2_14@ +-HAVE_GTK_2_14_FALSE = @HAVE_GTK_2_14_FALSE@ +-HAVE_GTK_2_14_TRUE = @HAVE_GTK_2_14_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -220,13 +208,13 @@ LIBTOOL = @LIBTOOL@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -241,8 +229,6 @@ PANGO_CFLAGS = @PANGO_CFLAGS@ + PANGO_LIBS = @PANGO_LIBS@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@ + PYCAIRO_LIBS = @PYCAIRO_LIBS@ + PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@ +@@ -269,10 +255,12 @@ STRIP = @STRIP@ + THREADING_CFLAGS = @THREADING_CFLAGS@ + VERSION = @VERSION@ + XSLTPROC = @XSLTPROC@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -284,6 +272,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -320,8 +309,12 @@ pyexecdir = @pyexecdir@ + pythondir = @pythondir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = 1.7 + @BUILD_GTK_TRUE@GTK_SUBDIR = gtk + SUBDIRS = . $(GTK_SUBDIR) examples tests docs +@@ -390,7 +383,7 @@ all: config.h + .SUFFIXES: .c .defs .lo .o .obj + am--refresh: + @: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +@@ -417,21 +410,21 @@ Makefile: $(srcdir)/Makefile.in $(top_bu + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(srcdir) && $(AUTOCONF) +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + + config.h: stamp-h1 + @if test ! -f $@; then \ + rm -f stamp-h1; \ +- $(MAKE) stamp-h1; \ ++ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ + else :; fi + + stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h +-$(srcdir)/config.h.in: $(am__configure_deps) ++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_srcdir) && $(AUTOHEADER) + rm -f stamp-h1 + touch $@ +@@ -450,21 +443,21 @@ PKG-INFO: $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $@ + install-pkgpyexecLTLIBRARIES: $(pkgpyexec_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(pkgpyexecdir)" || $(mkdir_p) "$(DESTDIR)$(pkgpyexecdir)" ++ test -z "$(pkgpyexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgpyexecdir)" + @list='$(pkgpyexec_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pkgpyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkgpyexecdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pkgpyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkgpyexecdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkgpyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkgpyexecdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkgpyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkgpyexecdir)/$$f"; \ + else :; fi; \ + done + + uninstall-pkgpyexecLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @set -x; list='$(pkgpyexec_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(pkgpyexec_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkgpyexecdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkgpyexecdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgpyexecdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkgpyexecdir)/$$p"; \ + done + + clean-pkgpyexecLTLIBRARIES: +@@ -477,21 +470,21 @@ clean-pkgpyexecLTLIBRARIES: + done + install-pyexecLTLIBRARIES: $(pyexec_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(pyexecdir)" || $(mkdir_p) "$(DESTDIR)$(pyexecdir)" ++ test -z "$(pyexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pyexecdir)" + @list='$(pyexec_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pyexecdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pyexecdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pyexecdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pyexecdir)/$$f"; \ + else :; fi; \ + done + + uninstall-pyexecLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @set -x; list='$(pyexec_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(pyexec_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pyexecdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pyexecdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pyexecdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pyexecdir)/$$p"; \ + done + + clean-pyexecLTLIBRARIES: +@@ -503,14 +496,14 @@ clean-pyexecLTLIBRARIES: + rm -f "$${dir}/so_locations"; \ + done + atk.la: $(atk_la_OBJECTS) $(atk_la_DEPENDENCIES) +- $(LINK) $(am_atk_la_rpath) $(atk_la_LDFLAGS) $(atk_la_OBJECTS) $(atk_la_LIBADD) $(LIBS) ++ $(atk_la_LINK) $(am_atk_la_rpath) $(atk_la_OBJECTS) $(atk_la_LIBADD) $(LIBS) + pango.la: $(pango_la_OBJECTS) $(pango_la_DEPENDENCIES) +- $(LINK) $(am_pango_la_rpath) $(pango_la_LDFLAGS) $(pango_la_OBJECTS) $(pango_la_LIBADD) $(LIBS) ++ $(pango_la_LINK) $(am_pango_la_rpath) $(pango_la_OBJECTS) $(pango_la_LIBADD) $(LIBS) + pangocairo.la: $(pangocairo_la_OBJECTS) $(pangocairo_la_DEPENDENCIES) +- $(LINK) $(am_pangocairo_la_rpath) $(pangocairo_la_LDFLAGS) $(pangocairo_la_OBJECTS) $(pangocairo_la_LIBADD) $(LIBS) ++ $(pangocairo_la_LINK) $(am_pangocairo_la_rpath) $(pangocairo_la_OBJECTS) $(pangocairo_la_LIBADD) $(LIBS) + install-binSCRIPTS: $(bin_SCRIPTS) + @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + @list='$(bin_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ +@@ -542,67 +535,67 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pangocairo_la-pangocairomodule.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + atk_la-atkmodule.lo: atkmodule.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atk_la_CFLAGS) $(CFLAGS) -MT atk_la-atkmodule.lo -MD -MP -MF "$(DEPDIR)/atk_la-atkmodule.Tpo" -c -o atk_la-atkmodule.lo `test -f 'atkmodule.c' || echo '$(srcdir)/'`atkmodule.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/atk_la-atkmodule.Tpo" "$(DEPDIR)/atk_la-atkmodule.Plo"; else rm -f "$(DEPDIR)/atk_la-atkmodule.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atk_la_CFLAGS) $(CFLAGS) -MT atk_la-atkmodule.lo -MD -MP -MF $(DEPDIR)/atk_la-atkmodule.Tpo -c -o atk_la-atkmodule.lo `test -f 'atkmodule.c' || echo '$(srcdir)/'`atkmodule.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/atk_la-atkmodule.Tpo $(DEPDIR)/atk_la-atkmodule.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='atkmodule.c' object='atk_la-atkmodule.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atk_la_CFLAGS) $(CFLAGS) -c -o atk_la-atkmodule.lo `test -f 'atkmodule.c' || echo '$(srcdir)/'`atkmodule.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atk_la_CFLAGS) $(CFLAGS) -c -o atk_la-atkmodule.lo `test -f 'atkmodule.c' || echo '$(srcdir)/'`atkmodule.c + + atk_la-atk.lo: atk.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atk_la_CFLAGS) $(CFLAGS) -MT atk_la-atk.lo -MD -MP -MF "$(DEPDIR)/atk_la-atk.Tpo" -c -o atk_la-atk.lo `test -f 'atk.c' || echo '$(srcdir)/'`atk.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/atk_la-atk.Tpo" "$(DEPDIR)/atk_la-atk.Plo"; else rm -f "$(DEPDIR)/atk_la-atk.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atk_la_CFLAGS) $(CFLAGS) -MT atk_la-atk.lo -MD -MP -MF $(DEPDIR)/atk_la-atk.Tpo -c -o atk_la-atk.lo `test -f 'atk.c' || echo '$(srcdir)/'`atk.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/atk_la-atk.Tpo $(DEPDIR)/atk_la-atk.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='atk.c' object='atk_la-atk.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atk_la_CFLAGS) $(CFLAGS) -c -o atk_la-atk.lo `test -f 'atk.c' || echo '$(srcdir)/'`atk.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atk_la_CFLAGS) $(CFLAGS) -c -o atk_la-atk.lo `test -f 'atk.c' || echo '$(srcdir)/'`atk.c + + pango_la-pangomodule.lo: pangomodule.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pango_la_CFLAGS) $(CFLAGS) -MT pango_la-pangomodule.lo -MD -MP -MF "$(DEPDIR)/pango_la-pangomodule.Tpo" -c -o pango_la-pangomodule.lo `test -f 'pangomodule.c' || echo '$(srcdir)/'`pangomodule.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/pango_la-pangomodule.Tpo" "$(DEPDIR)/pango_la-pangomodule.Plo"; else rm -f "$(DEPDIR)/pango_la-pangomodule.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pango_la_CFLAGS) $(CFLAGS) -MT pango_la-pangomodule.lo -MD -MP -MF $(DEPDIR)/pango_la-pangomodule.Tpo -c -o pango_la-pangomodule.lo `test -f 'pangomodule.c' || echo '$(srcdir)/'`pangomodule.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/pango_la-pangomodule.Tpo $(DEPDIR)/pango_la-pangomodule.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pangomodule.c' object='pango_la-pangomodule.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pango_la_CFLAGS) $(CFLAGS) -c -o pango_la-pangomodule.lo `test -f 'pangomodule.c' || echo '$(srcdir)/'`pangomodule.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pango_la_CFLAGS) $(CFLAGS) -c -o pango_la-pangomodule.lo `test -f 'pangomodule.c' || echo '$(srcdir)/'`pangomodule.c + + pango_la-pango.lo: pango.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pango_la_CFLAGS) $(CFLAGS) -MT pango_la-pango.lo -MD -MP -MF "$(DEPDIR)/pango_la-pango.Tpo" -c -o pango_la-pango.lo `test -f 'pango.c' || echo '$(srcdir)/'`pango.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/pango_la-pango.Tpo" "$(DEPDIR)/pango_la-pango.Plo"; else rm -f "$(DEPDIR)/pango_la-pango.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pango_la_CFLAGS) $(CFLAGS) -MT pango_la-pango.lo -MD -MP -MF $(DEPDIR)/pango_la-pango.Tpo -c -o pango_la-pango.lo `test -f 'pango.c' || echo '$(srcdir)/'`pango.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/pango_la-pango.Tpo $(DEPDIR)/pango_la-pango.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pango.c' object='pango_la-pango.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pango_la_CFLAGS) $(CFLAGS) -c -o pango_la-pango.lo `test -f 'pango.c' || echo '$(srcdir)/'`pango.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pango_la_CFLAGS) $(CFLAGS) -c -o pango_la-pango.lo `test -f 'pango.c' || echo '$(srcdir)/'`pango.c + + pangocairo_la-pangocairomodule.lo: pangocairomodule.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pangocairo_la_CFLAGS) $(CFLAGS) -MT pangocairo_la-pangocairomodule.lo -MD -MP -MF "$(DEPDIR)/pangocairo_la-pangocairomodule.Tpo" -c -o pangocairo_la-pangocairomodule.lo `test -f 'pangocairomodule.c' || echo '$(srcdir)/'`pangocairomodule.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/pangocairo_la-pangocairomodule.Tpo" "$(DEPDIR)/pangocairo_la-pangocairomodule.Plo"; else rm -f "$(DEPDIR)/pangocairo_la-pangocairomodule.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pangocairo_la_CFLAGS) $(CFLAGS) -MT pangocairo_la-pangocairomodule.lo -MD -MP -MF $(DEPDIR)/pangocairo_la-pangocairomodule.Tpo -c -o pangocairo_la-pangocairomodule.lo `test -f 'pangocairomodule.c' || echo '$(srcdir)/'`pangocairomodule.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/pangocairo_la-pangocairomodule.Tpo $(DEPDIR)/pangocairo_la-pangocairomodule.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pangocairomodule.c' object='pangocairo_la-pangocairomodule.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pangocairo_la_CFLAGS) $(CFLAGS) -c -o pangocairo_la-pangocairomodule.lo `test -f 'pangocairomodule.c' || echo '$(srcdir)/'`pangocairomodule.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pangocairo_la_CFLAGS) $(CFLAGS) -c -o pangocairo_la-pangocairomodule.lo `test -f 'pangocairomodule.c' || echo '$(srcdir)/'`pangocairomodule.c + + pangocairo_la-pangocairo.lo: pangocairo.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pangocairo_la_CFLAGS) $(CFLAGS) -MT pangocairo_la-pangocairo.lo -MD -MP -MF "$(DEPDIR)/pangocairo_la-pangocairo.Tpo" -c -o pangocairo_la-pangocairo.lo `test -f 'pangocairo.c' || echo '$(srcdir)/'`pangocairo.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/pangocairo_la-pangocairo.Tpo" "$(DEPDIR)/pangocairo_la-pangocairo.Plo"; else rm -f "$(DEPDIR)/pangocairo_la-pangocairo.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pangocairo_la_CFLAGS) $(CFLAGS) -MT pangocairo_la-pangocairo.lo -MD -MP -MF $(DEPDIR)/pangocairo_la-pangocairo.Tpo -c -o pangocairo_la-pangocairo.lo `test -f 'pangocairo.c' || echo '$(srcdir)/'`pangocairo.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/pangocairo_la-pangocairo.Tpo $(DEPDIR)/pangocairo_la-pangocairo.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pangocairo.c' object='pangocairo_la-pangocairo.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pangocairo_la_CFLAGS) $(CFLAGS) -c -o pangocairo_la-pangocairo.lo `test -f 'pangocairo.c' || echo '$(srcdir)/'`pangocairo.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pangocairo_la_CFLAGS) $(CFLAGS) -c -o pangocairo_la-pangocairo.lo `test -f 'pangocairo.c' || echo '$(srcdir)/'`pangocairo.c + + mostlyclean-libtool: + -rm -f *.lo +@@ -611,11 +604,10 @@ clean-libtool: + -rm -rf .libs _libs + + distclean-libtool: +- -rm -f libtool +-uninstall-info-am: ++ -rm -f libtool config.lt + install-defsDATA: $(defs_DATA) + @$(NORMAL_INSTALL) +- test -z "$(defsdir)" || $(mkdir_p) "$(DESTDIR)$(defsdir)" ++ test -z "$(defsdir)" || $(MKDIR_P) "$(DESTDIR)$(defsdir)" + @list='$(defs_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -632,7 +624,7 @@ uninstall-defsDATA: + done + install-pkgconfigDATA: $(pkgconfig_DATA) + @$(NORMAL_INSTALL) +- test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)" ++ test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" + @list='$(pkgconfig_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -679,8 +671,7 @@ $(RECURSIVE_TARGETS): + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: ++$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ +@@ -724,8 +715,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -750,8 +741,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -761,13 +752,12 @@ ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -782,24 +772,22 @@ distclean-tags: + + distdir: $(DISTFILES) + $(am__remove_distdir) +- mkdir $(distdir) +- $(mkdir_p) $(distdir)/. $(distdir)/docs/reference $(distdir)/m4 +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ test -d $(distdir) || mkdir $(distdir) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -813,7 +801,7 @@ distdir: $(DISTFILES) + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +@@ -821,6 +809,8 @@ distdir: $(DISTFILES) + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -828,7 +818,7 @@ distdir: $(DISTFILES) + -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ +- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ ++ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r $(distdir) + dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz +@@ -838,6 +828,10 @@ dist-bzip2: distdir + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + ++dist-lzma: distdir ++ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma ++ $(am__remove_distdir) ++ + dist-tarZ: distdir + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) +@@ -864,6 +858,8 @@ distcheck: dist + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ ++ *.tar.lzma*) \ ++ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ +@@ -903,7 +899,7 @@ distcheck: dist + $(am__remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ +- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' ++ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' + distuninstallcheck: + @cd $(distuninstallcheck_dir) \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ +@@ -928,7 +924,7 @@ all-am: Makefile $(LTLIBRARIES) $(SCRIPT + installdirs: installdirs-recursive + installdirs-am: + for dir in "$(DESTDIR)$(pkgpyexecdir)" "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(defsdir)" "$(DESTDIR)$(pkgconfigdir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-recursive + install-exec: install-exec-recursive +@@ -979,13 +975,21 @@ info-am: + + install-data-am: install-defsDATA install-pkgconfigDATA + ++install-dvi: install-dvi-recursive ++ + install-exec-am: install-binSCRIPTS install-pkgpyexecLTLIBRARIES \ + install-pyexecLTLIBRARIES + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -1009,30 +1013,32 @@ ps: ps-recursive + ps-am: + + uninstall-am: uninstall-binSCRIPTS uninstall-defsDATA \ +- uninstall-info-am uninstall-pkgconfigDATA \ +- uninstall-pkgpyexecLTLIBRARIES uninstall-pyexecLTLIBRARIES ++ uninstall-pkgconfigDATA uninstall-pkgpyexecLTLIBRARIES \ ++ uninstall-pyexecLTLIBRARIES + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ +- check-am clean clean-generic clean-libtool \ +- clean-pkgpyexecLTLIBRARIES clean-pyexecLTLIBRARIES \ +- clean-recursive ctags ctags-recursive dist dist-all dist-bzip2 \ +- dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ +- distclean-compile distclean-generic distclean-hdr \ +- distclean-libtool distclean-recursive distclean-tags \ +- distcleancheck distdir distuninstallcheck dvi dvi-am html \ +- html-am info info-am install install-am install-binSCRIPTS \ +- install-data install-data-am install-defsDATA install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-pkgconfigDATA install-pkgpyexecLTLIBRARIES \ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am am--refresh check check-am clean clean-generic \ ++ clean-libtool clean-pkgpyexecLTLIBRARIES \ ++ clean-pyexecLTLIBRARIES ctags ctags-recursive dist dist-all \ ++ dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ dist-zip \ ++ distcheck distclean distclean-compile distclean-generic \ ++ distclean-hdr distclean-libtool distclean-tags distcleancheck \ ++ distdir distuninstallcheck dvi dvi-am html html-am info \ ++ info-am install install-am install-binSCRIPTS install-data \ ++ install-data-am install-defsDATA install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-pkgconfigDATA \ ++ install-pkgpyexecLTLIBRARIES install-ps install-ps-am \ + install-pyexecLTLIBRARIES install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ +- maintainer-clean-generic maintainer-clean-recursive \ +- mostlyclean mostlyclean-compile mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ +- uninstall-binSCRIPTS uninstall-defsDATA uninstall-info-am \ ++ uninstall-binSCRIPTS uninstall-defsDATA \ + uninstall-pkgconfigDATA uninstall-pkgpyexecLTLIBRARIES \ + uninstall-pyexecLTLIBRARIES + +Index: pygtk-2.14.1/aclocal.m4 +=================================================================== +--- pygtk-2.14.1.orig/aclocal.m4 2009-05-29 09:25:12.681603157 +0200 ++++ pygtk-2.14.1/aclocal.m4 2009-05-29 09:24:09.613106888 +0200 +@@ -1,7 +1,7 @@ +-# generated automatically by aclocal 1.9.6 -*- Autoconf -*- ++# generated automatically by aclocal 1.10.2 -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005 Free Software Foundation, Inc. ++# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -11,6 +11,14 @@ + # even the implied warranty of MERCHANTABILITY or FITNESS FOR A + # PARTICULAR PURPOSE. + ++m4_ifndef([AC_AUTOCONF_VERSION], ++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl ++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, ++[m4_warning([this file was generated for autoconf 2.63. ++You have another version of autoconf. It may work, but is not guaranteed to. ++If you have problems, you may need to regenerate the build system entirely. ++To do so, use the procedure documented by the package, typically `autoreconf'.])]) ++ + # Configure paths for GLIB + # Owen Taylor 1997-2001 + +@@ -106,8 +114,9 @@ main () + { + int major, minor, micro; + char *tmp_version; ++ int ignored; + +- system ("touch conf.glibtest"); ++ ignored = system ("touch conf.glibtest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = g_strdup("$min_glib_version"); +@@ -599,12 +608,12 @@ m4_define([lt_decl_dquote_varnames], + # lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) + # --------------------------------------------------- + m4_define([lt_decl_varnames_tagged], +-[_$0(m4_quote(m4_default([$1], [[, ]])), +- m4_quote(m4_if([$2], [], +- m4_quote(lt_decl_tag_varnames), +- m4_quote(m4_shift($@)))), +- m4_split(m4_normalize(m4_quote(_LT_TAGS))))]) +-m4_define([_lt_decl_varnames_tagged], [lt_combine([$1], [$2], [_], $3)]) ++[m4_assert([$# <= 2])dnl ++_$0(m4_quote(m4_default([$1], [[, ]])), ++ m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), ++ m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) ++m4_define([_lt_decl_varnames_tagged], ++[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) + + + # lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) +@@ -1164,10 +1173,10 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECK + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; +- darwin*) # darwin 5.x on ++ darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment +- # target defaults to 10.4. Don't you love it? ++ # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; +@@ -1209,7 +1218,11 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], + _LT_TAGVAR(whole_archive_flag_spec, $1)='' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" +- if test "$GCC" = "yes"; then ++ case $cc_basename in ++ ifort*) _lt_dar_can_shared=yes ;; ++ *) _lt_dar_can_shared=$GCC ;; ++ esac ++ if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=echo + _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +@@ -1731,7 +1744,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d + lt_cv_sys_max_cmd_len=-1; + ;; + +- cygwin* | mingw*) ++ cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, +@@ -1899,10 +1912,6 @@ else + # endif + #endif + +-#ifdef __cplusplus +-extern "C" void exit (int); +-#endif +- + void fnord() { int i=42;} + int main () + { +@@ -1918,7 +1927,7 @@ int main () + else + puts (dlerror ()); + +- exit (status); ++ return status; + }] + _LT_EOF + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then +@@ -1957,7 +1966,7 @@ else + lt_cv_dlopen_self=yes + ;; + +- mingw* | pw32*) ++ mingw* | pw32* | cegcc*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; +@@ -2254,6 +2263,7 @@ m4_defun([_LT_SYS_DYNAMIC_LINKER], + [AC_REQUIRE([AC_CANONICAL_HOST])dnl + m4_require([_LT_DECL_EGREP])dnl + m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_DECL_OBJDUMP])dnl + m4_require([_LT_DECL_SED])dnl + AC_MSG_CHECKING([dynamic linker characteristics]) + m4_if([$1], +@@ -2418,14 +2428,14 @@ bsdi[[45]]*) + # libtool to hard-code these into programs + ;; + +-cygwin* | mingw* | pw32*) ++cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + + case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32*) ++ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ +@@ -2448,7 +2458,7 @@ cygwin* | mingw* | pw32*) + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; +- mingw*) ++ mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +@@ -2886,7 +2896,7 @@ tpf*) + version_type=linux + need_lib_prefix=no + need_version=no +- library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +@@ -2910,7 +2920,7 @@ variables_saved_for_relink="PATH $shlibp + if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" + fi +- ++ + if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" + fi +@@ -3187,6 +3197,7 @@ _LT_DECL([], [reload_cmds], [2])dnl + # -- PORTME fill in with the dynamic library characteristics + m4_defun([_LT_CHECK_MAGIC_METHOD], + [m4_require([_LT_DECL_EGREP]) ++m4_require([_LT_DECL_OBJDUMP]) + AC_CACHE_CHECK([how to recognize dependent libraries], + lt_cv_deplibs_check_method, + [lt_cv_file_magic_cmd='$MAGIC_CMD' +@@ -3237,6 +3248,12 @@ mingw* | pw32*) + fi + ;; + ++cegcc) ++ # use the weaker test based on 'objdump'. See mingw*. ++ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' ++ lt_cv_file_magic_cmd='$OBJDUMP -f' ++ ;; ++ + darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; +@@ -3548,7 +3565,7 @@ case $host_os in + aix*) + symcode='[[BCDT]]' + ;; +-cygwin* | mingw* | pw32*) ++cygwin* | mingw* | pw32* | cegcc*) + symcode='[[ABCDGISTW]]' + ;; + hpux*) +@@ -3794,7 +3811,7 @@ m4_if([$1], [CXX], [ + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; +- mingw* | cygwin* | os2* | pw32*) ++ mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style +@@ -3821,10 +3838,11 @@ m4_if([$1], [CXX], [ + fi + ;; + hpux*) +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. ++ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit ++ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag ++ # sets the default TLS model and affects inlining. + case $host_cpu in +- hppa*64*|ia64*) ++ hppa*64*) + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +@@ -3922,12 +3940,19 @@ m4_if([$1], [CXX], [ + _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; +- icpc* | ecpc* ) +- # Intel C++ ++ ecpc* ) ++ # old Intel C++ for x86_64 which still supported -KPIC. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; ++ icpc* ) ++ # Intel C++, used to be incompatible with GCC. ++ # ICC 10 doesn't accept -KPIC any more. ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +@@ -4093,7 +4118,7 @@ m4_if([$1], [CXX], [ + # PIC is the default for these OSes. + ;; + +- mingw* | cygwin* | pw32* | os2*) ++ mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style +@@ -4109,10 +4134,11 @@ m4_if([$1], [CXX], [ + ;; + + hpux*) +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. ++ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit ++ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag ++ # sets the default TLS model and affects inlining. + case $host_cpu in +- hppa*64*|ia64*) ++ hppa*64*) + # +Z the default + ;; + *) +@@ -4162,7 +4188,7 @@ m4_if([$1], [CXX], [ + fi + ;; + +- mingw* | cygwin* | pw32* | os2*) ++ mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + m4_if([$1], [GCJ], [], +@@ -4193,11 +4219,25 @@ m4_if([$1], [CXX], [ + + linux* | k*bsd*-gnu) + case $cc_basename in +- icc* | ecc* | ifort*) ++ # old Intel for x86_64 which still supported -KPIC. ++ ecc*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; ++ # icc used to be incompatible with GCC. ++ # ICC 10 doesn't accept -KPIC any more. ++ icc* | ifort*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ;; ++ # Lahey Fortran 8.1. ++ lf95*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' ++ ;; + pgcc* | pgf77* | pgf90* | pgf95*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) +@@ -4379,7 +4419,7 @@ m4_if([$1], [CXX], [ + pw32*) + _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + ;; +- cygwin* | mingw*) ++ cygwin* | mingw* | cegcc*) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + ;; + linux* | k*bsd*-gnu) +@@ -4434,7 +4474,7 @@ dnl Note also adjust exclude_expsyms for + extract_expsyms_cmds= + + case $host_os in +- cygwin* | mingw* | pw32*) ++ cygwin* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. +@@ -4449,6 +4489,9 @@ dnl Note also adjust exclude_expsyms for + openbsd*) + with_gnu_ld=no + ;; ++ linux* | k*bsd*-gnu) ++ _LT_TAGVAR(link_all_deplibs, $1)=no ++ ;; + esac + + _LT_TAGVAR(ld_shlibs, $1)=yes +@@ -4521,7 +4564,7 @@ _LT_EOF + fi + ;; + +- cygwin* | mingw* | pw32*) ++ cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +@@ -4587,6 +4630,9 @@ _LT_EOF + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; ++ lf95*) # Lahey Fortran 8.1 ++ _LT_TAGVAR(whole_archive_flag_spec, $1)= ++ tmp_sharedflag='--shared' ;; + xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; +@@ -4819,6 +4865,7 @@ _LT_EOF + fi + fi + ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + _LT_TAGVAR(always_export_symbols, $1)=yes +@@ -4873,7 +4920,7 @@ _LT_EOF + _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic + ;; + +- cygwin* | mingw* | pw32*) ++ cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is +@@ -4977,7 +5024,7 @@ _LT_EOF + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +@@ -5758,6 +5805,7 @@ if test "$_lt_caught_CXX_error" != yes; + fi + fi + ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to + # export. +@@ -5816,7 +5864,7 @@ if test "$_lt_caught_CXX_error" != yes; + esac + ;; + +- cygwin* | mingw* | pw32*) ++ cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +@@ -7197,6 +7245,18 @@ AC_SUBST([GREP]) + ]) + + ++# _LT_DECL_OBJDUMP ++# -------------- ++# If we don't have a new enough Autoconf to choose the best objdump ++# available, choose the one first in the user's PATH. ++m4_defun([_LT_DECL_OBJDUMP], ++[AC_CHECK_TOOL(OBJDUMP, objdump, false) ++test -z "$OBJDUMP" && OBJDUMP=objdump ++_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) ++AC_SUBST([OBJDUMP]) ++]) ++ ++ + # _LT_DECL_SED + # ------------ + # Check for a fully-functional sed program, that truncates +@@ -7657,7 +7717,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll], + [enable_win32_dll=yes + + case $host in +-*-*-cygwin* | *-*-mingw* | *-*-pw32*) ++*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) + AC_CHECK_TOOL(AS, as, false) + AC_CHECK_TOOL(DLLTOOL, dlltool, false) + AC_CHECK_TOOL(OBJDUMP, objdump, false) +@@ -7898,14 +7958,14 @@ LT_OPTION_DEFINE([LTDL_INIT], [convenien + + # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- + # +-# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. +-# Written by Gary V. Vaughan, 2004 ++# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. ++# Written by Gary V. Vaughan, 2004 + # + # This file is free software; the Free Software Foundation gives + # unlimited permission to copy and/or distribute it, with or without + # modifications, as long as this notice is preserved. + +-# serial 5 ltsugar.m4 ++# serial 6 ltsugar.m4 + + # This is to help aclocal find these macros, as it can't see m4_define. + AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) +@@ -7961,14 +8021,14 @@ m4_define([lt_append], + # Produce a SEP delimited list of all paired combinations of elements of + # PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list + # has the form PREFIXmINFIXSUFFIXn. ++# Needed until we can rely on m4_combine added in Autoconf 2.62. + m4_define([lt_combine], +-[m4_if([$2], [], [], +- [m4_if([$4], [], [], +- [lt_join(m4_quote(m4_default([$1], [[, ]])), +- lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_prefix, [$2], +- [m4_foreach(_Lt_suffix, lt_car([m4_shiftn(3, $@)]), +- [_Lt_prefix[]$3[]_Lt_suffix ])])))))])])dnl +-]) ++[m4_if(m4_eval([$# > 3]), [1], ++ [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl ++[[m4_foreach([_Lt_prefix], [$2], ++ [m4_foreach([_Lt_suffix], ++ ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, ++ [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) + + + # lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) +@@ -8031,15 +8091,15 @@ m4_define([lt_dict_filter], + + # Generated from ltversion.in. + +-# serial 2976 ltversion.m4 ++# serial 3012 ltversion.m4 + # This file is part of GNU Libtool + +-m4_define([LT_PACKAGE_VERSION], [2.2.4]) +-m4_define([LT_PACKAGE_REVISION], [1.2976]) ++m4_define([LT_PACKAGE_VERSION], [2.2.6]) ++m4_define([LT_PACKAGE_REVISION], [1.3012]) + + AC_DEFUN([LTVERSION_VERSION], +-[macro_version='2.2.4' +-macro_revision='1.2976' ++[macro_version='2.2.6' ++macro_revision='1.3012' + _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) + _LT_DECL(, macro_revision, 0) + ]) +@@ -8295,7 +8355,7 @@ else + fi[]dnl + ])# PKG_CHECK_MODULES + +-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. ++# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -8305,14 +8365,31 @@ fi[]dnl + # ---------------------------- + # Automake X.Y traces this macro to ensure aclocal.m4 has been + # generated from the m4 files accompanying Automake X.Y. +-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) ++# (This private macro should not be called outside this file.) ++AC_DEFUN([AM_AUTOMAKE_VERSION], ++[am__api_version='1.10' ++dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to ++dnl require some minimum version. Point them to the right macro. ++m4_if([$1], [1.10.2], [], ++ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ++]) ++ ++# _AM_AUTOCONF_VERSION(VERSION) ++# ----------------------------- ++# aclocal traces this macro to find the Autoconf version. ++# This is a private macro too. Using m4_define simplifies ++# the logic in aclocal, which can simply ignore this definition. ++m4_define([_AM_AUTOCONF_VERSION], []) + + # AM_SET_CURRENT_AUTOMAKE_VERSION + # ------------------------------- +-# Call AM_AUTOMAKE_VERSION so it can be traced. +-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. ++# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. ++# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +- [AM_AUTOMAKE_VERSION([1.9.6])]) ++[AM_AUTOMAKE_VERSION([1.10.2])dnl ++m4_ifndef([AC_AUTOCONF_VERSION], ++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl ++_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + + # AM_AUX_DIR_EXPAND -*- Autoconf -*- + +@@ -8369,14 +8446,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd` + + # AM_CONDITIONAL -*- Autoconf -*- + +-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 ++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 7 ++# serial 8 + + # AM_CONDITIONAL(NAME, SHELL-CONDITION) + # ------------------------------------- +@@ -8385,8 +8462,10 @@ AC_DEFUN([AM_CONDITIONAL], + [AC_PREREQ(2.52)dnl + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +-AC_SUBST([$1_TRUE]) +-AC_SUBST([$1_FALSE]) ++AC_SUBST([$1_TRUE])dnl ++AC_SUBST([$1_FALSE])dnl ++_AM_SUBST_NOTMAKE([$1_TRUE])dnl ++_AM_SUBST_NOTMAKE([$1_FALSE])dnl + if $2; then + $1_TRUE= + $1_FALSE='#' +@@ -8400,15 +8479,14 @@ AC_CONFIG_COMMANDS_PRE( + Usually this means the macro was only invoked conditionally.]]) + fi])]) + +- +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 8 ++# serial 9 + + # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be + # written in clear, in which case automake, when reading aclocal.m4, +@@ -8436,6 +8514,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl + ifelse([$1], CC, [depcc="$CC" am_compiler_list=], + [$1], CXX, [depcc="$CXX" am_compiler_list=], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], ++ [$1], UPC, [depcc="$UPC" am_compiler_list=], + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + +@@ -8501,6 +8580,7 @@ AC_CACHE_CHECK([dependency style of $dep + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +@@ -8553,24 +8633,34 @@ if test "x$enable_dependency_tracking" ! + AMDEPBACKSLASH='\' + fi + AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +-AC_SUBST([AMDEPBACKSLASH]) ++AC_SUBST([AMDEPBACKSLASH])dnl ++_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl + ]) + + # Generate code to set up dependency tracking. -*- Autoconf -*- + +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-#serial 3 ++#serial 4 + + # _AM_OUTPUT_DEPENDENCY_COMMANDS + # ------------------------------ + AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +-[for mf in $CONFIG_FILES; do ++[# Autoconf 2.62 quotes --file arguments for eval, but not when files ++# are listed without --file. Let's play safe and only enable the eval ++# if we detect the quoting. ++case $CONFIG_FILES in ++*\'*) eval set x "$CONFIG_FILES" ;; ++*) set x $CONFIG_FILES ;; ++esac ++shift ++for mf ++do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. +@@ -8578,8 +8668,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. +- # So let's grep whole file. +- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue +@@ -8638,14 +8729,14 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_ + + # Do all the work for Automake. -*- Autoconf -*- + +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +-# Free Software Foundation, Inc. ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ++# 2005, 2006, 2008 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 12 ++# serial 13 + + # This macro actually does too much. Some checks are only needed if + # your package does certain things. But this isn't really a big deal. +@@ -8662,16 +8753,20 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_ + # arguments mandatory, and then we can depend on a new Autoconf + # release and drop the old call support. + AC_DEFUN([AM_INIT_AUTOMAKE], +-[AC_PREREQ([2.58])dnl ++[AC_PREREQ([2.60])dnl + dnl Autoconf wants to disallow AM_ names. We explicitly allow + dnl the ones we care about. + m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl + AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl + AC_REQUIRE([AC_PROG_INSTALL])dnl +-# test to see if srcdir already configured +-if test "`cd $srcdir && pwd`" != "`pwd`" && +- test -f $srcdir/config.status; then +- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) ++if test "`cd $srcdir && pwd`" != "`pwd`"; then ++ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output ++ # is not polluted with repeated "-I." ++ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl ++ # test to see if srcdir already configured ++ if test -f $srcdir/config.status; then ++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) ++ fi + fi + + # test whether we have cygpath +@@ -8691,6 +8786,9 @@ m4_ifval([$2], + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], + [_AM_SET_OPTIONS([$1])dnl ++dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. ++m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, ++ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +@@ -8726,6 +8824,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ++AC_PROVIDE_IFELSE([AC_PROG_OBJC], ++ [_AM_DEPENDENCIES(OBJC)], ++ [define([AC_PROG_OBJC], ++ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + ]) + ]) + +@@ -8739,16 +8841,17 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX], + # our stamp files there. + AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], + [# Compute $1's index in $config_headers. ++_am_arg=$1 + _am_stamp_count=1 + for _am_header in $config_headers :; do + case $_am_header in +- $1 | $1:* ) ++ $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac + done +-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) ++echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + + # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. + # +@@ -8761,7 +8864,7 @@ echo "timestamp for $1" >`AS_DIRNAME([$1 + # Define $install_sh. + AC_DEFUN([AM_PROG_INSTALL_SH], + [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-install_sh=${install_sh-"$am_aux_dir/install-sh"} ++install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} + AC_SUBST(install_sh)]) + + # Copyright (C) 2003, 2005 Free Software Foundation, Inc. +@@ -8785,6 +8888,35 @@ fi + rmdir .tst 2>/dev/null + AC_SUBST([am__leading_dot])]) + ++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- ++# From Jim Meyering ++ ++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 4 ++ ++AC_DEFUN([AM_MAINTAINER_MODE], ++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) ++ dnl maintainer-mode is disabled by default ++ AC_ARG_ENABLE(maintainer-mode, ++[ --enable-maintainer-mode enable make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer], ++ USE_MAINTAINER_MODE=$enableval, ++ USE_MAINTAINER_MODE=no) ++ AC_MSG_RESULT([$USE_MAINTAINER_MODE]) ++ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) ++ MAINT=$MAINTAINER_MODE_TRUE ++ AC_SUBST(MAINT)dnl ++] ++) ++ ++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) ++ + # Check to see how 'make' treats includes. -*- Autoconf -*- + + # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +@@ -8839,14 +8971,14 @@ rm -f confinc confmf + + # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 ++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 4 ++# serial 5 + + # AM_MISSING_PROG(NAME, PROGRAM) + # ------------------------------ +@@ -8862,6 +8994,7 @@ AC_SUBST($1)]) + # If it does, set am_missing_run to use it, otherwise, to nothing. + AC_DEFUN([AM_MISSING_HAS_RUN], + [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++AC_REQUIRE_AUX_FILE([missing])dnl + test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" + # Use eval to expand $SHELL + if eval "$MISSING --run true"; then +@@ -8872,7 +9005,7 @@ else + fi + ]) + +-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. ++# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -8880,70 +9013,33 @@ fi + + # AM_PROG_MKDIR_P + # --------------- +-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. +-# +-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories +-# created by `make install' are always world readable, even if the +-# installer happens to have an overly restrictive umask (e.g. 077). +-# This was a mistake. There are at least two reasons why we must not +-# use `-m 0755': +-# - it causes special bits like SGID to be ignored, +-# - it may be too restrictive (some setups expect 775 directories). +-# +-# Do not use -m 0755 and let people choose whatever they expect by +-# setting umask. +-# +-# We cannot accept any implementation of `mkdir' that recognizes `-p'. +-# Some implementations (such as Solaris 8's) are not thread-safe: if a +-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' +-# concurrently, both version can detect that a/ is missing, but only +-# one can create it and the other will error out. Consequently we +-# restrict ourselves to GNU make (using the --version option ensures +-# this.) ++# Check for `mkdir -p'. + AC_DEFUN([AM_PROG_MKDIR_P], +-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then +- # We used to keeping the `.' as first argument, in order to +- # allow $(mkdir_p) to be used without argument. As in +- # $(mkdir_p) $(somedir) +- # where $(somedir) is conditionally defined. However this is wrong +- # for two reasons: +- # 1. if the package is installed by a user who cannot write `.' +- # make install will fail, +- # 2. the above comment should most certainly read +- # $(mkdir_p) $(DESTDIR)$(somedir) +- # so it does not work when $(somedir) is undefined and +- # $(DESTDIR) is not. +- # To support the latter case, we have to write +- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), +- # so the `.' trick is pointless. +- mkdir_p='mkdir -p --' +-else +- # On NextStep and OpenStep, the `mkdir' command does not +- # recognize any option. It will interpret all options as +- # directories to create, and then abort because `.' already +- # exists. +- for d in ./-p ./--version; +- do +- test -d $d && rmdir $d +- done +- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. +- if test -f "$ac_aux_dir/mkinstalldirs"; then +- mkdir_p='$(mkinstalldirs)' +- else +- mkdir_p='$(install_sh) -d' +- fi +-fi +-AC_SUBST([mkdir_p])]) ++[AC_PREREQ([2.60])dnl ++AC_REQUIRE([AC_PROG_MKDIR_P])dnl ++dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, ++dnl while keeping a definition of mkdir_p for backward compatibility. ++dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. ++dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of ++dnl Makefile.ins that do not define MKDIR_P, so we do our own ++dnl adjustment using top_builddir (which is defined more often than ++dnl MKDIR_P). ++AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl ++case $mkdir_p in ++ [[\\/$]]* | ?:[[\\/]]*) ;; ++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; ++esac ++]) + + # Helper functions for option handling. -*- Autoconf -*- + +-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. ++# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 3 ++# serial 4 + + # _AM_MANGLE_OPTION(NAME) + # ----------------------- +@@ -8960,7 +9056,7 @@ AC_DEFUN([_AM_SET_OPTION], + # ---------------------------------- + # OPTIONS is a space-separated list of Automake options. + AC_DEFUN([_AM_SET_OPTIONS], +-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) ++[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + + # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) + # ------------------------------------------- +@@ -9226,9 +9322,21 @@ dnl Don't test for $cross_compiling = ye + if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) + fi +-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" ++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + AC_SUBST([INSTALL_STRIP_PROGRAM])]) + ++# Copyright (C) 2006 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# _AM_SUBST_NOTMAKE(VARIABLE) ++# --------------------------- ++# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. ++# This macro is traced by Automake. ++AC_DEFUN([_AM_SUBST_NOTMAKE]) ++ + # Check how to create a tarball. -*- Autoconf -*- + + # Copyright (C) 2004, 2005 Free Software Foundation, Inc. +Index: pygtk-2.14.1/config.guess +=================================================================== +--- pygtk-2.14.1.orig/config.guess 2009-05-29 09:25:12.557608219 +0200 ++++ pygtk-2.14.1/config.guess 2009-05-29 09:24:31.693605240 +0200 +@@ -4,7 +4,7 @@ + # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 + # Free Software Foundation, Inc. + +-timestamp='2008-01-23' ++timestamp='2009-04-27' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -324,6 +324,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; ++ s390x:SunOS:*:*) ++ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; +@@ -331,7 +334,20 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) +- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ eval $set_cc_for_build ++ SUN_ARCH="i386" ++ # If there is a compiler, see if it is configured for 64-bit objects. ++ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. ++ # This test works for both compilers. ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ SUN_ARCH="x86_64" ++ fi ++ fi ++ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize +@@ -796,7 +812,7 @@ EOF + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; +- EM64T | authenticamd) ++ EM64T | authenticamd | genuineintel) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) +@@ -935,6 +951,9 @@ EOF + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit ;; ++ padre:Linux:*:*) ++ echo sparc-unknown-linux-gnu ++ exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in +@@ -985,9 +1004,6 @@ EOF + a.out-i386-linux) + echo "${UNAME_MACHINE}-pc-linux-gnuaout" + exit ;; +- coff-i386) +- echo "${UNAME_MACHINE}-pc-linux-gnucoff" +- exit ;; + "") + # Either a pre-BFD a.out linker (linux-gnuoldld) or + # one that does not give us useful --help. +@@ -1102,8 +1118,11 @@ EOF + pc:*:*:*) + # Left here for compatibility: + # uname -m prints for DJGPP always 'pc', but it prints nothing about +- # the processor, so we play safe by assuming i386. +- echo i386-pc-msdosdjgpp ++ # the processor, so we play safe by assuming i586. ++ # Note: whatever this is, it MUST be the same as what config.sub ++ # prints for the "djgpp" host, or else GDB configury will decide that ++ # this is a cross-build. ++ echo i586-pc-msdosdjgpp + exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 +@@ -1141,6 +1160,16 @@ EOF + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; ++ NCR*:*:4.2:* | MPRAS*:*:4.2:*) ++ OS_REL='.3' ++ test -r /etc/.relid \ ++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit ;; +@@ -1216,6 +1245,9 @@ EOF + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit ;; ++ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. ++ echo i586-pc-haiku ++ exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; +@@ -1324,6 +1356,9 @@ EOF + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; ++ i*86:AROS:*:*) ++ echo ${UNAME_MACHINE}-pc-aros ++ exit ;; + esac + + #echo '(No uname command or uname output not recognized.)' 1>&2 +Index: pygtk-2.14.1/config.sub +=================================================================== +--- pygtk-2.14.1.orig/config.sub 2009-05-29 09:25:12.441111846 +0200 ++++ pygtk-2.14.1/config.sub 2009-05-29 09:24:31.721604887 +0200 +@@ -4,7 +4,7 @@ + # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 + # Free Software Foundation, Inc. + +-timestamp='2008-01-16' ++timestamp='2009-04-17' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -122,6 +122,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^- + case $maybe_os in + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ ++ kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` +@@ -249,13 +250,16 @@ case $basic_machine in + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ ++ | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ +- | maxq | mb | microblaze | mcore | mep \ ++ | maxq | mb | microblaze | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ +- | mips64vr | mips64vrel \ ++ | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ ++ | mips64r5900 | mips64r5900el \ ++ | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ +@@ -268,6 +272,7 @@ case $basic_machine in + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ ++ | moxie \ + | mt \ + | msp430 \ + | nios | nios2 \ +@@ -277,7 +282,7 @@ case $basic_machine in + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ + | score \ +- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ ++ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ +@@ -286,7 +291,7 @@ case $basic_machine in + | v850 | v850e \ + | we32k \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ +- | z8k) ++ | z8k | z80) + basic_machine=$basic_machine-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12) +@@ -329,14 +334,17 @@ case $basic_machine in + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ ++ | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ +- | m88110-* | m88k-* | maxq-* | mcore-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ +- | mips64vr-* | mips64vrel-* \ ++ | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ ++ | mips64r5900-* | mips64r5900el-* \ ++ | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ +@@ -358,20 +366,20 @@ case $basic_machine in + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ + | romp-* | rs6000-* \ +- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ ++ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ +- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ ++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | tron-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ +- | z8k-*) ++ | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) +@@ -439,6 +447,10 @@ case $basic_machine in + basic_machine=m68k-apollo + os=-bsd + ;; ++ aros) ++ basic_machine=i386-pc ++ os=-aros ++ ;; + aux) + basic_machine=m68k-apple + os=-aux +@@ -459,6 +471,10 @@ case $basic_machine in + basic_machine=c90-cray + os=-unicos + ;; ++ cegcc) ++ basic_machine=arm-unknown ++ os=-cegcc ++ ;; + convex-c1) + basic_machine=c1-convex + os=-bsd +@@ -526,6 +542,10 @@ case $basic_machine in + basic_machine=m88k-motorola + os=-sysv3 + ;; ++ dicos) ++ basic_machine=i686-pc ++ os=-dicos ++ ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp +@@ -1128,6 +1148,10 @@ case $basic_machine in + basic_machine=z8k-unknown + os=-sim + ;; ++ z80-*-coff) ++ basic_machine=z80-unknown ++ os=-sim ++ ;; + none) + basic_machine=none-none + os=-none +@@ -1166,7 +1190,7 @@ case $basic_machine in + we32k) + basic_machine=we32k-att + ;; +- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) ++ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) +@@ -1238,8 +1262,9 @@ case $os in + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ ++ | -kopensolaris* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ +- | -aos* \ ++ | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ +@@ -1248,7 +1273,7 @@ case $os in + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ +- | -chorusos* | -chorusrdb* \ ++ | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ +@@ -1388,6 +1413,9 @@ case $os in + -zvmoe) + os=-zvmoe + ;; ++ -dicos*) ++ os=-dicos ++ ;; + -none) + ;; + *) +Index: pygtk-2.14.1/depcomp +=================================================================== +--- pygtk-2.14.1.orig/depcomp 2009-05-29 09:25:11.897609103 +0200 ++++ pygtk-2.14.1/depcomp 2009-05-29 09:24:32.621605944 +0200 +@@ -1,9 +1,10 @@ + #! /bin/sh + # depcomp - compile a program generating dependencies as side-effects + +-scriptversion=2005-07-09.11 ++scriptversion=2007-03-29.01 + +-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. ++# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software ++# Foundation, Inc. + + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +@@ -91,7 +92,20 @@ gcc3) + ## gcc 3 implements dependency tracking that does exactly what + ## we want. Yay! Note: for some reason libtool 1.4 doesn't like + ## it if -MD -MP comes after the -MF stuff. Hmm. +- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" ++## Unfortunately, FreeBSD c89 acceptance of flags depends upon ++## the command line argument order; so add the flags where they ++## appear in depend2.am. Note that the slowdown incurred here ++## affects only configure: in makefiles, %FASTDEP% shortcuts this. ++ for arg ++ do ++ case $arg in ++ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; ++ *) set fnord "$@" "$arg" ;; ++ esac ++ shift # fnord ++ shift # $arg ++ done ++ "$@" + stat=$? + if test $stat -eq 0; then : + else +@@ -201,34 +215,39 @@ aix) + # current directory. Also, the AIX compiler puts `$object:' at the + # start of each line; $object doesn't have directory information. + # Version 6 uses the directory in both cases. +- stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` +- tmpdepfile="$stripped.u" ++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` ++ test "x$dir" = "x$object" && dir= ++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + if test "$libtool" = yes; then ++ tmpdepfile1=$dir$base.u ++ tmpdepfile2=$base.u ++ tmpdepfile3=$dir.libs/$base.u + "$@" -Wc,-M + else ++ tmpdepfile1=$dir$base.u ++ tmpdepfile2=$dir$base.u ++ tmpdepfile3=$dir$base.u + "$@" -M + fi + stat=$? + +- if test -f "$tmpdepfile"; then : +- else +- stripped=`echo "$stripped" | sed 's,^.*/,,'` +- tmpdepfile="$stripped.u" +- fi +- + if test $stat -eq 0; then : + else +- rm -f "$tmpdepfile" ++ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi + ++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" ++ do ++ test -f "$tmpdepfile" && break ++ done + if test -f "$tmpdepfile"; then +- outname="$stripped.o" + # Each line is of the form `foo.o: dependent.h'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. +- sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" +- sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" ++ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" ++ # That's a tab and a space in the []. ++ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile +@@ -276,6 +295,46 @@ icc) + rm -f "$tmpdepfile" + ;; + ++hp2) ++ # The "hp" stanza above does not work with aCC (C++) and HP's ia64 ++ # compilers, which have integrated preprocessors. The correct option ++ # to use with these is +Maked; it writes dependencies to a file named ++ # 'foo.d', which lands next to the object file, wherever that ++ # happens to be. ++ # Much of this is similar to the tru64 case; see comments there. ++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` ++ test "x$dir" = "x$object" && dir= ++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` ++ if test "$libtool" = yes; then ++ tmpdepfile1=$dir$base.d ++ tmpdepfile2=$dir.libs/$base.d ++ "$@" -Wc,+Maked ++ else ++ tmpdepfile1=$dir$base.d ++ tmpdepfile2=$dir$base.d ++ "$@" +Maked ++ fi ++ stat=$? ++ if test $stat -eq 0; then : ++ else ++ rm -f "$tmpdepfile1" "$tmpdepfile2" ++ exit $stat ++ fi ++ ++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" ++ do ++ test -f "$tmpdepfile" && break ++ done ++ if test -f "$tmpdepfile"; then ++ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" ++ # Add `dependent.h:' lines. ++ sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" ++ else ++ echo "#dummy" > "$depfile" ++ fi ++ rm -f "$tmpdepfile" "$tmpdepfile2" ++ ;; ++ + tru64) + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. +@@ -288,13 +347,13 @@ tru64) + + if test "$libtool" = yes; then + # With Tru64 cc, shared objects can also be used to make a +- # static library. This mecanism is used in libtool 1.4 series to ++ # static library. This mechanism is used in libtool 1.4 series to + # handle both shared and static libraries in a single compilation. + # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. + # + # With libtool 1.5 this exception was removed, and libtool now + # generates 2 separate objects for the 2 libraries. These two +- # compilations output dependencies in in $dir.libs/$base.o.d and ++ # compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is +Index: pygtk-2.14.1/docs/Makefile.in +=================================================================== +--- pygtk-2.14.1.orig/docs/Makefile.in 2009-05-29 09:25:13.377103914 +0200 ++++ pygtk-2.14.1/docs/Makefile.in 2009-05-29 09:24:32.065603788 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,15 +14,11 @@ + + @SET_MAKE@ + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -60,8 +56,6 @@ DATA = $(CSS_DATA) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -71,18 +65,6 @@ AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-BUILD_ATK_FALSE = @BUILD_ATK_FALSE@ +-BUILD_ATK_TRUE = @BUILD_ATK_TRUE@ +-BUILD_GTKUNIXPRINT_FALSE = @BUILD_GTKUNIXPRINT_FALSE@ +-BUILD_GTKUNIXPRINT_TRUE = @BUILD_GTKUNIXPRINT_TRUE@ +-BUILD_GTK_FALSE = @BUILD_GTK_FALSE@ +-BUILD_GTK_TRUE = @BUILD_GTK_TRUE@ +-BUILD_LIBGLADE_FALSE = @BUILD_LIBGLADE_FALSE@ +-BUILD_LIBGLADE_TRUE = @BUILD_LIBGLADE_TRUE@ +-BUILD_PANGOCAIRO_FALSE = @BUILD_PANGOCAIRO_FALSE@ +-BUILD_PANGOCAIRO_TRUE = @BUILD_PANGOCAIRO_TRUE@ +-BUILD_PANGO_FALSE = @BUILD_PANGO_FALSE@ +-BUILD_PANGO_TRUE = @BUILD_PANGO_TRUE@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +@@ -99,8 +81,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +-ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ + EXEEXT = @EXEEXT@ + FGREP = @FGREP@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -120,14 +100,9 @@ GTKUNIXPRINT_LIBS = @GTKUNIXPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HAVE_GTK_2_10 = @HAVE_GTK_2_10@ +-HAVE_GTK_2_10_FALSE = @HAVE_GTK_2_10_FALSE@ +-HAVE_GTK_2_10_TRUE = @HAVE_GTK_2_10_TRUE@ + HAVE_GTK_2_12 = @HAVE_GTK_2_12@ +-HAVE_GTK_2_12_FALSE = @HAVE_GTK_2_12_FALSE@ +-HAVE_GTK_2_12_TRUE = @HAVE_GTK_2_12_TRUE@ + HAVE_GTK_2_14 = @HAVE_GTK_2_14@ +-HAVE_GTK_2_14_FALSE = @HAVE_GTK_2_14_FALSE@ +-HAVE_GTK_2_14_TRUE = @HAVE_GTK_2_14_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -142,13 +117,13 @@ LIBTOOL = @LIBTOOL@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -163,8 +138,6 @@ PANGO_CFLAGS = @PANGO_CFLAGS@ + PANGO_LIBS = @PANGO_LIBS@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@ + PYCAIRO_LIBS = @PYCAIRO_LIBS@ + PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@ +@@ -191,10 +164,12 @@ STRIP = @STRIP@ + THREADING_CFLAGS = @THREADING_CFLAGS@ + VERSION = @VERSION@ + XSLTPROC = @XSLTPROC@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -206,6 +181,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -238,8 +214,12 @@ pyexecdir = @pyexecdir@ + pythondir = @pythondir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + BUILDDIR = $(top_builddir)/docs + REF_VERSION = $(PYGTK_MAJOR_VERSION).$(PYGTK_MINOR_VERSION) + FULL_VERSION = $(REF_VERSION).$(PYGTK_MICRO_VERSION) +@@ -842,12 +822,12 @@ all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -867,9 +847,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + mostlyclean-libtool: +@@ -877,13 +857,9 @@ mostlyclean-libtool: + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + install-CSSDATA: $(CSS_DATA) + @$(NORMAL_INSTALL) +- test -z "$(CSSdir)" || $(mkdir_p) "$(DESTDIR)$(CSSdir)" ++ test -z "$(CSSdir)" || $(MKDIR_P) "$(DESTDIR)$(CSSdir)" + @list='$(CSS_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -906,23 +882,21 @@ CTAGS: + + + distdir: $(DISTFILES) +- $(mkdir_p) $(distdir)/html $(distdir)/reference +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -942,7 +916,7 @@ check: $(BUILT_SOURCES) + all-am: Makefile $(DATA) + installdirs: + for dir in "$(DESTDIR)$(CSSdir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am +@@ -977,7 +951,7 @@ clean-am: clean-generic clean-libtool mo + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -993,12 +967,20 @@ install-data-am: install-CSSDATA install + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -1017,19 +999,22 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-CSSDATA uninstall-info-am uninstall-local ++uninstall-am: uninstall-CSSDATA uninstall-local ++ ++.MAKE: install-am install-data-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + dist-hook distclean distclean-generic distclean-libtool \ + distdir dvi dvi-am html html-am info info-am install \ + install-CSSDATA install-am install-data install-data-am \ +- install-data-hook install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ ++ install-data-hook install-data-local install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-CSSDATA uninstall-am uninstall-info-am \ +- uninstall-local ++ uninstall uninstall-CSSDATA uninstall-am uninstall-local + + + dist-hook: +Index: pygtk-2.14.1/examples/Makefile.in +=================================================================== +--- pygtk-2.14.1.orig/examples/Makefile.in 2009-05-29 09:25:17.261108094 +0200 ++++ pygtk-2.14.1/examples/Makefile.in 2009-05-29 09:24:32.221601884 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,15 +15,11 @@ + @SET_MAKE@ + + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -68,8 +64,6 @@ DATA = $(demoimg_DATA) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -79,18 +73,6 @@ AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-BUILD_ATK_FALSE = @BUILD_ATK_FALSE@ +-BUILD_ATK_TRUE = @BUILD_ATK_TRUE@ +-BUILD_GTKUNIXPRINT_FALSE = @BUILD_GTKUNIXPRINT_FALSE@ +-BUILD_GTKUNIXPRINT_TRUE = @BUILD_GTKUNIXPRINT_TRUE@ +-BUILD_GTK_FALSE = @BUILD_GTK_FALSE@ +-BUILD_GTK_TRUE = @BUILD_GTK_TRUE@ +-BUILD_LIBGLADE_FALSE = @BUILD_LIBGLADE_FALSE@ +-BUILD_LIBGLADE_TRUE = @BUILD_LIBGLADE_TRUE@ +-BUILD_PANGOCAIRO_FALSE = @BUILD_PANGOCAIRO_FALSE@ +-BUILD_PANGOCAIRO_TRUE = @BUILD_PANGOCAIRO_TRUE@ +-BUILD_PANGO_FALSE = @BUILD_PANGO_FALSE@ +-BUILD_PANGO_TRUE = @BUILD_PANGO_TRUE@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +@@ -107,8 +89,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +-ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ + EXEEXT = @EXEEXT@ + FGREP = @FGREP@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -128,14 +108,9 @@ GTKUNIXPRINT_LIBS = @GTKUNIXPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HAVE_GTK_2_10 = @HAVE_GTK_2_10@ +-HAVE_GTK_2_10_FALSE = @HAVE_GTK_2_10_FALSE@ +-HAVE_GTK_2_10_TRUE = @HAVE_GTK_2_10_TRUE@ + HAVE_GTK_2_12 = @HAVE_GTK_2_12@ +-HAVE_GTK_2_12_FALSE = @HAVE_GTK_2_12_FALSE@ +-HAVE_GTK_2_12_TRUE = @HAVE_GTK_2_12_TRUE@ + HAVE_GTK_2_14 = @HAVE_GTK_2_14@ +-HAVE_GTK_2_14_FALSE = @HAVE_GTK_2_14_FALSE@ +-HAVE_GTK_2_14_TRUE = @HAVE_GTK_2_14_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -150,13 +125,13 @@ LIBTOOL = @LIBTOOL@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -171,8 +146,6 @@ PANGO_CFLAGS = @PANGO_CFLAGS@ + PANGO_LIBS = @PANGO_LIBS@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@ + PYCAIRO_LIBS = @PYCAIRO_LIBS@ + PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@ +@@ -199,10 +172,12 @@ STRIP = @STRIP@ + THREADING_CFLAGS = @THREADING_CFLAGS@ + VERSION = @VERSION@ + XSLTPROC = @XSLTPROC@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -214,6 +189,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -246,8 +222,12 @@ pyexecdir = @pyexecdir@ + pythondir = @pythondir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + pygtklibdir = $(libdir)/pygtk/2.0 + pygtklib_PYTHON = pygtk-demo/pygtk-demo.py + demodir = $(pygtklibdir)/demos +@@ -315,12 +295,12 @@ demoimg_DATA = \ + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -340,13 +320,13 @@ Makefile: $(srcdir)/Makefile.in $(top_bu + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-binSCRIPTS: $(bin_SCRIPTS) + @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + @list='$(bin_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ +@@ -369,13 +349,9 @@ mostlyclean-libtool: + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + install-demoPYTHON: $(demo_PYTHON) + @$(NORMAL_INSTALL) +- test -z "$(demodir)" || $(mkdir_p) "$(DESTDIR)$(demodir)" ++ test -z "$(demodir)" || $(MKDIR_P) "$(DESTDIR)$(demodir)" + @list='$(demo_PYTHON)'; dlist=''; for p in $$list; do\ + if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \ + if test -f $$b$$p; then \ +@@ -403,7 +379,7 @@ uninstall-demoPYTHON: + done + install-pygtklibPYTHON: $(pygtklib_PYTHON) + @$(NORMAL_INSTALL) +- test -z "$(pygtklibdir)" || $(mkdir_p) "$(DESTDIR)$(pygtklibdir)" ++ test -z "$(pygtklibdir)" || $(MKDIR_P) "$(DESTDIR)$(pygtklibdir)" + @list='$(pygtklib_PYTHON)'; dlist=''; for p in $$list; do\ + if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \ + if test -f $$b$$p; then \ +@@ -431,7 +407,7 @@ uninstall-pygtklibPYTHON: + done + install-demoimgDATA: $(demoimg_DATA) + @$(NORMAL_INSTALL) +- test -z "$(demoimgdir)" || $(mkdir_p) "$(DESTDIR)$(demoimgdir)" ++ test -z "$(demoimgdir)" || $(MKDIR_P) "$(DESTDIR)$(demoimgdir)" + @list='$(demoimg_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -454,23 +430,21 @@ CTAGS: + + + distdir: $(DISTFILES) +- $(mkdir_p) $(distdir)/atk $(distdir)/glade $(distdir)/gobject $(distdir)/gtk $(distdir)/ide $(distdir)/pango $(distdir)/pygtk-demo $(distdir)/pygtk-demo/demos $(distdir)/pygtk-demo/demos/images $(distdir)/simple +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -486,7 +460,7 @@ check: check-am + all-am: Makefile $(SCRIPTS) $(DATA) + installdirs: + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(demodir)" "$(DESTDIR)$(pygtklibdir)" "$(DESTDIR)$(demoimgdir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -519,7 +493,7 @@ clean-am: clean-generic clean-libtool mo + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -534,12 +508,20 @@ info-am: + install-data-am: install-demoPYTHON install-demoimgDATA \ + install-pygtklibPYTHON + ++install-dvi: install-dvi-am ++ + install-exec-am: install-binSCRIPTS + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -559,22 +541,24 @@ ps: ps-am + ps-am: + + uninstall-am: uninstall-binSCRIPTS uninstall-demoPYTHON \ +- uninstall-demoimgDATA uninstall-info-am \ +- uninstall-pygtklibPYTHON ++ uninstall-demoimgDATA uninstall-pygtklibPYTHON ++ ++.MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-binSCRIPTS install-data install-data-am \ +- install-demoPYTHON install-demoimgDATA install-exec \ +- install-exec-am install-info install-info-am install-man \ ++ install-demoPYTHON install-demoimgDATA install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-pygtklibPYTHON install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-binSCRIPTS uninstall-demoPYTHON \ +- uninstall-demoimgDATA uninstall-info-am \ +- uninstall-pygtklibPYTHON ++ uninstall-demoimgDATA uninstall-pygtklibPYTHON + + pygtk-demo/pygtk-demo: pygtk-demo/pygtk-demo.in + @mkdir -p pygtk-demo +Index: pygtk-2.14.1/gtk/Makefile.in +=================================================================== +--- pygtk-2.14.1.orig/gtk/Makefile.in 2009-05-29 09:25:12.949109512 +0200 ++++ pygtk-2.14.1/gtk/Makefile.in 2009-05-29 09:24:32.461605794 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,14 +16,10 @@ + + + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-top_builddir = .. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -87,30 +83,40 @@ am__gtk_la_OBJECTS = _gtk_la-gtk-types.l + _gtk_la-pygtktreemodel.lo + nodist__gtk_la_OBJECTS = _gtk_la-gtk.lo _gtk_la-gdk.lo + _gtk_la_OBJECTS = $(am__gtk_la_OBJECTS) $(nodist__gtk_la_OBJECTS) ++_gtk_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(_gtk_la_CFLAGS) $(CFLAGS) \ ++ $(_gtk_la_LDFLAGS) $(LDFLAGS) -o $@ + @BUILD_GTK_TRUE@am__gtk_la_rpath = -rpath $(pygtkexecdir) + glade_la_DEPENDENCIES = $(am__DEPENDENCIES_1) + am_glade_la_OBJECTS = glade_la-libglademodule.lo + nodist_glade_la_OBJECTS = glade_la-libglade.lo + glade_la_OBJECTS = $(am_glade_la_OBJECTS) $(nodist_glade_la_OBJECTS) ++glade_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(glade_la_CFLAGS) $(CFLAGS) \ ++ $(glade_la_LDFLAGS) $(LDFLAGS) -o $@ + @BUILD_LIBGLADE_TRUE@am_glade_la_rpath = -rpath $(pygtkexecdir) + gtkunixprint_la_DEPENDENCIES = $(am__DEPENDENCIES_1) + am_gtkunixprint_la_OBJECTS = gtkunixprint_la-gtkunixprintmodule.lo + nodist_gtkunixprint_la_OBJECTS = gtkunixprint_la-gtkunixprint.lo + gtkunixprint_la_OBJECTS = $(am_gtkunixprint_la_OBJECTS) \ + $(nodist_gtkunixprint_la_OBJECTS) ++gtkunixprint_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(gtkunixprint_la_CFLAGS) \ ++ $(CFLAGS) $(gtkunixprint_la_LDFLAGS) $(LDFLAGS) -o $@ + @BUILD_GTKUNIXPRINT_TRUE@am_gtkunixprint_la_rpath = -rpath \ + @BUILD_GTKUNIXPRINT_TRUE@ $(pkgpyexecdir) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(_gtk_la_SOURCES) $(nodist__gtk_la_SOURCES) \ + $(glade_la_SOURCES) $(nodist_glade_la_SOURCES) \ + $(gtkunixprint_la_SOURCES) $(nodist_gtkunixprint_la_SOURCES) +@@ -130,8 +136,6 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCE + pkgincludedir = $(includedir)/pygtk-$(PLATFORM_VERSION)/pygtk + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -141,18 +145,6 @@ AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-BUILD_ATK_FALSE = @BUILD_ATK_FALSE@ +-BUILD_ATK_TRUE = @BUILD_ATK_TRUE@ +-BUILD_GTKUNIXPRINT_FALSE = @BUILD_GTKUNIXPRINT_FALSE@ +-BUILD_GTKUNIXPRINT_TRUE = @BUILD_GTKUNIXPRINT_TRUE@ +-BUILD_GTK_FALSE = @BUILD_GTK_FALSE@ +-BUILD_GTK_TRUE = @BUILD_GTK_TRUE@ +-BUILD_LIBGLADE_FALSE = @BUILD_LIBGLADE_FALSE@ +-BUILD_LIBGLADE_TRUE = @BUILD_LIBGLADE_TRUE@ +-BUILD_PANGOCAIRO_FALSE = @BUILD_PANGOCAIRO_FALSE@ +-BUILD_PANGOCAIRO_TRUE = @BUILD_PANGOCAIRO_TRUE@ +-BUILD_PANGO_FALSE = @BUILD_PANGO_FALSE@ +-BUILD_PANGO_TRUE = @BUILD_PANGO_TRUE@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +@@ -169,8 +161,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +-ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ + EXEEXT = @EXEEXT@ + FGREP = @FGREP@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -190,14 +180,9 @@ GTKUNIXPRINT_LIBS = @GTKUNIXPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HAVE_GTK_2_10 = @HAVE_GTK_2_10@ +-HAVE_GTK_2_10_FALSE = @HAVE_GTK_2_10_FALSE@ +-HAVE_GTK_2_10_TRUE = @HAVE_GTK_2_10_TRUE@ + HAVE_GTK_2_12 = @HAVE_GTK_2_12@ +-HAVE_GTK_2_12_FALSE = @HAVE_GTK_2_12_FALSE@ +-HAVE_GTK_2_12_TRUE = @HAVE_GTK_2_12_TRUE@ + HAVE_GTK_2_14 = @HAVE_GTK_2_14@ +-HAVE_GTK_2_14_FALSE = @HAVE_GTK_2_14_FALSE@ +-HAVE_GTK_2_14_TRUE = @HAVE_GTK_2_14_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -212,13 +197,13 @@ LIBTOOL = @LIBTOOL@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -233,8 +218,6 @@ PANGO_CFLAGS = @PANGO_CFLAGS@ + PANGO_LIBS = @PANGO_LIBS@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@ + PYCAIRO_LIBS = @PYCAIRO_LIBS@ + PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@ +@@ -261,10 +244,12 @@ STRIP = @STRIP@ + THREADING_CFLAGS = @THREADING_CFLAGS@ + VERSION = @VERSION@ + XSLTPROC = @XSLTPROC@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -276,6 +261,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -310,8 +296,12 @@ pyexecdir = @pyexecdir@ + pythondir = @pythondir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = 1.7 + PLATFORM_VERSION = 2.0 + +@@ -426,12 +416,12 @@ all: all-am + + .SUFFIXES: + .SUFFIXES: .c .defs .lo .o .obj +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -451,27 +441,27 @@ Makefile: $(srcdir)/Makefile.in $(top_bu + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-pkgpyexecLTLIBRARIES: $(pkgpyexec_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(pkgpyexecdir)" || $(mkdir_p) "$(DESTDIR)$(pkgpyexecdir)" ++ test -z "$(pkgpyexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgpyexecdir)" + @list='$(pkgpyexec_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pkgpyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkgpyexecdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pkgpyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkgpyexecdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkgpyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkgpyexecdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkgpyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkgpyexecdir)/$$f"; \ + else :; fi; \ + done + + uninstall-pkgpyexecLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @set -x; list='$(pkgpyexec_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(pkgpyexec_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkgpyexecdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkgpyexecdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgpyexecdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkgpyexecdir)/$$p"; \ + done + + clean-pkgpyexecLTLIBRARIES: +@@ -484,21 +474,21 @@ clean-pkgpyexecLTLIBRARIES: + done + install-pygtkexecLTLIBRARIES: $(pygtkexec_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(pygtkexecdir)" || $(mkdir_p) "$(DESTDIR)$(pygtkexecdir)" ++ test -z "$(pygtkexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pygtkexecdir)" + @list='$(pygtkexec_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pygtkexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pygtkexecdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pygtkexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pygtkexecdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pygtkexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pygtkexecdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pygtkexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pygtkexecdir)/$$f"; \ + else :; fi; \ + done + + uninstall-pygtkexecLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @set -x; list='$(pygtkexec_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(pygtkexec_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pygtkexecdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pygtkexecdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pygtkexecdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pygtkexecdir)/$$p"; \ + done + + clean-pygtkexecLTLIBRARIES: +@@ -510,11 +500,11 @@ clean-pygtkexecLTLIBRARIES: + rm -f "$${dir}/so_locations"; \ + done + _gtk.la: $(_gtk_la_OBJECTS) $(_gtk_la_DEPENDENCIES) +- $(LINK) $(am__gtk_la_rpath) $(_gtk_la_LDFLAGS) $(_gtk_la_OBJECTS) $(_gtk_la_LIBADD) $(LIBS) ++ $(_gtk_la_LINK) $(am__gtk_la_rpath) $(_gtk_la_OBJECTS) $(_gtk_la_LIBADD) $(LIBS) + glade.la: $(glade_la_OBJECTS) $(glade_la_DEPENDENCIES) +- $(LINK) $(am_glade_la_rpath) $(glade_la_LDFLAGS) $(glade_la_OBJECTS) $(glade_la_LIBADD) $(LIBS) ++ $(glade_la_LINK) $(am_glade_la_rpath) $(glade_la_OBJECTS) $(glade_la_LIBADD) $(LIBS) + gtkunixprint.la: $(gtkunixprint_la_OBJECTS) $(gtkunixprint_la_DEPENDENCIES) +- $(LINK) $(am_gtkunixprint_la_rpath) $(gtkunixprint_la_LDFLAGS) $(gtkunixprint_la_OBJECTS) $(gtkunixprint_la_LIBADD) $(LIBS) ++ $(gtkunixprint_la_LINK) $(am_gtkunixprint_la_rpath) $(gtkunixprint_la_OBJECTS) $(gtkunixprint_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -535,115 +525,111 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkunixprint_la-gtkunixprintmodule.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + _gtk_la-gtk-types.lo: gtk-types.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-gtk-types.lo -MD -MP -MF "$(DEPDIR)/_gtk_la-gtk-types.Tpo" -c -o _gtk_la-gtk-types.lo `test -f 'gtk-types.c' || echo '$(srcdir)/'`gtk-types.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/_gtk_la-gtk-types.Tpo" "$(DEPDIR)/_gtk_la-gtk-types.Plo"; else rm -f "$(DEPDIR)/_gtk_la-gtk-types.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-gtk-types.lo -MD -MP -MF $(DEPDIR)/_gtk_la-gtk-types.Tpo -c -o _gtk_la-gtk-types.lo `test -f 'gtk-types.c' || echo '$(srcdir)/'`gtk-types.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/_gtk_la-gtk-types.Tpo $(DEPDIR)/_gtk_la-gtk-types.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtk-types.c' object='_gtk_la-gtk-types.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-gtk-types.lo `test -f 'gtk-types.c' || echo '$(srcdir)/'`gtk-types.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-gtk-types.lo `test -f 'gtk-types.c' || echo '$(srcdir)/'`gtk-types.c + + _gtk_la-gtkmodule.lo: gtkmodule.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-gtkmodule.lo -MD -MP -MF "$(DEPDIR)/_gtk_la-gtkmodule.Tpo" -c -o _gtk_la-gtkmodule.lo `test -f 'gtkmodule.c' || echo '$(srcdir)/'`gtkmodule.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/_gtk_la-gtkmodule.Tpo" "$(DEPDIR)/_gtk_la-gtkmodule.Plo"; else rm -f "$(DEPDIR)/_gtk_la-gtkmodule.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-gtkmodule.lo -MD -MP -MF $(DEPDIR)/_gtk_la-gtkmodule.Tpo -c -o _gtk_la-gtkmodule.lo `test -f 'gtkmodule.c' || echo '$(srcdir)/'`gtkmodule.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/_gtk_la-gtkmodule.Tpo $(DEPDIR)/_gtk_la-gtkmodule.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkmodule.c' object='_gtk_la-gtkmodule.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-gtkmodule.lo `test -f 'gtkmodule.c' || echo '$(srcdir)/'`gtkmodule.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-gtkmodule.lo `test -f 'gtkmodule.c' || echo '$(srcdir)/'`gtkmodule.c + + _gtk_la-gtkobject-support.lo: gtkobject-support.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-gtkobject-support.lo -MD -MP -MF "$(DEPDIR)/_gtk_la-gtkobject-support.Tpo" -c -o _gtk_la-gtkobject-support.lo `test -f 'gtkobject-support.c' || echo '$(srcdir)/'`gtkobject-support.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/_gtk_la-gtkobject-support.Tpo" "$(DEPDIR)/_gtk_la-gtkobject-support.Plo"; else rm -f "$(DEPDIR)/_gtk_la-gtkobject-support.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-gtkobject-support.lo -MD -MP -MF $(DEPDIR)/_gtk_la-gtkobject-support.Tpo -c -o _gtk_la-gtkobject-support.lo `test -f 'gtkobject-support.c' || echo '$(srcdir)/'`gtkobject-support.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/_gtk_la-gtkobject-support.Tpo $(DEPDIR)/_gtk_la-gtkobject-support.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkobject-support.c' object='_gtk_la-gtkobject-support.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-gtkobject-support.lo `test -f 'gtkobject-support.c' || echo '$(srcdir)/'`gtkobject-support.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-gtkobject-support.lo `test -f 'gtkobject-support.c' || echo '$(srcdir)/'`gtkobject-support.c + + _gtk_la-pygtkcellrenderer.lo: pygtkcellrenderer.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-pygtkcellrenderer.lo -MD -MP -MF "$(DEPDIR)/_gtk_la-pygtkcellrenderer.Tpo" -c -o _gtk_la-pygtkcellrenderer.lo `test -f 'pygtkcellrenderer.c' || echo '$(srcdir)/'`pygtkcellrenderer.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/_gtk_la-pygtkcellrenderer.Tpo" "$(DEPDIR)/_gtk_la-pygtkcellrenderer.Plo"; else rm -f "$(DEPDIR)/_gtk_la-pygtkcellrenderer.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-pygtkcellrenderer.lo -MD -MP -MF $(DEPDIR)/_gtk_la-pygtkcellrenderer.Tpo -c -o _gtk_la-pygtkcellrenderer.lo `test -f 'pygtkcellrenderer.c' || echo '$(srcdir)/'`pygtkcellrenderer.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/_gtk_la-pygtkcellrenderer.Tpo $(DEPDIR)/_gtk_la-pygtkcellrenderer.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pygtkcellrenderer.c' object='_gtk_la-pygtkcellrenderer.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-pygtkcellrenderer.lo `test -f 'pygtkcellrenderer.c' || echo '$(srcdir)/'`pygtkcellrenderer.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-pygtkcellrenderer.lo `test -f 'pygtkcellrenderer.c' || echo '$(srcdir)/'`pygtkcellrenderer.c + + _gtk_la-pygtktreemodel.lo: pygtktreemodel.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-pygtktreemodel.lo -MD -MP -MF "$(DEPDIR)/_gtk_la-pygtktreemodel.Tpo" -c -o _gtk_la-pygtktreemodel.lo `test -f 'pygtktreemodel.c' || echo '$(srcdir)/'`pygtktreemodel.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/_gtk_la-pygtktreemodel.Tpo" "$(DEPDIR)/_gtk_la-pygtktreemodel.Plo"; else rm -f "$(DEPDIR)/_gtk_la-pygtktreemodel.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-pygtktreemodel.lo -MD -MP -MF $(DEPDIR)/_gtk_la-pygtktreemodel.Tpo -c -o _gtk_la-pygtktreemodel.lo `test -f 'pygtktreemodel.c' || echo '$(srcdir)/'`pygtktreemodel.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/_gtk_la-pygtktreemodel.Tpo $(DEPDIR)/_gtk_la-pygtktreemodel.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pygtktreemodel.c' object='_gtk_la-pygtktreemodel.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-pygtktreemodel.lo `test -f 'pygtktreemodel.c' || echo '$(srcdir)/'`pygtktreemodel.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-pygtktreemodel.lo `test -f 'pygtktreemodel.c' || echo '$(srcdir)/'`pygtktreemodel.c + + _gtk_la-gtk.lo: gtk.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-gtk.lo -MD -MP -MF "$(DEPDIR)/_gtk_la-gtk.Tpo" -c -o _gtk_la-gtk.lo `test -f 'gtk.c' || echo '$(srcdir)/'`gtk.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/_gtk_la-gtk.Tpo" "$(DEPDIR)/_gtk_la-gtk.Plo"; else rm -f "$(DEPDIR)/_gtk_la-gtk.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-gtk.lo -MD -MP -MF $(DEPDIR)/_gtk_la-gtk.Tpo -c -o _gtk_la-gtk.lo `test -f 'gtk.c' || echo '$(srcdir)/'`gtk.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/_gtk_la-gtk.Tpo $(DEPDIR)/_gtk_la-gtk.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtk.c' object='_gtk_la-gtk.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-gtk.lo `test -f 'gtk.c' || echo '$(srcdir)/'`gtk.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-gtk.lo `test -f 'gtk.c' || echo '$(srcdir)/'`gtk.c + + _gtk_la-gdk.lo: gdk.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-gdk.lo -MD -MP -MF "$(DEPDIR)/_gtk_la-gdk.Tpo" -c -o _gtk_la-gdk.lo `test -f 'gdk.c' || echo '$(srcdir)/'`gdk.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/_gtk_la-gdk.Tpo" "$(DEPDIR)/_gtk_la-gdk.Plo"; else rm -f "$(DEPDIR)/_gtk_la-gdk.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-gdk.lo -MD -MP -MF $(DEPDIR)/_gtk_la-gdk.Tpo -c -o _gtk_la-gdk.lo `test -f 'gdk.c' || echo '$(srcdir)/'`gdk.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/_gtk_la-gdk.Tpo $(DEPDIR)/_gtk_la-gdk.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gdk.c' object='_gtk_la-gdk.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-gdk.lo `test -f 'gdk.c' || echo '$(srcdir)/'`gdk.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-gdk.lo `test -f 'gdk.c' || echo '$(srcdir)/'`gdk.c + + glade_la-libglademodule.lo: libglademodule.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glade_la_CFLAGS) $(CFLAGS) -MT glade_la-libglademodule.lo -MD -MP -MF "$(DEPDIR)/glade_la-libglademodule.Tpo" -c -o glade_la-libglademodule.lo `test -f 'libglademodule.c' || echo '$(srcdir)/'`libglademodule.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/glade_la-libglademodule.Tpo" "$(DEPDIR)/glade_la-libglademodule.Plo"; else rm -f "$(DEPDIR)/glade_la-libglademodule.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glade_la_CFLAGS) $(CFLAGS) -MT glade_la-libglademodule.lo -MD -MP -MF $(DEPDIR)/glade_la-libglademodule.Tpo -c -o glade_la-libglademodule.lo `test -f 'libglademodule.c' || echo '$(srcdir)/'`libglademodule.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/glade_la-libglademodule.Tpo $(DEPDIR)/glade_la-libglademodule.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libglademodule.c' object='glade_la-libglademodule.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glade_la_CFLAGS) $(CFLAGS) -c -o glade_la-libglademodule.lo `test -f 'libglademodule.c' || echo '$(srcdir)/'`libglademodule.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glade_la_CFLAGS) $(CFLAGS) -c -o glade_la-libglademodule.lo `test -f 'libglademodule.c' || echo '$(srcdir)/'`libglademodule.c + + glade_la-libglade.lo: libglade.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glade_la_CFLAGS) $(CFLAGS) -MT glade_la-libglade.lo -MD -MP -MF "$(DEPDIR)/glade_la-libglade.Tpo" -c -o glade_la-libglade.lo `test -f 'libglade.c' || echo '$(srcdir)/'`libglade.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/glade_la-libglade.Tpo" "$(DEPDIR)/glade_la-libglade.Plo"; else rm -f "$(DEPDIR)/glade_la-libglade.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glade_la_CFLAGS) $(CFLAGS) -MT glade_la-libglade.lo -MD -MP -MF $(DEPDIR)/glade_la-libglade.Tpo -c -o glade_la-libglade.lo `test -f 'libglade.c' || echo '$(srcdir)/'`libglade.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/glade_la-libglade.Tpo $(DEPDIR)/glade_la-libglade.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libglade.c' object='glade_la-libglade.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glade_la_CFLAGS) $(CFLAGS) -c -o glade_la-libglade.lo `test -f 'libglade.c' || echo '$(srcdir)/'`libglade.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glade_la_CFLAGS) $(CFLAGS) -c -o glade_la-libglade.lo `test -f 'libglade.c' || echo '$(srcdir)/'`libglade.c + + gtkunixprint_la-gtkunixprintmodule.lo: gtkunixprintmodule.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtkunixprint_la_CFLAGS) $(CFLAGS) -MT gtkunixprint_la-gtkunixprintmodule.lo -MD -MP -MF "$(DEPDIR)/gtkunixprint_la-gtkunixprintmodule.Tpo" -c -o gtkunixprint_la-gtkunixprintmodule.lo `test -f 'gtkunixprintmodule.c' || echo '$(srcdir)/'`gtkunixprintmodule.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/gtkunixprint_la-gtkunixprintmodule.Tpo" "$(DEPDIR)/gtkunixprint_la-gtkunixprintmodule.Plo"; else rm -f "$(DEPDIR)/gtkunixprint_la-gtkunixprintmodule.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtkunixprint_la_CFLAGS) $(CFLAGS) -MT gtkunixprint_la-gtkunixprintmodule.lo -MD -MP -MF $(DEPDIR)/gtkunixprint_la-gtkunixprintmodule.Tpo -c -o gtkunixprint_la-gtkunixprintmodule.lo `test -f 'gtkunixprintmodule.c' || echo '$(srcdir)/'`gtkunixprintmodule.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gtkunixprint_la-gtkunixprintmodule.Tpo $(DEPDIR)/gtkunixprint_la-gtkunixprintmodule.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkunixprintmodule.c' object='gtkunixprint_la-gtkunixprintmodule.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtkunixprint_la_CFLAGS) $(CFLAGS) -c -o gtkunixprint_la-gtkunixprintmodule.lo `test -f 'gtkunixprintmodule.c' || echo '$(srcdir)/'`gtkunixprintmodule.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtkunixprint_la_CFLAGS) $(CFLAGS) -c -o gtkunixprint_la-gtkunixprintmodule.lo `test -f 'gtkunixprintmodule.c' || echo '$(srcdir)/'`gtkunixprintmodule.c + + gtkunixprint_la-gtkunixprint.lo: gtkunixprint.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtkunixprint_la_CFLAGS) $(CFLAGS) -MT gtkunixprint_la-gtkunixprint.lo -MD -MP -MF "$(DEPDIR)/gtkunixprint_la-gtkunixprint.Tpo" -c -o gtkunixprint_la-gtkunixprint.lo `test -f 'gtkunixprint.c' || echo '$(srcdir)/'`gtkunixprint.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/gtkunixprint_la-gtkunixprint.Tpo" "$(DEPDIR)/gtkunixprint_la-gtkunixprint.Plo"; else rm -f "$(DEPDIR)/gtkunixprint_la-gtkunixprint.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtkunixprint_la_CFLAGS) $(CFLAGS) -MT gtkunixprint_la-gtkunixprint.lo -MD -MP -MF $(DEPDIR)/gtkunixprint_la-gtkunixprint.Tpo -c -o gtkunixprint_la-gtkunixprint.lo `test -f 'gtkunixprint.c' || echo '$(srcdir)/'`gtkunixprint.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gtkunixprint_la-gtkunixprint.Tpo $(DEPDIR)/gtkunixprint_la-gtkunixprint.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkunixprint.c' object='gtkunixprint_la-gtkunixprint.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtkunixprint_la_CFLAGS) $(CFLAGS) -c -o gtkunixprint_la-gtkunixprint.lo `test -f 'gtkunixprint.c' || echo '$(srcdir)/'`gtkunixprint.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtkunixprint_la_CFLAGS) $(CFLAGS) -c -o gtkunixprint_la-gtkunixprint.lo `test -f 'gtkunixprint.c' || echo '$(srcdir)/'`gtkunixprint.c + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + install-pygtkPYTHON: $(pygtk_PYTHON) + @$(NORMAL_INSTALL) +- test -z "$(pygtkdir)" || $(mkdir_p) "$(DESTDIR)$(pygtkdir)" ++ test -z "$(pygtkdir)" || $(MKDIR_P) "$(DESTDIR)$(pygtkdir)" + @list='$(pygtk_PYTHON)'; dlist=''; for p in $$list; do\ + if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \ + if test -f $$b$$p; then \ +@@ -671,7 +657,7 @@ uninstall-pygtkPYTHON: + done + install-defsDATA: $(defs_DATA) + @$(NORMAL_INSTALL) +- test -z "$(defsdir)" || $(mkdir_p) "$(DESTDIR)$(defsdir)" ++ test -z "$(defsdir)" || $(MKDIR_P) "$(DESTDIR)$(defsdir)" + @list='$(defs_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -688,7 +674,7 @@ uninstall-defsDATA: + done + install-pkgincludeHEADERS: $(pkginclude_HEADERS) + @$(NORMAL_INSTALL) +- test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)" ++ test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" + @list='$(pkginclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -709,8 +695,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -722,8 +708,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -733,13 +719,12 @@ ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -753,22 +738,21 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -784,7 +768,7 @@ check: check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) + installdirs: + for dir in "$(DESTDIR)$(pkgpyexecdir)" "$(DESTDIR)$(pygtkexecdir)" "$(DESTDIR)$(pygtkdir)" "$(DESTDIR)$(defsdir)" "$(DESTDIR)$(pkgincludedir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -820,7 +804,7 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -835,13 +819,21 @@ info-am: + install-data-am: install-defsDATA install-pkgincludeHEADERS \ + install-pygtkPYTHON + ++install-dvi: install-dvi-am ++ + install-exec-am: install-pkgpyexecLTLIBRARIES \ + install-pygtkexecLTLIBRARIES + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -862,26 +854,29 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-defsDATA uninstall-info-am \ +- uninstall-pkgincludeHEADERS uninstall-pkgpyexecLTLIBRARIES \ +- uninstall-pygtkPYTHON uninstall-pygtkexecLTLIBRARIES ++uninstall-am: uninstall-defsDATA uninstall-pkgincludeHEADERS \ ++ uninstall-pkgpyexecLTLIBRARIES uninstall-pygtkPYTHON \ ++ uninstall-pygtkexecLTLIBRARIES ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkgpyexecLTLIBRARIES \ + clean-pygtkexecLTLIBRARIES ctags distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-defsDATA install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-pkgincludeHEADERS install-pkgpyexecLTLIBRARIES \ ++ install-data install-data-am install-defsDATA install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-pkgincludeHEADERS \ ++ install-pkgpyexecLTLIBRARIES install-ps install-ps-am \ + install-pygtkPYTHON install-pygtkexecLTLIBRARIES install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-defsDATA \ +- uninstall-info-am uninstall-pkgincludeHEADERS \ +- uninstall-pkgpyexecLTLIBRARIES uninstall-pygtkPYTHON \ +- uninstall-pygtkexecLTLIBRARIES ++ uninstall-pkgincludeHEADERS uninstall-pkgpyexecLTLIBRARIES \ ++ uninstall-pygtkPYTHON uninstall-pygtkexecLTLIBRARIES + + gdk-2.12.defs \ + gtk-2.12.defs \ +Index: pygtk-2.14.1/install-sh +=================================================================== +--- pygtk-2.14.1.orig/install-sh 2009-05-29 09:25:12.277105238 +0200 ++++ pygtk-2.14.1/install-sh 2009-05-29 09:24:31.745605425 +0200 +@@ -1,7 +1,7 @@ + #!/bin/sh + # install - install a program, script, or datafile + +-scriptversion=2005-05-14.22 ++scriptversion=2006-12-25.00 + + # This originates from X11R5 (mit/util/scripts/install.sh), which was + # later released in X11R6 (xc/config/util/install.sh) with the +@@ -39,38 +39,68 @@ scriptversion=2005-05-14.22 + # when there is no Makefile. + # + # This script is compatible with the BSD install script, but was written +-# from scratch. It can only install one file at a time, a restriction +-# shared with many OS's install programs. ++# from scratch. ++ ++nl=' ++' ++IFS=" "" $nl" + + # set DOITPROG to echo to test this script + + # Don't use :- since 4.3BSD and earlier shells don't like it. +-doit="${DOITPROG-}" ++doit=${DOITPROG-} ++if test -z "$doit"; then ++ doit_exec=exec ++else ++ doit_exec=$doit ++fi + +-# put in absolute paths if you don't have them in your path; or use env. vars. ++# Put in absolute file names if you don't have them in your path; ++# or use environment vars. + +-mvprog="${MVPROG-mv}" +-cpprog="${CPPROG-cp}" +-chmodprog="${CHMODPROG-chmod}" +-chownprog="${CHOWNPROG-chown}" +-chgrpprog="${CHGRPPROG-chgrp}" +-stripprog="${STRIPPROG-strip}" +-rmprog="${RMPROG-rm}" +-mkdirprog="${MKDIRPROG-mkdir}" ++chgrpprog=${CHGRPPROG-chgrp} ++chmodprog=${CHMODPROG-chmod} ++chownprog=${CHOWNPROG-chown} ++cmpprog=${CMPPROG-cmp} ++cpprog=${CPPROG-cp} ++mkdirprog=${MKDIRPROG-mkdir} ++mvprog=${MVPROG-mv} ++rmprog=${RMPROG-rm} ++stripprog=${STRIPPROG-strip} ++ ++posix_glob='?' ++initialize_posix_glob=' ++ test "$posix_glob" != "?" || { ++ if (set -f) 2>/dev/null; then ++ posix_glob= ++ else ++ posix_glob=: ++ fi ++ } ++' ++ ++posix_mkdir= ++ ++# Desired mode of installed file. ++mode=0755 + +-chmodcmd="$chmodprog 0755" +-chowncmd= + chgrpcmd= +-stripcmd= ++chmodcmd=$chmodprog ++chowncmd= ++mvcmd=$mvprog + rmcmd="$rmprog -f" +-mvcmd="$mvprog" ++stripcmd= ++ + src= + dst= + dir_arg= +-dstarg= ++dst_arg= ++ ++copy_on_change=false + no_target_directory= + +-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE ++usage="\ ++Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... +@@ -80,81 +110,86 @@ In the 2nd and 3rd, copy all SRCFILES to + In the 4th, create DIRECTORIES. + + Options: +--c (ignored) +--d create directories instead of installing files. +--g GROUP $chgrpprog installed files to GROUP. +--m MODE $chmodprog installed files to MODE. +--o USER $chownprog installed files to USER. +--s $stripprog installed files. +--t DIRECTORY install into DIRECTORY. +--T report an error if DSTFILE is a directory. +---help display this help and exit. +---version display version info and exit. ++ --help display this help and exit. ++ --version display version info and exit. ++ ++ -c (ignored) ++ -C install only if different (preserve the last data modification time) ++ -d create directories instead of installing files. ++ -g GROUP $chgrpprog installed files to GROUP. ++ -m MODE $chmodprog installed files to MODE. ++ -o USER $chownprog installed files to USER. ++ -s $stripprog installed files. ++ -t DIRECTORY install into DIRECTORY. ++ -T report an error if DSTFILE is a directory. + + Environment variables override the default commands: +- CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG ++ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG ++ RMPROG STRIPPROG + " + +-while test -n "$1"; do ++while test $# -ne 0; do + case $1 in +- -c) shift +- continue;; ++ -c) ;; + +- -d) dir_arg=true +- shift +- continue;; ++ -C) copy_on_change=true;; ++ ++ -d) dir_arg=true;; + + -g) chgrpcmd="$chgrpprog $2" +- shift +- shift +- continue;; ++ shift;; + + --help) echo "$usage"; exit $?;; + +- -m) chmodcmd="$chmodprog $2" +- shift +- shift +- continue;; ++ -m) mode=$2 ++ case $mode in ++ *' '* | *' '* | *' ++'* | *'*'* | *'?'* | *'['*) ++ echo "$0: invalid mode: $mode" >&2 ++ exit 1;; ++ esac ++ shift;; + + -o) chowncmd="$chownprog $2" +- shift +- shift +- continue;; +- +- -s) stripcmd=$stripprog +- shift +- continue;; +- +- -t) dstarg=$2 +- shift +- shift +- continue;; +- +- -T) no_target_directory=true +- shift +- continue;; ++ shift;; ++ ++ -s) stripcmd=$stripprog;; ++ ++ -t) dst_arg=$2 ++ shift;; ++ ++ -T) no_target_directory=true;; + + --version) echo "$0 $scriptversion"; exit $?;; + +- *) # When -d is used, all remaining arguments are directories to create. +- # When -t is used, the destination is already specified. +- test -n "$dir_arg$dstarg" && break +- # Otherwise, the last argument is the destination. Remove it from $@. +- for arg +- do +- if test -n "$dstarg"; then +- # $@ is not empty: it contains at least $arg. +- set fnord "$@" "$dstarg" +- shift # fnord +- fi +- shift # arg +- dstarg=$arg +- done ++ --) shift + break;; ++ ++ -*) echo "$0: invalid option: $1" >&2 ++ exit 1;; ++ ++ *) break;; + esac ++ shift + done + +-if test -z "$1"; then ++if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then ++ # When -d is used, all remaining arguments are directories to create. ++ # When -t is used, the destination is already specified. ++ # Otherwise, the last argument is the destination. Remove it from $@. ++ for arg ++ do ++ if test -n "$dst_arg"; then ++ # $@ is not empty: it contains at least $arg. ++ set fnord "$@" "$dst_arg" ++ shift # fnord ++ fi ++ shift # arg ++ dst_arg=$arg ++ done ++fi ++ ++if test $# -eq 0; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 +@@ -164,24 +199,47 @@ if test -z "$1"; then + exit 0 + fi + ++if test -z "$dir_arg"; then ++ trap '(exit $?); exit' 1 2 13 15 ++ ++ # Set umask so as not to create temps with too-generous modes. ++ # However, 'strip' requires both read and write access to temps. ++ case $mode in ++ # Optimize common cases. ++ *644) cp_umask=133;; ++ *755) cp_umask=22;; ++ ++ *[0-7]) ++ if test -z "$stripcmd"; then ++ u_plus_rw= ++ else ++ u_plus_rw='% 200' ++ fi ++ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; ++ *) ++ if test -z "$stripcmd"; then ++ u_plus_rw= ++ else ++ u_plus_rw=,u+rw ++ fi ++ cp_umask=$mode$u_plus_rw;; ++ esac ++fi ++ + for src + do + # Protect names starting with `-'. + case $src in +- -*) src=./$src ;; ++ -*) src=./$src;; + esac + + if test -n "$dir_arg"; then + dst=$src +- src= +- +- if test -d "$dst"; then +- mkdircmd=: +- chmodcmd= +- else +- mkdircmd=$mkdirprog +- fi ++ dstdir=$dst ++ test -d "$dstdir" ++ dstdir_status=$? + else ++ + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. +@@ -190,71 +248,199 @@ do + exit 1 + fi + +- if test -z "$dstarg"; then ++ if test -z "$dst_arg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + +- dst=$dstarg ++ dst=$dst_arg + # Protect names starting with `-'. + case $dst in +- -*) dst=./$dst ;; ++ -*) dst=./$dst;; + esac + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then +- echo "$0: $dstarg: Is a directory" >&2 ++ echo "$0: $dst_arg: Is a directory" >&2 + exit 1 + fi +- dst=$dst/`basename "$src"` ++ dstdir=$dst ++ dst=$dstdir/`basename "$src"` ++ dstdir_status=0 ++ else ++ # Prefer dirname, but fall back on a substitute if dirname fails. ++ dstdir=` ++ (dirname "$dst") 2>/dev/null || ++ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$dst" : 'X\(//\)[^/]' \| \ ++ X"$dst" : 'X\(//\)$' \| \ ++ X"$dst" : 'X\(/\)' \| . 2>/dev/null || ++ echo X"$dst" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q' ++ ` ++ ++ test -d "$dstdir" ++ dstdir_status=$? + fi + fi + +- # This sed command emulates the dirname command. +- dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` +- +- # Make sure that the destination directory exists. ++ obsolete_mkdir_used=false + +- # Skip lots of stat calls in the usual case. +- if test ! -d "$dstdir"; then +- defaultIFS=' +- ' +- IFS="${IFS-$defaultIFS}" +- +- oIFS=$IFS +- # Some sh's can't handle IFS=/ for some reason. +- IFS='%' +- set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` +- shift +- IFS=$oIFS ++ if test $dstdir_status != 0; then ++ case $posix_mkdir in ++ '') ++ # Create intermediate dirs using mode 755 as modified by the umask. ++ # This is like FreeBSD 'install' as of 1997-10-28. ++ umask=`umask` ++ case $stripcmd.$umask in ++ # Optimize common cases. ++ *[2367][2367]) mkdir_umask=$umask;; ++ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; ++ ++ *[0-7]) ++ mkdir_umask=`expr $umask + 22 \ ++ - $umask % 100 % 40 + $umask % 20 \ ++ - $umask % 10 % 4 + $umask % 2 ++ `;; ++ *) mkdir_umask=$umask,go-w;; ++ esac ++ ++ # With -d, create the new directory with the user-specified mode. ++ # Otherwise, rely on $mkdir_umask. ++ if test -n "$dir_arg"; then ++ mkdir_mode=-m$mode ++ else ++ mkdir_mode= ++ fi ++ ++ posix_mkdir=false ++ case $umask in ++ *[123567][0-7][0-7]) ++ # POSIX mkdir -p sets u+wx bits regardless of umask, which ++ # is incompatible with FreeBSD 'install' when (umask & 300) != 0. ++ ;; ++ *) ++ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ ++ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 ++ ++ if (umask $mkdir_umask && ++ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 ++ then ++ if test -z "$dir_arg" || { ++ # Check for POSIX incompatibilities with -m. ++ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or ++ # other-writeable bit of parent directory when it shouldn't. ++ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ++ ls_ld_tmpdir=`ls -ld "$tmpdir"` ++ case $ls_ld_tmpdir in ++ d????-?r-*) different_mode=700;; ++ d????-?--*) different_mode=755;; ++ *) false;; ++ esac && ++ $mkdirprog -m$different_mode -p -- "$tmpdir" && { ++ ls_ld_tmpdir_1=`ls -ld "$tmpdir"` ++ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" ++ } ++ } ++ then posix_mkdir=: ++ fi ++ rmdir "$tmpdir/d" "$tmpdir" ++ else ++ # Remove any dirs left behind by ancient mkdir implementations. ++ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null ++ fi ++ trap '' 0;; ++ esac;; ++ esac + +- pathcomp= ++ if ++ $posix_mkdir && ( ++ umask $mkdir_umask && ++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ++ ) ++ then : ++ else + +- while test $# -ne 0 ; do +- pathcomp=$pathcomp$1 ++ # The umask is ridiculous, or mkdir does not conform to POSIX, ++ # or it failed possibly due to a race condition. Create the ++ # directory the slow way, step by step, checking for races as we go. ++ ++ case $dstdir in ++ /*) prefix='/';; ++ -*) prefix='./';; ++ *) prefix='';; ++ esac ++ ++ eval "$initialize_posix_glob" ++ ++ oIFS=$IFS ++ IFS=/ ++ $posix_glob set -f ++ set fnord $dstdir + shift +- if test ! -d "$pathcomp"; then +- $mkdirprog "$pathcomp" +- # mkdir can fail with a `File exist' error in case several +- # install-sh are creating the directory concurrently. This +- # is OK. +- test -d "$pathcomp" || exit ++ $posix_glob set +f ++ IFS=$oIFS ++ ++ prefixes= ++ ++ for d ++ do ++ test -z "$d" && continue ++ ++ prefix=$prefix$d ++ if test -d "$prefix"; then ++ prefixes= ++ else ++ if $posix_mkdir; then ++ (umask=$mkdir_umask && ++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break ++ # Don't fail if two instances are running concurrently. ++ test -d "$prefix" || exit 1 ++ else ++ case $prefix in ++ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; ++ *) qprefix=$prefix;; ++ esac ++ prefixes="$prefixes '$qprefix'" ++ fi ++ fi ++ prefix=$prefix/ ++ done ++ ++ if test -n "$prefixes"; then ++ # Don't fail if two instances are running concurrently. ++ (umask $mkdir_umask && ++ eval "\$doit_exec \$mkdirprog $prefixes") || ++ test -d "$dstdir" || exit 1 ++ obsolete_mkdir_used=true + fi +- pathcomp=$pathcomp/ +- done ++ fi + fi + + if test -n "$dir_arg"; then +- $doit $mkdircmd "$dst" \ +- && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ +- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ +- && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ +- && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } +- ++ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && ++ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && ++ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || ++ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 + else +- dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ +@@ -262,10 +448,9 @@ do + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 +- trap '(exit $?); exit' 1 2 13 15 + + # Copy the file name to the temp name. +- $doit $cpprog "$src" "$dsttmp" && ++ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + + # and set any options; do chmod last to preserve setuid bits. + # +@@ -273,47 +458,58 @@ do + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # +- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ +- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ +- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ +- && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && +- +- # Now rename the file to the real destination. +- { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ +- || { +- # The rename failed, perhaps because mv can't rename something else +- # to itself, or perhaps because mv is so ancient that it does not +- # support -f. +- +- # Now remove or move aside any old file at destination location. +- # We try this two ways since rm can't unlink itself on some +- # systems and the destination file might be busy for other +- # reasons. In this case, the final cleanup might fail but the new +- # file should still install successfully. +- { +- if test -f "$dstdir/$dstfile"; then +- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ +- || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ +- || { +- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 +- (exit 1); exit 1 +- } +- else +- : +- fi +- } && +- +- # Now rename the file to the real destination. +- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" +- } +- } +- fi || { (exit 1); exit 1; } +-done ++ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && ++ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && ++ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && ++ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && ++ ++ # If -C, don't bother to copy if it wouldn't change the file. ++ if $copy_on_change && ++ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && ++ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && ++ ++ eval "$initialize_posix_glob" && ++ $posix_glob set -f && ++ set X $old && old=:$2:$4:$5:$6 && ++ set X $new && new=:$2:$4:$5:$6 && ++ $posix_glob set +f && ++ ++ test "$old" = "$new" && ++ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 ++ then ++ rm -f "$dsttmp" ++ else ++ # Rename the file to the real destination. ++ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || + +-# The final little trick to "correctly" pass the exit status to the exit trap. +-{ +- (exit 0); exit 0 +-} ++ # The rename failed, perhaps because mv can't rename something else ++ # to itself, or perhaps because mv is so ancient that it does not ++ # support -f. ++ { ++ # Now remove or move aside any old file at destination location. ++ # We try this two ways since rm can't unlink itself on some ++ # systems and the destination file might be busy for other ++ # reasons. In this case, the final cleanup might fail but the new ++ # file should still install successfully. ++ { ++ test ! -f "$dst" || ++ $doit $rmcmd -f "$dst" 2>/dev/null || ++ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && ++ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } ++ } || ++ { echo "$0: cannot unlink or rename $dst" >&2 ++ (exit 1); exit 1 ++ } ++ } && ++ ++ # Now rename the file to the real destination. ++ $doit $mvcmd "$dsttmp" "$dst" ++ } ++ fi || exit 1 ++ ++ trap '' 0 ++ fi ++done + + # Local variables: + # eval: (add-hook 'write-file-hooks 'time-stamp) +Index: pygtk-2.14.1/ltmain.sh +=================================================================== +--- pygtk-2.14.1.orig/ltmain.sh 2009-05-29 09:25:12.801609263 +0200 ++++ pygtk-2.14.1/ltmain.sh 2009-05-29 09:23:32.845112348 +0200 +@@ -1,6 +1,6 @@ + # Generated from ltmain.m4sh. + +-# ltmain.sh (GNU libtool) 2.2.4 ++# ltmain.sh (GNU libtool) 2.2.6 + # Written by Gordon Matzigkeit , 1996 + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. +@@ -65,7 +65,7 @@ + # compiler: $LTCC + # compiler flags: $LTCFLAGS + # linker: $LD (gnu? $with_gnu_ld) +-# $progname: (GNU libtool) 2.2.4 Debian-2.2.4-0ubuntu4 ++# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4 + # automake: $automake_version + # autoconf: $autoconf_version + # +@@ -73,9 +73,9 @@ + + PROGRAM=ltmain.sh + PACKAGE=libtool +-VERSION="2.2.4 Debian-2.2.4-0ubuntu4" ++VERSION="2.2.6 Debian-2.2.6a-4" + TIMESTAMP="" +-package_revision=1.2976 ++package_revision=1.3012 + + # Be Bourne compatible + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +@@ -805,7 +805,7 @@ func_enable_tag () + + + case $host in +- *cygwin* | *mingw* | *pw32*) ++ *cygwin* | *mingw* | *pw32* | *cegcc*) + # don't eliminate duplications in $postdeps and $predeps + opt_duplicate_compiler_generated_deps=: + ;; +@@ -893,8 +893,9 @@ $opt_help || { + # determined imposters. + func_lalib_p () + { +- $SED -e 4q "$1" 2>/dev/null \ +- | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 ++ test -f "$1" && ++ $SED -e 4q "$1" 2>/dev/null \ ++ | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 + } + + # func_lalib_unsafe_p file +@@ -907,7 +908,7 @@ func_lalib_p () + func_lalib_unsafe_p () + { + lalib_p=no +- if test -r "$1" && exec 5<&0 <"$1"; then ++ if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then + for lalib_p_l in 1 2 3 4 + do + read lalib_p_line +@@ -1275,7 +1276,7 @@ func_mode_compile () + + # On Cygwin there's no "real" PIC flag so we must build both object types + case $host_os in +- cygwin* | mingw* | pw32* | os2*) ++ cygwin* | mingw* | pw32* | os2* | cegcc*) + pic_mode=default + ;; + esac +@@ -2046,7 +2047,7 @@ func_mode_install () + 'exit $?' + tstripme="$stripme" + case $host_os in +- cygwin* | mingw* | pw32*) ++ cygwin* | mingw* | pw32* | cegcc*) + case $realname in + *.dll.a) + tstripme="" +@@ -2152,7 +2153,7 @@ func_mode_install () + + # Do a test to see if this is really a libtool program. + case $host in +- *cygwin*|*mingw*) ++ *cygwin* | *mingw*) + if func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + wrapper=$func_ltwrapper_scriptname_result +@@ -2358,7 +2359,7 @@ extern \"C\" { + $RM $export_symbols + eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + case $host in +- *cygwin* | *mingw* ) ++ *cygwin* | *mingw* | *cegcc* ) + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' + ;; +@@ -2370,7 +2371,7 @@ extern \"C\" { + eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' + eval '$MV "$nlist"T "$nlist"' + case $host in +- *cygwin | *mingw* ) ++ *cygwin | *mingw* | *cegcc* ) + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' + ;; +@@ -2426,7 +2427,7 @@ typedef struct { + } lt_dlsymlist; + " + case $host in +- *cygwin* | *mingw* ) ++ *cygwin* | *mingw* | *cegcc* ) + $ECHO >> "$output_objdir/$my_dlsyms" "\ + /* DATA imports from DLLs on WIN32 con't be const, because + runtime relocations are performed -- see ld's documentation +@@ -2512,7 +2513,7 @@ static const void *lt_preloaded_setup() + # Transform the symbol file into the correct name. + symfileobj="$output_objdir/${my_outputname}S.$objext" + case $host in +- *cygwin* | *mingw* ) ++ *cygwin* | *mingw* | *cegcc* ) + if test -f "$output_objdir/$my_outputname.def"; then + compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` +@@ -2691,25 +2692,16 @@ func_extract_archives () + + + +-# func_emit_wrapper arg ++# func_emit_wrapper_part1 [arg=no] + # +-# emit a libtool wrapper script on stdout +-# don't directly open a file because we may want to +-# incorporate the script contents within a cygwin/mingw +-# wrapper executable. Must ONLY be called from within +-# func_mode_link because it depends on a number of variable +-# set therein. +-# +-# arg is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR +-# variable will take. If 'yes', then the emitted script +-# will assume that the directory in which it is stored is +-# the '.lib' directory. This is a cygwin/mingw-specific +-# behavior. +-func_emit_wrapper () ++# Emit the first part of a libtool wrapper script on stdout. ++# For more information, see the description associated with ++# func_emit_wrapper(), below. ++func_emit_wrapper_part1 () + { +- func_emit_wrapper_arg1=no ++ func_emit_wrapper_part1_arg1=no + if test -n "$1" ; then +- func_emit_wrapper_arg1=$1 ++ func_emit_wrapper_part1_arg1=$1 + fi + + $ECHO "\ +@@ -2794,10 +2786,27 @@ else + file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` + file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` + done ++" ++} ++# end: func_emit_wrapper_part1 ++ ++# func_emit_wrapper_part2 [arg=no] ++# ++# Emit the second part of a libtool wrapper script on stdout. ++# For more information, see the description associated with ++# func_emit_wrapper(), below. ++func_emit_wrapper_part2 () ++{ ++ func_emit_wrapper_part2_arg1=no ++ if test -n "$1" ; then ++ func_emit_wrapper_part2_arg1=$1 ++ fi ++ ++ $ECHO "\ + + # Usually 'no', except on cygwin/mingw when embedded into + # the cwrapper. +- WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 ++ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1 + if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then + # special case for '.' + if test \"\$thisdir\" = \".\"; then +@@ -2888,7 +2897,7 @@ else + " + case $host in + # Backslashes separate directories on plain windows +- *-*-mingw | *-*-os2*) ++ *-*-mingw | *-*-os2* | *-cegcc*) + $ECHO "\ + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} + " +@@ -2914,7 +2923,207 @@ else + fi\ + " + } +-# end: func_emit_wrapper ++# end: func_emit_wrapper_part2 ++ ++ ++# func_emit_wrapper [arg=no] ++# ++# Emit a libtool wrapper script on stdout. ++# Don't directly open a file because we may want to ++# incorporate the script contents within a cygwin/mingw ++# wrapper executable. Must ONLY be called from within ++# func_mode_link because it depends on a number of variables ++# set therein. ++# ++# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR ++# variable will take. If 'yes', then the emitted script ++# will assume that the directory in which it is stored is ++# the $objdir directory. This is a cygwin/mingw-specific ++# behavior. ++func_emit_wrapper () ++{ ++ func_emit_wrapper_arg1=no ++ if test -n "$1" ; then ++ func_emit_wrapper_arg1=$1 ++ fi ++ ++ # split this up so that func_emit_cwrapperexe_src ++ # can call each part independently. ++ func_emit_wrapper_part1 "${func_emit_wrapper_arg1}" ++ func_emit_wrapper_part2 "${func_emit_wrapper_arg1}" ++} ++ ++ ++# func_to_host_path arg ++# ++# Convert paths to host format when used with build tools. ++# Intended for use with "native" mingw (where libtool itself ++# is running under the msys shell), or in the following cross- ++# build environments: ++# $build $host ++# mingw (msys) mingw [e.g. native] ++# cygwin mingw ++# *nix + wine mingw ++# where wine is equipped with the `winepath' executable. ++# In the native mingw case, the (msys) shell automatically ++# converts paths for any non-msys applications it launches, ++# but that facility isn't available from inside the cwrapper. ++# Similar accommodations are necessary for $host mingw and ++# $build cygwin. Calling this function does no harm for other ++# $host/$build combinations not listed above. ++# ++# ARG is the path (on $build) that should be converted to ++# the proper representation for $host. The result is stored ++# in $func_to_host_path_result. ++func_to_host_path () ++{ ++ func_to_host_path_result="$1" ++ if test -n "$1" ; then ++ case $host in ++ *mingw* ) ++ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' ++ case $build in ++ *mingw* ) # actually, msys ++ # awkward: cmd appends spaces to result ++ lt_sed_strip_trailing_spaces="s/[ ]*\$//" ++ func_to_host_path_tmp1=`( cmd //c echo "$1" |\ ++ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` ++ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ ++ $SED -e "$lt_sed_naive_backslashify"` ++ ;; ++ *cygwin* ) ++ func_to_host_path_tmp1=`cygpath -w "$1"` ++ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ ++ $SED -e "$lt_sed_naive_backslashify"` ++ ;; ++ * ) ++ # Unfortunately, winepath does not exit with a non-zero ++ # error code, so we are forced to check the contents of ++ # stdout. On the other hand, if the command is not ++ # found, the shell will set an exit code of 127 and print ++ # *an error message* to stdout. So we must check for both ++ # error code of zero AND non-empty stdout, which explains ++ # the odd construction: ++ func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` ++ if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then ++ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ ++ $SED -e "$lt_sed_naive_backslashify"` ++ else ++ # Allow warning below. ++ func_to_host_path_result="" ++ fi ++ ;; ++ esac ++ if test -z "$func_to_host_path_result" ; then ++ func_error "Could not determine host path corresponding to" ++ func_error " '$1'" ++ func_error "Continuing, but uninstalled executables may not work." ++ # Fallback: ++ func_to_host_path_result="$1" ++ fi ++ ;; ++ esac ++ fi ++} ++# end: func_to_host_path ++ ++# func_to_host_pathlist arg ++# ++# Convert pathlists to host format when used with build tools. ++# See func_to_host_path(), above. This function supports the ++# following $build/$host combinations (but does no harm for ++# combinations not listed here): ++# $build $host ++# mingw (msys) mingw [e.g. native] ++# cygwin mingw ++# *nix + wine mingw ++# ++# Path separators are also converted from $build format to ++# $host format. If ARG begins or ends with a path separator ++# character, it is preserved (but converted to $host format) ++# on output. ++# ++# ARG is a pathlist (on $build) that should be converted to ++# the proper representation on $host. The result is stored ++# in $func_to_host_pathlist_result. ++func_to_host_pathlist () ++{ ++ func_to_host_pathlist_result="$1" ++ if test -n "$1" ; then ++ case $host in ++ *mingw* ) ++ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' ++ # Remove leading and trailing path separator characters from ++ # ARG. msys behavior is inconsistent here, cygpath turns them ++ # into '.;' and ';.', and winepath ignores them completely. ++ func_to_host_pathlist_tmp2="$1" ++ # Once set for this call, this variable should not be ++ # reassigned. It is used in tha fallback case. ++ func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\ ++ $SED -e 's|^:*||' -e 's|:*$||'` ++ case $build in ++ *mingw* ) # Actually, msys. ++ # Awkward: cmd appends spaces to result. ++ lt_sed_strip_trailing_spaces="s/[ ]*\$//" ++ func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\ ++ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` ++ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ ++ $SED -e "$lt_sed_naive_backslashify"` ++ ;; ++ *cygwin* ) ++ func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"` ++ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ ++ $SED -e "$lt_sed_naive_backslashify"` ++ ;; ++ * ) ++ # unfortunately, winepath doesn't convert pathlists ++ func_to_host_pathlist_result="" ++ func_to_host_pathlist_oldIFS=$IFS ++ IFS=: ++ for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do ++ IFS=$func_to_host_pathlist_oldIFS ++ if test -n "$func_to_host_pathlist_f" ; then ++ func_to_host_path "$func_to_host_pathlist_f" ++ if test -n "$func_to_host_path_result" ; then ++ if test -z "$func_to_host_pathlist_result" ; then ++ func_to_host_pathlist_result="$func_to_host_path_result" ++ else ++ func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result" ++ fi ++ fi ++ fi ++ IFS=: ++ done ++ IFS=$func_to_host_pathlist_oldIFS ++ ;; ++ esac ++ if test -z "$func_to_host_pathlist_result" ; then ++ func_error "Could not determine the host path(s) corresponding to" ++ func_error " '$1'" ++ func_error "Continuing, but uninstalled executables may not work." ++ # Fallback. This may break if $1 contains DOS-style drive ++ # specifications. The fix is not to complicate the expression ++ # below, but for the user to provide a working wine installation ++ # with winepath so that path translation in the cross-to-mingw ++ # case works properly. ++ lt_replace_pathsep_nix_to_dos="s|:|;|g" ++ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ ++ $SED -e "$lt_replace_pathsep_nix_to_dos"` ++ fi ++ # Now, add the leading and trailing path separators back ++ case "$1" in ++ :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" ++ ;; ++ esac ++ case "$1" in ++ *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;" ++ ;; ++ esac ++ ;; ++ esac ++ fi ++} ++# end: func_to_host_pathlist + + # func_emit_cwrapperexe_src + # emit the source code for a wrapper executable on stdout +@@ -2951,6 +3160,12 @@ EOF + # include + # ifdef __CYGWIN__ + # include ++# define HAVE_SETENV ++# ifdef __STRICT_ANSI__ ++char *realpath (const char *, char *); ++int putenv (char *); ++int setenv (const char *, const char *, int); ++# endif + # endif + #endif + #include +@@ -3057,29 +3272,105 @@ int make_executable (const char *path); + int check_executable (const char *path); + char *strendzap (char *str, const char *pat); + void lt_fatal (const char *message, ...); ++void lt_setenv (const char *name, const char *value); ++char *lt_extend_str (const char *orig_value, const char *add, int to_end); ++void lt_opt_process_env_set (const char *arg); ++void lt_opt_process_env_prepend (const char *arg); ++void lt_opt_process_env_append (const char *arg); ++int lt_split_name_value (const char *arg, char** name, char** value); ++void lt_update_exe_path (const char *name, const char *value); ++void lt_update_lib_path (const char *name, const char *value); + +-static const char *script_text = ++static const char *script_text_part1 = + EOF + +- func_emit_wrapper yes | ++ func_emit_wrapper_part1 yes | ++ $SED -e 's/\([\\"]\)/\\\1/g' \ ++ -e 's/^/ "/' -e 's/$/\\n"/' ++ echo ";" ++ cat </dev/null || echo $SHELL` +- case $lt_newargv0 in +- *.exe | *.EXE) ;; +- *) lt_newargv0=$lt_newargv0.exe ;; +- esac +- ;; +- * ) lt_newargv0=$SHELL ;; +- esac +- fi +- +- cat <"))); ++ for (i = 0; i < newargc; i++) + { +- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, newargz[i])); ++ LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : ""))); + } + + EOF + + case $host_os in + mingw*) +- cat <"), ++ (value ? value : ""))); ++ { ++#ifdef HAVE_SETENV ++ /* always make a copy, for consistency with !HAVE_SETENV */ ++ char *str = xstrdup (value); ++ setenv (name, str, 1); ++#else ++ int len = strlen (name) + 1 + strlen (value) + 1; ++ char *str = XMALLOC (char, len); ++ sprintf (str, "%s=%s", name, value); ++ if (putenv (str) != EXIT_SUCCESS) ++ { ++ XFREE (str); ++ } ++#endif ++ } ++} ++ ++char * ++lt_extend_str (const char *orig_value, const char *add, int to_end) ++{ ++ char *new_value; ++ if (orig_value && *orig_value) ++ { ++ int orig_value_len = strlen (orig_value); ++ int add_len = strlen (add); ++ new_value = XMALLOC (char, add_len + orig_value_len + 1); ++ if (to_end) ++ { ++ strcpy (new_value, orig_value); ++ strcpy (new_value + orig_value_len, add); ++ } ++ else ++ { ++ strcpy (new_value, add); ++ strcpy (new_value + add_len, orig_value); ++ } ++ } ++ else ++ { ++ new_value = xstrdup (add); ++ } ++ return new_value; ++} ++ ++int ++lt_split_name_value (const char *arg, char** name, char** value) ++{ ++ const char *p; ++ int len; ++ if (!arg || !*arg) ++ return 1; ++ ++ p = strchr (arg, (int)'='); ++ ++ if (!p) ++ return 1; ++ ++ *value = xstrdup (++p); ++ ++ len = strlen (arg) - strlen (*value); ++ *name = XMALLOC (char, len); ++ strncpy (*name, arg, len-1); ++ (*name)[len - 1] = '\0'; ++ ++ return 0; ++} ++ ++void ++lt_opt_process_env_set (const char *arg) ++{ ++ char *name = NULL; ++ char *value = NULL; ++ ++ if (lt_split_name_value (arg, &name, &value) != 0) ++ { ++ XFREE (name); ++ XFREE (value); ++ lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg); ++ } ++ ++ lt_setenv (name, value); ++ XFREE (name); ++ XFREE (value); ++} ++ ++void ++lt_opt_process_env_prepend (const char *arg) ++{ ++ char *name = NULL; ++ char *value = NULL; ++ char *new_value = NULL; ++ ++ if (lt_split_name_value (arg, &name, &value) != 0) ++ { ++ XFREE (name); ++ XFREE (value); ++ lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg); ++ } ++ ++ new_value = lt_extend_str (getenv (name), value, 0); ++ lt_setenv (name, new_value); ++ XFREE (new_value); ++ XFREE (name); ++ XFREE (value); ++} ++ ++void ++lt_opt_process_env_append (const char *arg) ++{ ++ char *name = NULL; ++ char *value = NULL; ++ char *new_value = NULL; ++ ++ if (lt_split_name_value (arg, &name, &value) != 0) ++ { ++ XFREE (name); ++ XFREE (value); ++ lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg); ++ } ++ ++ new_value = lt_extend_str (getenv (name), value, 1); ++ lt_setenv (name, new_value); ++ XFREE (new_value); ++ XFREE (name); ++ XFREE (value); ++} ++ ++void ++lt_update_exe_path (const char *name, const char *value) ++{ ++ LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", ++ (name ? name : ""), ++ (value ? value : ""))); ++ ++ if (name && *name && value && *value) ++ { ++ char *new_value = lt_extend_str (getenv (name), value, 0); ++ /* some systems can't cope with a ':'-terminated path #' */ ++ int len = strlen (new_value); ++ while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1])) ++ { ++ new_value[len-1] = '\0'; ++ } ++ lt_setenv (name, new_value); ++ XFREE (new_value); ++ } ++} ++ ++void ++lt_update_lib_path (const char *name, const char *value) ++{ ++ LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", ++ (name ? name : ""), ++ (value ? value : ""))); ++ ++ if (name && *name && value && *value) ++ { ++ char *new_value = lt_extend_str (getenv (name), value, 0); ++ lt_setenv (name, new_value); ++ XFREE (new_value); ++ } ++} ++ ++ + EOF + } + # end: func_emit_cwrapperexe_src +@@ -3515,7 +4033,7 @@ func_mode_link () + { + $opt_debug + case $host in +- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + # It is impossible to link a dll without this setting, and + # we shouldn't force the makefile maintainer to figure out + # which system we are compiling for in order to pass an extra +@@ -3959,6 +4477,13 @@ func_mode_link () + -L*) + func_stripname '-L' '' "$arg" + dir=$func_stripname_result ++ if test -z "$dir"; then ++ if test "$#" -gt 0; then ++ func_fatal_error "require no space between \`-L' and \`$1'" ++ else ++ func_fatal_error "need path for \`-L' option" ++ fi ++ fi + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; +@@ -3977,14 +4502,16 @@ func_mode_link () + ;; + esac + case $host in +- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` + case :$dllsearchpath: in + *":$dir:"*) ;; ++ ::) dllsearchpath=$dir;; + *) dllsearchpath="$dllsearchpath:$dir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; ++ ::) dllsearchpath=$testbindir;; + *) dllsearchpath="$dllsearchpath:$testbindir";; + esac + ;; +@@ -3995,7 +4522,7 @@ func_mode_link () + -l*) + if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then + case $host in +- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*) + # These systems don't actually have a C or math library (as such) + continue + ;; +@@ -4072,7 +4599,7 @@ func_mode_link () + + -no-install) + case $host in +- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*) ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) + # The PATH hackery in wrapper scripts is required on Windows + # and Darwin in order for the loader to find any dlls it needs. + func_warning "\`-no-install' is ignored for $host" +@@ -4820,19 +5347,19 @@ func_mode_link () + # It is a libtool convenience library, so add in its objects. + convenience="$convenience $ladir/$objdir/$old_library" + old_convenience="$old_convenience $ladir/$objdir/$old_library" ++ tmp_libs= ++ for deplib in $dependency_libs; do ++ deplibs="$deplib $deplibs" ++ if $opt_duplicate_deps ; then ++ case "$tmp_libs " in ++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ esac ++ fi ++ tmp_libs="$tmp_libs $deplib" ++ done + elif test "$linkmode" != prog && test "$linkmode" != lib; then + func_fatal_error "\`$lib' is not a convenience library" + fi +- tmp_libs= +- for deplib in $dependency_libs; do +- deplibs="$deplib $deplibs" +- if $opt_duplicate_deps ; then +- case "$tmp_libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; +- esac +- fi +- tmp_libs="$tmp_libs $deplib" +- done + continue + fi # $pass = conv + +@@ -5032,7 +5559,7 @@ func_mode_link () + if test -n "$library_names" && + { test "$use_static_libs" = no || test -z "$old_library"; }; then + case $host in +- *cygwin* | *mingw*) ++ *cygwin* | *mingw* | *cegcc*) + # No point in relinking DLLs because paths are not encoded + notinst_deplibs="$notinst_deplibs $lib" + need_relink=no +@@ -5102,7 +5629,7 @@ func_mode_link () + elif test -n "$soname_spec"; then + # bleh windows + case $host in +- *cygwin* | mingw*) ++ *cygwin* | mingw* | *cegcc*) + func_arith $current - $age + major=$func_arith_result + versuffix="-$major" +@@ -5369,6 +5896,7 @@ func_mode_link () + if test "$link_all_deplibs" != no; then + # Add the search paths of all dependency libraries + for deplib in $dependency_libs; do ++ path= + case $deplib in + -L*) path="$deplib" ;; + *.la) +@@ -5884,7 +6412,7 @@ func_mode_link () + tempremovelist=`$ECHO "$output_objdir/*"` + for p in $tempremovelist; do + case $p in +- *.$objext) ++ *.$objext | *.gcno) + ;; + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) + if test "X$precious_files_regex" != "X"; then +@@ -5955,7 +6483,7 @@ func_mode_link () + if test "$build_libtool_libs" = yes; then + if test -n "$rpath"; then + case $host in +- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*) ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*) + # these systems don't actually have a c library (as such)! + ;; + *-*-rhapsody* | *-*-darwin1.[012]) +@@ -6454,7 +6982,7 @@ EOF + + orig_export_symbols= + case $host_os in +- cygwin* | mingw*) ++ cygwin* | mingw* | cegcc*) + if test -n "$export_symbols" && test -z "$export_symbols_regex"; then + # exporting using user supplied symfile + if test "x`$SED 1q $export_symbols`" != xEXPORTS; then +@@ -7079,14 +7607,16 @@ EOF + esac + fi + case $host in +- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` + case :$dllsearchpath: in + *":$libdir:"*) ;; ++ ::) dllsearchpath=$libdir;; + *) dllsearchpath="$dllsearchpath:$libdir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; ++ ::) dllsearchpath=$testbindir;; + *) dllsearchpath="$dllsearchpath:$testbindir";; + esac + ;; +@@ -7156,6 +7686,10 @@ EOF + wrappers_required=no + fi + ;; ++ *cegcc) ++ # Disable wrappers for cegcc, we are cross compiling anyway. ++ wrappers_required=no ++ ;; + *) + if test "$need_relink" = no || test "$build_libtool_libs" != yes; then + wrappers_required=no +@@ -7308,11 +7842,10 @@ EOF + + func_emit_cwrapperexe_src > $cwrappersource + +- # we should really use a build-platform specific compiler +- # here, but OTOH, the wrappers (shell script and this C one) +- # are only useful if you want to execute the "real" binary. +- # Since the "real" binary is built for $host, then this +- # wrapper might as well be built for $host, too. ++ # The wrapper executable is built using the $host compiler, ++ # because it contains $host paths and files. If cross- ++ # compiling, it, like the target executable, must be ++ # executed on the $host or under an emulation environment. + $opt_dry_run || { + $LTCC $LTCFLAGS -o $cwrapper $cwrappersource + $STRIP $cwrapper +@@ -7597,7 +8130,7 @@ EOF + # place dlname in correct position for cygwin + tdlname=$dlname + case $host,$output,$installed,$module,$dlname in +- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; ++ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; + esac + $ECHO > $output "\ + # $outputname - a libtool library file +Index: pygtk-2.14.1/missing +=================================================================== +--- pygtk-2.14.1.orig/missing 2009-05-29 09:25:12.149113624 +0200 ++++ pygtk-2.14.1/missing 2009-05-29 09:24:31.761606272 +0200 +@@ -1,9 +1,9 @@ + #! /bin/sh + # Common stub for a few missing GNU programs while installing. + +-scriptversion=2005-06-08.21 ++scriptversion=2006-05-10.23 + +-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 ++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 + # Free Software Foundation, Inc. + # Originally by Fran,cois Pinard , 1996. + +@@ -33,6 +33,8 @@ if test $# -eq 0; then + fi + + run=: ++sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' ++sed_minuso='s/.* -o \([^ ]*\).*/\1/p' + + # In the cases where this matters, `missing' is being run in the + # srcdir already. +@@ -44,7 +46,7 @@ fi + + msg="missing on your system" + +-case "$1" in ++case $1 in + --run) + # Try to run requested program, and just exit if it succeeds. + run= +@@ -77,6 +79,7 @@ Supported PROGRAM values: + aclocal touch file \`aclocal.m4' + autoconf touch file \`configure' + autoheader touch file \`config.h.in' ++ autom4te touch the output file, or create a stub one + automake touch all \`Makefile.in' files + bison create \`y.tab.[ch]', if possible, from existing .[ch] + flex create \`lex.yy.c', if possible, from existing .c +@@ -106,7 +109,7 @@ esac + # Now exit if we have it, but it failed. Also exit now if we + # don't have it and --version was passed (most likely to detect + # the program). +-case "$1" in ++case $1 in + lex|yacc) + # Not GNU programs, they don't have --version. + ;; +@@ -135,7 +138,7 @@ esac + + # If it does not exist, or fails to run (possibly an outdated version), + # try to emulate it. +-case "$1" in ++case $1 in + aclocal*) + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if +@@ -164,7 +167,7 @@ WARNING: \`$1' is $msg. You should only + test -z "$files" && files="config.h" + touch_files= + for f in $files; do +- case "$f" in ++ case $f in + *:*) touch_files="$touch_files "`echo "$f" | + sed -e 's/^[^:]*://' -e 's/:.*//'`;; + *) touch_files="$touch_files $f.in";; +@@ -192,8 +195,8 @@ WARNING: \`$1' is needed, but is $msg. + You can get \`$1' as part of \`Autoconf' from any GNU + archive site." + +- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` +- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` ++ file=`echo "$*" | sed -n "$sed_output"` ++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then + touch $file + else +@@ -214,25 +217,25 @@ WARNING: \`$1' $msg. You should only ne + in order for those modifications to take effect. You can get + \`Bison' from any GNU archive site." + rm -f y.tab.c y.tab.h +- if [ $# -ne 1 ]; then ++ if test $# -ne 1; then + eval LASTARG="\${$#}" +- case "$LASTARG" in ++ case $LASTARG in + *.y) + SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` +- if [ -f "$SRCFILE" ]; then ++ if test -f "$SRCFILE"; then + cp "$SRCFILE" y.tab.c + fi + SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` +- if [ -f "$SRCFILE" ]; then ++ if test -f "$SRCFILE"; then + cp "$SRCFILE" y.tab.h + fi + ;; + esac + fi +- if [ ! -f y.tab.h ]; then ++ if test ! -f y.tab.h; then + echo >y.tab.h + fi +- if [ ! -f y.tab.c ]; then ++ if test ! -f y.tab.c; then + echo 'main() { return 0; }' >y.tab.c + fi + ;; +@@ -244,18 +247,18 @@ WARNING: \`$1' is $msg. You should only + in order for those modifications to take effect. You can get + \`Flex' from any GNU archive site." + rm -f lex.yy.c +- if [ $# -ne 1 ]; then ++ if test $# -ne 1; then + eval LASTARG="\${$#}" +- case "$LASTARG" in ++ case $LASTARG in + *.l) + SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` +- if [ -f "$SRCFILE" ]; then ++ if test -f "$SRCFILE"; then + cp "$SRCFILE" lex.yy.c + fi + ;; + esac + fi +- if [ ! -f lex.yy.c ]; then ++ if test ! -f lex.yy.c; then + echo 'main() { return 0; }' >lex.yy.c + fi + ;; +@@ -267,11 +270,9 @@ WARNING: \`$1' is $msg. You should only + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." + +- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` +- if test -z "$file"; then +- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` +- fi +- if [ -f "$file" ]; then ++ file=`echo "$*" | sed -n "$sed_output"` ++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` ++ if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file +@@ -289,11 +290,17 @@ WARNING: \`$1' is $msg. You should only + DU, IRIX). You might want to install the \`Texinfo' package or + the \`GNU make' package. Grab either from any GNU archive site." + # The file to touch is that specified with -o ... +- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` ++ file=`echo "$*" | sed -n "$sed_output"` ++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -z "$file"; then + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` +- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` ++ file=`sed -n ' ++ /^@setfilename/{ ++ s/.* \([^ ]*\) *$/\1/ ++ p ++ q ++ }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi +@@ -317,13 +324,13 @@ WARNING: \`$1' is $msg. You should only + fi + firstarg="$1" + if shift; then +- case "$firstarg" in ++ case $firstarg in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" "$@" && exit 0 + ;; + esac +- case "$firstarg" in ++ case $firstarg in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" "$@" && exit 0 +Index: pygtk-2.14.1/tests/Makefile.in +=================================================================== +--- pygtk-2.14.1.orig/tests/Makefile.in 2009-05-29 09:25:16.925108414 +0200 ++++ pygtk-2.14.1/tests/Makefile.in 2009-05-29 09:24:32.537604072 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -13,15 +13,11 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -50,8 +46,6 @@ DIST_SOURCES = + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -61,18 +55,6 @@ AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-BUILD_ATK_FALSE = @BUILD_ATK_FALSE@ +-BUILD_ATK_TRUE = @BUILD_ATK_TRUE@ +-BUILD_GTKUNIXPRINT_FALSE = @BUILD_GTKUNIXPRINT_FALSE@ +-BUILD_GTKUNIXPRINT_TRUE = @BUILD_GTKUNIXPRINT_TRUE@ +-BUILD_GTK_FALSE = @BUILD_GTK_FALSE@ +-BUILD_GTK_TRUE = @BUILD_GTK_TRUE@ +-BUILD_LIBGLADE_FALSE = @BUILD_LIBGLADE_FALSE@ +-BUILD_LIBGLADE_TRUE = @BUILD_LIBGLADE_TRUE@ +-BUILD_PANGOCAIRO_FALSE = @BUILD_PANGOCAIRO_FALSE@ +-BUILD_PANGOCAIRO_TRUE = @BUILD_PANGOCAIRO_TRUE@ +-BUILD_PANGO_FALSE = @BUILD_PANGO_FALSE@ +-BUILD_PANGO_TRUE = @BUILD_PANGO_TRUE@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +@@ -89,8 +71,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +-ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ + EXEEXT = @EXEEXT@ + FGREP = @FGREP@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -110,14 +90,9 @@ GTKUNIXPRINT_LIBS = @GTKUNIXPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HAVE_GTK_2_10 = @HAVE_GTK_2_10@ +-HAVE_GTK_2_10_FALSE = @HAVE_GTK_2_10_FALSE@ +-HAVE_GTK_2_10_TRUE = @HAVE_GTK_2_10_TRUE@ + HAVE_GTK_2_12 = @HAVE_GTK_2_12@ +-HAVE_GTK_2_12_FALSE = @HAVE_GTK_2_12_FALSE@ +-HAVE_GTK_2_12_TRUE = @HAVE_GTK_2_12_TRUE@ + HAVE_GTK_2_14 = @HAVE_GTK_2_14@ +-HAVE_GTK_2_14_FALSE = @HAVE_GTK_2_14_FALSE@ +-HAVE_GTK_2_14_TRUE = @HAVE_GTK_2_14_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -132,13 +107,13 @@ LIBTOOL = @LIBTOOL@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -153,8 +128,6 @@ PANGO_CFLAGS = @PANGO_CFLAGS@ + PANGO_LIBS = @PANGO_LIBS@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@ + PYCAIRO_LIBS = @PYCAIRO_LIBS@ + PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@ +@@ -181,10 +154,12 @@ STRIP = @STRIP@ + THREADING_CFLAGS = @THREADING_CFLAGS@ + VERSION = @VERSION@ + XSLTPROC = @XSLTPROC@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -196,6 +171,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -228,8 +204,12 @@ pyexecdir = @pyexecdir@ + pythondir = @pythondir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + EXTRA_DIST = $(tests) common.py runtests.py testmodule.py leak.glade + tests = \ + test_actiongroup.py \ +@@ -257,12 +237,12 @@ GTK_PY_FILES = __init__.py _lazyutils.py + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -282,9 +262,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + mostlyclean-libtool: +@@ -292,10 +272,6 @@ mostlyclean-libtool: + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + +@@ -304,22 +280,21 @@ CTAGS: + + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -365,7 +340,7 @@ clean-am: clean-generic clean-libtool mo + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -379,12 +354,20 @@ info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -403,17 +386,21 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: all all-am check check-am check-local clean clean-generic \ + clean-libtool distclean distclean-generic distclean-libtool \ + distdir dvi dvi-am html html-am info info-am install \ +- install-am install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am install-man \ ++ install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am ++ uninstall uninstall-am + + + check-local: $(top_srcdir)/gtk/__init__.py