--- pygobject-2.14.2.orig/config.guess +++ pygobject-2.14.2/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2007-07-22' +timestamp='2008-01-23' # 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 @@ -56,8 +56,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -532,7 +532,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[45]) + *:AIX:*:[456]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -799,6 +799,9 @@ EM64T | authenticamd) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks @@ -833,7 +836,14 @@ echo ${UNAME_MACHINE}-pc-minix exit ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -954,8 +964,8 @@ x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; - xtensa:Linux:*:*) - echo xtensa-unknown-linux-gnu + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so @@ -1474,9 +1484,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD and - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be --- pygobject-2.14.2.orig/config.sub +++ pygobject-2.14.2/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2007-06-28' +timestamp='2008-01-16' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -72,8 +72,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -369,10 +369,14 @@ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-*) ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -443,6 +447,14 @@ basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; c90) basic_machine=c90-cray os=-unicos @@ -668,6 +680,14 @@ basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -813,6 +833,14 @@ basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -1021,6 +1049,10 @@ basic_machine=tic6x-unknown os=-coff ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown ;; --- pygobject-2.14.2.orig/debian/docs +++ pygobject-2.14.2/debian/docs @@ -0,0 +1,3 @@ +NEWS +README +AUTHORS --- pygobject-2.14.2.orig/debian/python-gobject-dev.links +++ pygobject-2.14.2/debian/python-gobject-dev.links @@ -0,0 +1 @@ +/usr/share/gtk-doc/html/pygobject /usr/share/doc/python-gobject-dev/html --- pygobject-2.14.2.orig/debian/python-gobject.examples +++ pygobject-2.14.2/debian/python-gobject.examples @@ -0,0 +1 @@ +examples/*.py --- pygobject-2.14.2.orig/debian/watch +++ pygobject-2.14.2/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://ftp.gnome.org/pub/GNOME/sources/pygobject/([\d\.]+)[02468]/pygobject-([\d\.]+)\.tar\.gz --- pygobject-2.14.2.orig/debian/changelog +++ pygobject-2.14.2/debian/changelog @@ -0,0 +1,153 @@ +pygobject (2.14.2-0ubuntu2) hardy-proposed; urgency=low + + [ Colin Watson ] + * Pass PYTHON environment variable to make as well as configure, in case + timestamp skew causes make to rerun autoconf and ./config.status + --recheck (LP: #309674). + + [ Loic Minier ] + * New patch, 62_autofoo, to hold diff against aclocal.m4 and configure + instead of 60_use-python-config-for-includes and 61_dont_use_setwakeupfd; + fixes timestamp skew; LP: #309674. + + -- Loic Minier Fri, 19 Dec 2008 15:59:36 +0100 + +pygobject (2.14.2-0ubuntu1) hardy-proposed; urgency=low + + * New upstream version: + - Allow gobject.property work with subclasses. (lp: #234810) + - Unbreak Source.prepare + - Never override customly set 'tp_new' and 'tp_alloc' + - Don't link against libffi if we cannot find libffi on the system. + - Dist .m4 files. + - Don't return NULL after warning of enum comparsion + * debian/patches/60_use-python-config-for-includes.patch: + - new version update + + -- Sebastien Bacher Mon, 16 Jun 2008 14:30:10 +0200 + +pygobject (2.14.1-2ubuntu2) hardy; urgency=low + + * add missing conflicts/replaces to python2.4-gobject + * Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Michael Vogt Wed, 09 Apr 2008 09:57:29 +0200 + +pygobject (2.14.1-2ubuntu1) hardy; urgency=low + + * debian/patches/61_dont_use_setwakeupfd.patch: + - don't use SetWakeupFd, it creates abnormal cpu usage in some situations + + -- Sebastien Bacher Wed, 19 Mar 2008 22:17:53 +0100 + +pygobject (2.14.1-2) unstable; urgency=low + + * New patch, 60_use-python-config-for-includes, use python-config to set + PYTHON_INCLUDES; fixes support for -dbg package; GNOME #448173; + closes: #468130. NB: the patch also ships m4/ from upstream SVN as this + wasn't disted properly and also updated autoconf. + + -- Loic Minier Wed, 27 Feb 2008 16:09:00 +0100 + +pygobject (2.14.1-1) unstable; urgency=low + + * New upstream release; new features / bug fixes. + + -- Loic Minier Mon, 07 Jan 2008 10:59:32 +0100 + +pygobject (2.14.0-4) unstable; urgency=low + + * debian/rules: + - don't stop the build when make check has an error to avoid having + to add a depends on pygtk + + -- Sebastien Bacher Sat, 01 Dec 2007 23:20:19 +0100 + +pygobject (2.14.0-3) unstable; urgency=low + + * debian/control.in: + - Build-Depends on python-all-dbg + - Conflicts,Provides,Replaces python-gobject-doc + - list python-gobject-dbg package + * debian/rules: + - build dbg variant + - run make check + + -- Sebastien Bacher Fri, 30 Nov 2007 12:46:58 +0100 + +pygobject (2.14.0-2) unstable; urgency=low + + * python-gobject-dev depends on libglib2.0-dev and libffi-dev. + + -- Josselin Mouette Sun, 23 Sep 2007 22:43:19 +0200 + +pygobject (2.14.0-1) unstable; urgency=low + + * New upstream release. + * Use source:Version. + * Build-depend on libffi-dev. + + -- Josselin Mouette Sat, 22 Sep 2007 10:11:58 +0200 + +pygobject (2.12.3-2) unstable; 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. + * Cleanup rules. + * Build-depend on autotools-dev. + * Honor CFLAGS we set in rules, doh! + * Set some sane default CFLAGS and honor noopt in DEB_BUILD_OPTIONS. + * Upload to unstable; drop check-dist include. + * Add watch file. + * Fix URL in copyright. + * Wrap build-deps and deps. + * Set XS-Python-Version to >= 2.3 and build-conflict on python2.3-dev << + 2.3.5; add XB-Python-Version; bump python-all-dev build-dep to >= 2.3.5. + * Add a ${misc:Depends}. + * Don't pass --host to configure when DEB_BUILD_GNU_TYPE equals + DEB_HOST_GNU_TYPE. + * build target is PHONY. + * Cleanups. + + -- Loic Minier Sat, 14 Apr 2007 13:29:37 +0200 + +pygobject (2.12.3-1) experimental; urgency=low + + * New upstream release. + * 01_doc_licensing.patch: removed, integrated upstream. + + -- Josselin Mouette Thu, 4 Jan 2007 20:41:25 +0100 + +pygobject (2.12.1-4) experimental; urgency=low + + * python-gobject-dev recommends docbook-xsl. + * python-gobject-dev depends on python-dev. + + -- Josselin Mouette Tue, 2 Jan 2007 22:27:27 +0100 + +pygobject (2.12.1-3) experimental; urgency=low + + [ Josselin Mouette ] + * Build-depend on docbook-xsl (closes: #397811). + + [ Loic Minier ] + * Upload. + + -- Loic Minier Sun, 3 Dec 2006 13:50:38 +0100 + +pygobject (2.12.1-2) experimental; urgency=low + + * 01_doc_licensing.patch: stolen from upstream CVS. Upstream agreed to + relicense the documentation to LGPL. + * copyright: document that. + + -- Josselin Mouette Thu, 12 Oct 2006 20:35:45 +0200 + +pygobject (2.12.1-1) experimental; urgency=low + + * Initial release. + * This package was split out from pygtk. + + -- Josselin Mouette Tue, 26 Sep 2006 21:30:26 +0200 --- pygobject-2.14.2.orig/debian/rules +++ pygobject-2.14.2/debian/rules @@ -0,0 +1,129 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2) + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +configure_flags += \ + --prefix=/usr \ + --enable-thread \ + --build=$(DEB_BUILD_GNU_TYPE) + +ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) + configure_flags += --host=$(DEB_HOST_GNU_TYPE) +endif + +PYVERS := $(shell pyversions -vs) + +build-%/configure-stamp: + dh_testdir + mkdir -p build-$* + cd build-$* && \ + PYTHON=/usr/bin/python$* CFLAGS="$(CFLAGS)" \ + $(CURDIR)/configure $(configure_flags) + touch $@ + +dbg-build-%/configure-stamp: + dh_testdir + mkdir -p dbg-build-$* + cd dbg-build-$* && \ + PYTHON=/usr/bin/python$*-dbg CFLAGS="$(CFLAGS) -O0" \ + $(CURDIR)/configure $(configure_flags) + touch $@ + +build-%/build-stamp: build-%/configure-stamp + dh_testdir + PYTHON=/usr/bin/python$* $(MAKE) -C build-$* + -PYTHON=/usr/bin/python$* $(MAKE) -C build-$* check + touch $@ + +dbg-build-%/build-stamp: dbg-build-%/configure-stamp + dh_testdir + PYTHON=/usr/bin/python$*-dbg $(MAKE) -C dbg-build-$* + touch $@ + +build: apply-patches $(PYVERS:%=build-%/build-stamp) $(PYVERS:%=dbg-build-%/build-stamp) + +install-clean: + dh_testdir + dh_testroot + dh_clean -k + +install-%: build-%/build-stamp + dh_testdir + dh_testroot + PYTHON=/usr/bin/python$* $(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/python-gobject-dev + +dbg-install-%: dbg-build-%/build-stamp + dh_testdir + dh_testroot + PYTHON=/usr/bin/python$*-dbg $(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-gobject-dbg + find debian/python-gobject-dbg ! -type d ! -name '*.so' | xargs rm -f + find debian/python-gobject-dbg -depth -empty -exec rmdir {} \; + +install: build install-clean $(PYVERS:%=install-%) $(PYVERS:%=dbg-install-%) + dh_testdir + dh_testroot + find debian/python-gobject-dev -name \*.la -exec rm -f \{\} \; + mkdir -p debian/python-gobject/usr/lib + mv debian/python-gobject-dev/usr/lib/python* debian/python-gobject/usr/lib/ + for i in $$(find debian/python-gobject-dbg -name '*.so'); do \ + b=$$(basename $$i .so); \ + mv $$i $$(dirname $$i)/$${b}_d.so; \ + done + +clean:: reverse-patches + dh_testdir + dh_testroot + rm -Rf build-* dbg-build-* + -test -f config.sub && \ + test -r /usr/share/misc/config.sub && \ + cp -f /usr/share/misc/config.sub config.sub + -test -f config.guess && \ + test -r /usr/share/misc/config.guess && \ + cp -f /usr/share/misc/config.guess config.guess + dh_clean *.pyc */*.pyc + +binary-indep: build install + dh_testdir + dh_testroot + dh_installdocs -i + dh_installexamples -i + dh_installchangelogs ChangeLog -i + dh_link -i + dh_compress -i -X.py + dh_fixperms -i + # More permission fixing + chmod 755 `grep -rl "^#\!.*python" debian/python-gobject-dev/usr` + dh_pysupport -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs -a + dh_installexamples -a + dh_installchangelogs ChangeLog -a + dh_strip -ppython-gobject --dbg-package=python-gobject-dbg + rm -rf debian/python-gobject-dbg/usr/share/doc/python-gobject-dbg + ln -sf python-gobject debian/python-gobject-dbg/usr/share/doc/python-gobject-dbg + dh_link -a + dh_compress -a -X.py + dh_fixperms -a + dh_pysupport -a + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-arch binary-indep +.PHONY: build clean binary-indep binary-arch binary build install --- pygobject-2.14.2.orig/debian/compat +++ pygobject-2.14.2/debian/compat @@ -0,0 +1 @@ +5 --- pygobject-2.14.2.orig/debian/control.in +++ pygobject-2.14.2/debian/control.in @@ -0,0 +1,73 @@ +Source: pygobject +Section: python +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Josselin Mouette +Uploaders: @GNOME_TEAM@ +Build-Depends: debhelper (>= 5), + python-support (>= 0.4), + gnome-pkg-tools (>= 0.10), + cdbs, + python-all-dev (>= 2.3.5), + libglib2.0-dev (>= 2.8.0), + libffi-dev, + xsltproc, + docbook-xsl, + autotools-dev, + python-all-dbg +Build-Conflicts: python2.3-dev (<< 2.3.5) +XS-Python-Version: >= 2.3 +Standards-Version: 3.7.2 + +Package: python-gobject +Architecture: any +Depends: ${python:Depends}, + ${shlibs:Depends}, + ${misc:Depends} +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Suggests: python-gobject-dbg +Conflicts: python-gtk2 (<< 2.10), python2.4-gobject +Replaces: python2.4-gobject +Description: Python bindings for the GObject library + GObject is an abstraction layer that allows to program with an object + paradigm that is compatible with many languages. It is a part of Glib, + the core library used to build GTK+ and GNOME. + . + This package contains the python bindings for GObject. It is mostly + used by other bindings to map their GObjects to python objects. + +Package: python-gobject-dev +Architecture: all +Depends: ${python:Depends}, + ${misc:Depends}, + python-gobject (>= ${source:Version}), + python-dev, + libglib2.0-dev (>= 2.8.0), + libffi-dev +Conflicts: python-gtk2-dev (<< 2.10), python-gobject-doc +Replaces: python-gobject-doc +Provides: python-gobject-doc +Recommends: docbook-xsl +Description: Development headers for the GObject python bindings + GObject is an abstraction layer that allows to program with an object + paradigm that is compatible with many languages. It is a part of Glib, + the core library used to build GTK+ and GNOME. + . + This package contains the development headers needed to build + other python bindings relying on pygobject. + +Package: python-gobject-dbg +Priority: extra +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python-dbg, python-gobject (= ${Source-Version}) +Conflicts: python-gtk2 (<< 2.10) +Description: Python bindings for the GObject library (debug extension) + GObject is an abstraction layer that allows to program with an object + paradigm that is compatible with many languages. It is a part of + Glib, + the core library used to build GTK+ and GNOME. + . + This package contains the python bindings for GObject. It is + mostly + used by other bindings to map their GObjects to python objects. --- pygobject-2.14.2.orig/debian/control +++ pygobject-2.14.2/debian/control @@ -0,0 +1,73 @@ +Source: pygobject +Section: python +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Josselin Mouette +Uploaders: Debian GNOME Maintainers , Josselin Mouette , Loic Minier , Sebastien Bacher +Build-Depends: debhelper (>= 5), + python-support (>= 0.4), + gnome-pkg-tools (>= 0.10), + cdbs, + python-all-dev (>= 2.3.5), + libglib2.0-dev (>= 2.8.0), + libffi-dev, + xsltproc, + docbook-xsl, + autotools-dev, + python-all-dbg +Build-Conflicts: python2.3-dev (<< 2.3.5) +XS-Python-Version: >= 2.3 +Standards-Version: 3.7.2 + +Package: python-gobject +Architecture: any +Depends: ${python:Depends}, + ${shlibs:Depends}, + ${misc:Depends} +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Suggests: python-gobject-dbg +Conflicts: python-gtk2 (<< 2.10), python2.4-gobject +Replaces: python2.4-gobject +Description: Python bindings for the GObject library + GObject is an abstraction layer that allows to program with an object + paradigm that is compatible with many languages. It is a part of Glib, + the core library used to build GTK+ and GNOME. + . + This package contains the python bindings for GObject. It is mostly + used by other bindings to map their GObjects to python objects. + +Package: python-gobject-dev +Architecture: all +Depends: ${python:Depends}, + ${misc:Depends}, + python-gobject (>= ${source:Version}), + python-dev, + libglib2.0-dev (>= 2.8.0), + libffi-dev +Conflicts: python-gtk2-dev (<< 2.10), python-gobject-doc +Replaces: python-gobject-doc +Provides: python-gobject-doc +Recommends: docbook-xsl +Description: Development headers for the GObject python bindings + GObject is an abstraction layer that allows to program with an object + paradigm that is compatible with many languages. It is a part of Glib, + the core library used to build GTK+ and GNOME. + . + This package contains the development headers needed to build + other python bindings relying on pygobject. + +Package: python-gobject-dbg +Priority: extra +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python-dbg, python-gobject (= ${Source-Version}) +Conflicts: python-gtk2 (<< 2.10) +Description: Python bindings for the GObject library (debug extension) + GObject is an abstraction layer that allows to program with an object + paradigm that is compatible with many languages. It is a part of + Glib, + the core library used to build GTK+ and GNOME. + . + This package contains the python bindings for GObject. It is + mostly + used by other bindings to map their GObjects to python objects. --- pygobject-2.14.2.orig/debian/copyright +++ pygobject-2.14.2/debian/copyright @@ -0,0 +1,31 @@ +This package was debianized by Josselin Mouette on +Tue, 26 Sep 2006 21:31:55 +0200. + +It was downloaded from + +Upstream authors: James Henstridge + Johan Dahlin + +License: + + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. + + +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. --- pygobject-2.14.2.orig/debian/patches/62_autofoo.patch +++ pygobject-2.14.2/debian/patches/62_autofoo.patch @@ -0,0 +1,1701 @@ +diff -Nur pygobject-2.14.2/aclocal.m4 pygobject-2.14.2.new/aclocal.m4 +--- pygobject-2.14.2/aclocal.m4 2008-05-23 18:54:07.000000000 +0200 ++++ pygobject-2.14.2.new/aclocal.m4 2008-12-19 15:52:36.000000000 +0100 +@@ -1,7 +1,7 @@ +-# generated automatically by aclocal 1.8.5 -*- Autoconf -*- ++# generated automatically by aclocal 1.10.1 -*- Autoconf -*- + +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +-# Free Software Foundation, Inc. ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ++# 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(AC_AUTOCONF_VERSION, [2.61],, ++[m4_warning([this file was generated for autoconf 2.61. ++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 + +@@ -7033,55 +7041,49 @@ + fi[]dnl + ])# PKG_CHECK_MODULES + +-# -*- Autoconf -*- +-# Copyright (C) 2002, 2003 Free Software Foundation, Inc. +-# Generated from amversion.in; do not edit by hand. +- +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++# Copyright (C) 2002, 2003, 2005, 2006, 2007 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_AUTOMAKE_VERSION(VERSION) + # ---------------------------- + # 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.8"]) ++# (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.1], [], ++ [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. ++# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. + # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +- [AM_AUTOMAKE_VERSION([1.8.5])]) +- +-# AM_AUX_DIR_EXPAND ++[AM_AUTOMAKE_VERSION([1.10.1])dnl ++m4_ifndef([AC_AUTOCONF_VERSION], ++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl ++_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) + +-# Copyright (C) 2001, 2003 Free Software Foundation, Inc. ++# AM_AUX_DIR_EXPAND -*- Autoconf -*- + +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets + # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +@@ -7128,26 +7130,16 @@ + am_aux_dir=`cd $ac_aux_dir && pwd` + ]) + +-# AM_CONDITIONAL -*- Autoconf -*- +- +-# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc. ++# AM_CONDITIONAL -*- Autoconf -*- + +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# 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 6 ++# serial 8 + + # AM_CONDITIONAL(NAME, SHELL-CONDITION) + # ------------------------------------- +@@ -7156,8 +7148,10 @@ + [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='#' +@@ -7167,30 +7161,18 @@ + fi + AC_CONFIG_COMMANDS_PRE( + [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then +- AC_MSG_ERROR([conditional "$1" was never defined. +-Usually this means the macro was only invoked conditionally.]) ++ AC_MSG_ERROR([[conditional "$1" was never defined. ++Usually this means the macro was only invoked conditionally.]]) + fi])]) + +-# serial 7 -*- Autoconf -*- +- +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 ++# 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. + +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. +- ++# 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, +@@ -7199,7 +7181,6 @@ + # CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + +- + # _AM_DEPENDENCIES(NAME) + # ---------------------- + # See how the compiler implements dependency checking. +@@ -7219,6 +7200,7 @@ + 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=]) + +@@ -7284,6 +7266,7 @@ + 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 +@@ -7336,29 +7319,20 @@ + 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 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 +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. ++# Generate code to set up dependency tracking. -*- Autoconf -*- + +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# Copyright (C) 1999, 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 2 ++#serial 3 + + # _AM_OUTPUT_DEPENDENCY_COMMANDS + # ------------------------------ +@@ -7371,33 +7345,28 @@ + # 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 + fi +- grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue +- # Extract the definition of DEP_FILES from the Makefile without +- # running `make'. ++ # Extract the definition of DEPDIR, am__include, and am__quote ++ # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue ++ am__include=`sed -n 's/^am__include = //p' < "$mf"` ++ test -z "am__include" && continue ++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` +- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" +- # We invoke sed twice because it is the simplest approach to +- # changing $(DEPDIR) to its actual value in the expansion. +- for file in `sed -n ' +- /^DEP_FILES = .*\\\\$/ { +- s/^DEP_FILES = // +- :loop +- s/\\\\$// +- p +- n +- /\\\\$/ b loop +- p +- } +- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ ++ # Find all dependency output files, they are included files with ++ # $(DEPDIR) in their names. We invoke sed twice because it is the ++ # simplest approach to changing $(DEPDIR) to its actual value in the ++ # expansion. ++ for file in `sed -n " ++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue +@@ -7423,54 +7392,31 @@ + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) + ]) + +-# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- +- +-# Copyright (C) 1996, 1997, 2000, 2001, 2003 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 +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-# serial 7 ++# serial 8 + + # AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. + AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) + +-# Do all the work for Automake. -*- Autoconf -*- ++# Do all the work for Automake. -*- Autoconf -*- + +-# 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. +- +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# 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 +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. ++# 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. + +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# serial 13 + +-# serial 11 ++# 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. + + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) + # AM_INIT_AUTOMAKE([OPTIONS]) +@@ -7484,16 +7430,20 @@ + # 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 +@@ -7513,6 +7463,9 @@ + 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 + +@@ -7528,7 +7481,6 @@ + AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) + AM_MISSING_PROG(AUTOHEADER, autoheader) + AM_MISSING_PROG(MAKEINFO, makeinfo) +-AM_MISSING_PROG(AMTAR, tar) + AM_PROG_INSTALL_SH + AM_PROG_INSTALL_STRIP + AC_REQUIRE([AM_PROG_MKDIR_P])dnl +@@ -7537,7 +7489,9 @@ + AC_REQUIRE([AC_PROG_AWK])dnl + AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AM_SET_LEADING_DOT])dnl +- ++_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], ++ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], ++ [_AM_PROG_TAR([v7])])]) + _AM_IF_OPTION([no-dependencies],, + [AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES(CC)], +@@ -7547,6 +7501,10 @@ + [_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 + ]) + ]) + +@@ -7560,62 +7518,39 @@ + # 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. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + + # AM_PROG_INSTALL_SH + # ------------------ + # Define $install_sh. +- +-# Copyright (C) 2001, 2003 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 +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. +- + 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)]) + +-# -*- Autoconf -*- +-# Copyright (C) 2003 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 +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# Copyright (C) 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-# serial 1 ++# serial 2 + + # Check whether the underlying file-system supports filenames + # with a leading dot. For instance MS-DOS doesn't. +@@ -7630,26 +7565,15 @@ + rmdir .tst 2>/dev/null + AC_SUBST([am__leading_dot])]) + +-# Check to see how 'make' treats includes. -*- Autoconf -*- +- +-# Copyright (C) 2001, 2002, 2003 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 +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. ++# Check to see how 'make' treats includes. -*- Autoconf -*- + +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-# serial 2 ++# serial 3 + + # AM_MAKE_INCLUDE() + # ----------------- +@@ -7693,27 +7617,16 @@ + rm -f confinc confmf + ]) + +-# -*- Autoconf -*- +- ++# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +-# Copyright (C) 1997, 1999, 2000, 2001, 2003 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 +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# 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 3 ++# serial 5 + + # AM_MISSING_PROG(NAME, PROGRAM) + # ------------------------------ +@@ -7729,6 +7642,7 @@ + # 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 +@@ -7739,92 +7653,41 @@ + fi + ]) + ++# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ + # AM_PROG_MKDIR_P + # --------------- +-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. +- +-# Copyright (C) 2003, 2004 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 +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. +- +-# 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 +- # Keeping the `.' argument allows $(mkdir_p) to be used without +- # argument. Indeed, we sometimes output rules like +- # $(mkdir_p) $(somedir) +- # where $(somedir) is conditionally defined. +- # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more +- # expensive solution, as it forces Make to start a sub-shell.) +- 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])]) +- +-# Helper functions for option handling. -*- Autoconf -*- +- +-# Copyright (C) 2001, 2002, 2003 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 +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. ++[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 ++]) + +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. ++# Helper functions for option handling. -*- Autoconf -*- + +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-# serial 2 ++# serial 3 + + # _AM_MANGLE_OPTION(NAME) + # ----------------------- +@@ -7849,64 +7712,50 @@ + AC_DEFUN([_AM_IF_OPTION], + [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +- +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 + # 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 +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# ++# 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_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +- ++# --------------------------------------------------------------------------- + # Adds support for distributing Python modules and packages. To + # install modules, copy them to $(pythondir), using the python_PYTHON + # automake variable. To install a package with the same name as the + # automake package, install to $(pkgpythondir), or use the + # pkgpython_PYTHON automake variable. +- ++# + # The variables $(pyexecdir) and $(pkgpyexecdir) are provided as + # locations to install python extension modules (shared libraries). + # Another macro is required to find the appropriate flags to compile + # extension modules. +- ++# + # If your package is configured with a different prefix to python, + # users will have to add the install directory to the PYTHONPATH + # environment variable, or create a .pth file (see the python + # documentation for details). +- ++# + # If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will + # cause an error if the version of python installed on the system + # doesn't meet the requirement. MINIMUM-VERSION should consist of + # numbers and dots only. +- + AC_DEFUN([AM_PATH_PYTHON], + [ + dnl Find a Python interpreter. Python versions prior to 1.5 are not + dnl supported because the default installation locations changed from + dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages + dnl in 1.5. +- m4_define([_AM_PYTHON_INTERPRETER_LIST], +- [python python2 python2.4 python2.3 python2.2 dnl ++ m4_define_default([_AM_PYTHON_INTERPRETER_LIST], ++ [python python2 python2.5 python2.4 python2.3 python2.2 dnl + python2.1 python2.0 python1.6 python1.5]) + + m4_if([$1],[],[ + dnl No version check is needed. + # Find any Python interpreter. + if test -z "$PYTHON"; then +- PYTHON=: +- AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST) ++ AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :) + fi + am_display_PYTHON=python + ], [ +@@ -8027,22 +7876,11 @@ + sys.exit(sys.hexversion < minverhex)" + AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) + +-# Copyright (C) 2001, 2003 Free Software Foundation, Inc. -*- Autoconf -*- +- +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + + # AM_RUN_LOG(COMMAND) + # ------------------- +@@ -8055,28 +7893,16 @@ + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + +-# +-# Check to make sure that the build environment is sane. +-# +- +-# Copyright (C) 1996, 1997, 2000, 2001, 2003 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 +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. ++# Check to make sure that the build environment is sane. -*- Autoconf -*- + +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-# serial 3 ++# serial 4 + + # AM_SANITY_CHECK + # --------------- +@@ -8119,25 +7945,14 @@ + fi + AC_MSG_RESULT(yes)]) + +-# AM_PROG_INSTALL_STRIP +- +-# Copyright (C) 2001, 2003 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 +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + ++# AM_PROG_INSTALL_STRIP ++# --------------------- + # One issue with vendor `install' (even GNU) is that you can't + # specify the program used to strip binaries. This is especially + # annoying in cross-compiling environments, where the build's strip +@@ -8155,135 +7970,117 @@ + 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])]) + +-dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR) +-dnl +-dnl example +-dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir) +-dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local ++# 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. + +-AC_DEFUN([AS_AC_EXPAND], +-[ +- EXP_VAR=[$1] +- FROM_VAR=[$2] ++# _AM_SUBST_NOTMAKE(VARIABLE) ++# --------------------------- ++# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. ++# This macro is traced by Automake. ++AC_DEFUN([_AM_SUBST_NOTMAKE]) + +- dnl first expand prefix and exec_prefix if necessary +- prefix_save=$prefix +- exec_prefix_save=$exec_prefix ++# Check how to create a tarball. -*- Autoconf -*- + +- dnl if no prefix given, then use /usr/local, the default prefix +- if test "x$prefix" = "xNONE"; then +- prefix=$ac_default_prefix +- fi +- dnl if no exec_prefix given, then use prefix +- if test "x$exec_prefix" = "xNONE"; then +- exec_prefix=$prefix +- fi ++# Copyright (C) 2004, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- full_var="$FROM_VAR" +- dnl loop until it doesn't change anymore +- while true; do +- new_full_var="`eval echo $full_var`" +- if test "x$new_full_var"="x$full_var"; then break; fi +- full_var=$new_full_var +- done ++# serial 2 + +- dnl clean up +- full_var=$new_full_var +- AC_SUBST([$1], "$full_var") +- +- dnl restore prefix and exec_prefix +- prefix=$prefix_save +- exec_prefix=$exec_prefix_save +-]) ++# _AM_PROG_TAR(FORMAT) ++# -------------------- ++# Check how to create a tarball in format FORMAT. ++# FORMAT should be one of `v7', `ustar', or `pax'. ++# ++# Substitute a variable $(am__tar) that is a command ++# writing to stdout a FORMAT-tarball containing the directory ++# $tardir. ++# tardir=directory && $(am__tar) > result.tar ++# ++# Substitute a variable $(am__untar) that extract such ++# a tarball read from stdin. ++# $(am__untar) < result.tar ++AC_DEFUN([_AM_PROG_TAR], ++[# Always define AMTAR for backward compatibility. ++AM_MISSING_PROG([AMTAR], [tar]) ++m4_if([$1], [v7], ++ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], ++ [m4_case([$1], [ustar],, [pax],, ++ [m4_fatal([Unknown tar format])]) ++AC_MSG_CHECKING([how to create a $1 tar archive]) ++# Loop over all known methods to create a tar archive until one works. ++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' ++_am_tools=${am_cv_prog_tar_$1-$_am_tools} ++# Do not fold the above two line into one, because Tru64 sh and ++# Solaris sh will not grok spaces in the rhs of `-'. ++for _am_tool in $_am_tools ++do ++ case $_am_tool in ++ gnutar) ++ for _am_tar in tar gnutar gtar; ++ do ++ AM_RUN_LOG([$_am_tar --version]) && break ++ done ++ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' ++ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' ++ am__untar="$_am_tar -xf -" ++ ;; ++ plaintar) ++ # Must skip GNU tar: if it does not support --format= it doesn't create ++ # ustar tarball either. ++ (tar --version) >/dev/null 2>&1 && continue ++ am__tar='tar chf - "$$tardir"' ++ am__tar_='tar chf - "$tardir"' ++ am__untar='tar xf -' ++ ;; ++ pax) ++ am__tar='pax -L -x $1 -w "$$tardir"' ++ am__tar_='pax -L -x $1 -w "$tardir"' ++ am__untar='pax -r' ++ ;; ++ cpio) ++ am__tar='find "$$tardir" -print | cpio -o -H $1 -L' ++ am__tar_='find "$tardir" -print | cpio -o -H $1 -L' ++ am__untar='cpio -i -H $1 -d' ++ ;; ++ none) ++ am__tar=false ++ am__tar_=false ++ am__untar=false ++ ;; ++ esac + +-dnl +-dnl JH_ADD_CFLAG(FLAG) +-dnl checks whether the C compiler supports the given flag, and if so, adds +-dnl it to $CFLAGS. If the flag is already present in the list, then the +-dnl check is not performed. +-AC_DEFUN([JH_ADD_CFLAG], +-[ +-case " $CFLAGS " in +-*@<:@\ \ @:>@$1@<:@\ \ @:>@*) +- ;; +-*) +- save_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS $1" +- AC_MSG_CHECKING([whether [$]CC understands $1]) +- AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no]) +- AC_MSG_RESULT($jh_has_option) +- if test $jh_has_option = no; then +- CFLAGS="$save_CFLAGS" +- fi +- ;; +-esac]) ++ # If the value was cached, stop now. We just wanted to have am__tar ++ # and am__untar set. ++ test -n "${am_cv_prog_tar_$1}" && break + +-dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]]) +-dnl Check if a module containing a given symbol is visible to python. +-AC_DEFUN([AM_CHECK_PYMOD], +-[AC_REQUIRE([AM_PATH_PYTHON]) +-py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'` +-AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1) +-AC_CACHE_VAL(py_cv_mod_$py_mod_var, [ +-ifelse([$2],[], [prog=" +-import sys +-try: +- import $1 +-except ImportError: +- sys.exit(1) +-except: +- sys.exit(0) +-sys.exit(0)"], [prog=" +-import $1 +-$1.$2"]) +-if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC +- then +- eval "py_cv_mod_$py_mod_var=yes" +- else +- eval "py_cv_mod_$py_mod_var=no" ++ # tar/untar a dummy directory, and stop if the command works ++ rm -rf conftest.dir ++ mkdir conftest.dir ++ echo GrepMe > conftest.dir/file ++ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) ++ rm -rf conftest.dir ++ if test -s conftest.tar; then ++ AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi +-]) +-py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"` +-if test "x$py_val" != xno; then +- AC_MSG_RESULT(yes) +- ifelse([$3], [],, [$3 +-])dnl +-else +- AC_MSG_RESULT(no) +- ifelse([$4], [],, [$4 +-])dnl +-fi +-]) +- +-dnl a macro to check for ability to create python extensions +-dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE]) +-dnl function also defines PYTHON_INCLUDES +-AC_DEFUN([AM_CHECK_PYTHON_HEADERS], +-[AC_REQUIRE([AM_PATH_PYTHON]) +-AC_MSG_CHECKING(for headers required to compile python extensions) +-dnl deduce PYTHON_INCLUDES +-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 +-PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null` +-else +-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" +-if test "$py_prefix" != "$py_exec_prefix"; then +- PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" +-fi +-fi +-AC_SUBST(PYTHON_INCLUDES) +-dnl check if the headers exist: +-save_CPPFLAGS="$CPPFLAGS" +-CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" +-AC_TRY_CPP([#include ],dnl +-[AC_MSG_RESULT(found) +-$1],dnl +-[AC_MSG_RESULT(not found) +-$2]) +-CPPFLAGS="$save_CPPFLAGS" +-]) ++done ++rm -rf conftest.dir + ++AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) ++AC_MSG_RESULT([$am_cv_prog_tar_$1])]) ++AC_SUBST([am__tar]) ++AC_SUBST([am__untar]) ++]) # _AM_PROG_TAR ++ ++m4_include([m4/as-ac-expand.m4]) ++m4_include([m4/jhflags.m4]) ++m4_include([m4/python.m4]) +diff -Nur pygobject-2.14.2/configure pygobject-2.14.2.new/configure +--- pygobject-2.14.2/configure 2008-05-23 18:54:08.000000000 +0200 ++++ pygobject-2.14.2.new/configure 2008-12-19 15:52:36.000000000 +0100 +@@ -809,6 +809,7 @@ + INSTALL_PROGRAM + INSTALL_SCRIPT + INSTALL_DATA ++am__isrc + CYGPATH_W + PACKAGE + VERSION +@@ -817,7 +818,6 @@ + AUTOMAKE + AUTOHEADER + MAKEINFO +-AMTAR + install_sh + STRIP + INSTALL_STRIP_PROGRAM +@@ -825,6 +825,9 @@ + AWK + SET_MAKE + am__leading_dot ++AMTAR ++am__tar ++am__untar + build + build_cpu + build_vendor +@@ -1975,7 +1978,8 @@ + ac_config_headers="$ac_config_headers config.h" + + +-am__api_version="1.8" ++am__api_version='1.10' ++ + ac_aux_dir= + for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then +@@ -2158,30 +2162,53 @@ + 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 +- # Keeping the `.' argument allows $(mkdir_p) to be used without +- # argument. Indeed, we sometimes output rules like +- # $(mkdir_p) $(somedir) +- # where $(somedir) is conditionally defined. +- # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more +- # expensive solution, as it forces Make to start a sub-shell.) +- 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)' ++{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 ++echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } ++if test -z "$MKDIR_P"; then ++ if test "${ac_cv_path_mkdir+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&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 ++{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 ++echo "${ECHO_T}$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 +@@ -2264,12 +2291,16 @@ + 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 ++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 ++ { { 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;} + { (exit 1); exit 1; }; } ++ fi + fi + + # test whether we have cygpath +@@ -2312,10 +2343,7 @@ + + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +- +-AMTAR=${AMTAR-"${am_missing_run}tar"} +- +-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 +@@ -2419,10 +2447,17 @@ + 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. ++# Always define AMTAR for backward compatibility. ++ ++AMTAR=${AMTAR-"${am_missing_run}tar"} ++ ++am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' ++ ++ + + + +@@ -2524,9 +2559,7 @@ + esac + { echo "$as_me:$LINENO: result: $platform_win32" >&5 + echo "${ECHO_T}$platform_win32" >&6; } +- +- +-if test "$platform_win32" = "yes"; then ++ if test "$platform_win32" = "yes"; then + PLATFORM_WIN32_TRUE= + PLATFORM_WIN32_FALSE='#' + else +@@ -2547,9 +2580,7 @@ + esac + { echo "$as_me:$LINENO: result: $os_win32" >&5 + echo "${ECHO_T}$os_win32" >&6; } +- +- +-if test "$os_win32" = "yes"; then ++ if test "$os_win32" = "yes"; then + OS_WIN32_TRUE= + OS_WIN32_FALSE='#' + else +@@ -2689,9 +2720,7 @@ + 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 +@@ -2700,7 +2729,6 @@ + fi + + +- + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -3687,6 +3715,7 @@ + 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 +@@ -3716,9 +3745,7 @@ + echo "${ECHO_T}$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= +@@ -4382,7 +4409,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 4385 "configure"' > conftest.$ac_ext ++ echo '#line 4412 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -6762,11 +6789,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:6765: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:6792: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:6769: \$? = $ac_status" >&5 ++ echo "$as_me:6796: \$? = $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. +@@ -7052,11 +7079,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7055: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7082: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7059: \$? = $ac_status" >&5 ++ echo "$as_me:7086: \$? = $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. +@@ -7156,11 +7183,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7159: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7186: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:7163: \$? = $ac_status" >&5 ++ echo "$as_me:7190: \$? = $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 +@@ -9533,7 +9560,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&6 + else + +- for am_cv_pathless_PYTHON in python python2 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do ++ 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 + test "$am_cv_pathless_PYTHON" = none && break + prog="import sys, string + # split strings by '.' and convert to numeric. Append some zeros +@@ -10536,64 +10563,6 @@ + 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; } +-py_prefix=`$PYTHON -c "import sys; print sys.prefix"` +-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" +-old_CPPFLAGS=$CPPFLAGS +-CPPFLAGS="-Wall -Werror $PYTHON_INCLUDES" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +-int +-main () +-{ +-PySignal_SetWakeupFd(0); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- 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 +-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; } +-if test "x$setwakeupfd_ok" != xno; then +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_PYSIGNAL_SETWAKEUPFD 1 +-_ACEOF +- +-fi +-CPPFLAGS=$old_CPPFLAGS +- + PLATFORM=`$PYTHON -c "from distutils import util; print util.get_platform()"` + + +@@ -10659,9 +10628,7 @@ + + fi + +- +- +-if test x$enable_docs != xno; then ++ if test x$enable_docs != xno; then + ENABLE_DOCS_TRUE= + ENABLE_DOCS_FALSE='#' + else +@@ -11329,9 +11296,7 @@ + fi + { echo "$as_me:$LINENO: result: $pygobject_ffi_h" >&5 + echo "${ECHO_T}$pygobject_ffi_h" >&6; } +- +- +-if test "$pygobject_ffi_h" = "yes"; then ++ if test "$pygobject_ffi_h" = "yes"; then + HAVE_LIBFFI_TRUE= + HAVE_LIBFFI_FALSE='#' + else +@@ -12027,6 +11992,7 @@ + ac_pwd='$ac_pwd' + srcdir='$srcdir' + INSTALL='$INSTALL' ++MKDIR_P='$MKDIR_P' + _ACEOF + + cat >>$CONFIG_STATUS <<\_ACEOF +@@ -12247,6 +12213,7 @@ + INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim + INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim + INSTALL_DATA!$INSTALL_DATA$ac_delim ++am__isrc!$am__isrc$ac_delim + CYGPATH_W!$CYGPATH_W$ac_delim + PACKAGE!$PACKAGE$ac_delim + VERSION!$VERSION$ac_delim +@@ -12255,7 +12222,6 @@ + AUTOMAKE!$AUTOMAKE$ac_delim + AUTOHEADER!$AUTOHEADER$ac_delim + MAKEINFO!$MAKEINFO$ac_delim +-AMTAR!$AMTAR$ac_delim + install_sh!$install_sh$ac_delim + STRIP!$STRIP$ac_delim + INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim +@@ -12263,6 +12229,9 @@ + 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 + build!$build$ac_delim + build_cpu!$build_cpu$ac_delim + build_vendor!$build_vendor$ac_delim +@@ -12297,9 +12266,6 @@ + LN_S!$LN_S$ac_delim + ECHO!$ECHO$ac_delim + AR!$AR$ac_delim +-RANLIB!$RANLIB$ac_delim +-DSYMUTIL!$DSYMUTIL$ac_delim +-NMEDIT!$NMEDIT$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -12341,6 +12307,9 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++RANLIB!$RANLIB$ac_delim ++DSYMUTIL!$DSYMUTIL$ac_delim ++NMEDIT!$NMEDIT$ac_delim + DLLTOOL!$DLLTOOL$ac_delim + AS!$AS$ac_delim + OBJDUMP!$OBJDUMP$ac_delim +@@ -12376,7 +12345,7 @@ + LTLIBOBJS!$LTLIBOBJS$ac_delim + _ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 33; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +@@ -12603,6 +12572,11 @@ + [\\/$]* | ?:[\\/]* ) 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 +@@ -12656,6 +12630,7 @@ + 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 + +@@ -12771,21 +12746,22 @@ + fi + rm -f "$tmp/out12" + # 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 || ++echo X"$_am_arg" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -12820,8 +12796,9 @@ + # 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\(//\)[^/]' \| \ +@@ -12848,27 +12825,21 @@ + else + continue + fi +- grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue +- # Extract the definition of DEP_FILES from the Makefile without +- # running `make'. ++ # Extract the definition of DEPDIR, am__include, and am__quote ++ # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue ++ am__include=`sed -n 's/^am__include = //p' < "$mf"` ++ test -z "am__include" && continue ++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` +- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" +- # We invoke sed twice because it is the simplest approach to +- # changing $(DEPDIR) to its actual value in the expansion. +- for file in `sed -n ' +- /^DEP_FILES = .*\\\\$/ { +- s/^DEP_FILES = // +- :loop +- s/\\\\$// +- p +- n +- /\\\\$/ b loop +- p +- } +- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ ++ # Find all dependency output files, they are included files with ++ # $(DEPDIR) in their names. We invoke sed twice because it is the ++ # simplest approach to changing $(DEPDIR) to its actual value in the ++ # expansion. ++ for file in `sed -n " ++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue --- pygobject-2.14.2.orig/debian/patches/61_dont_use_setwakeupfd.patch +++ pygobject-2.14.2/debian/patches/61_dont_use_setwakeupfd.patch @@ -0,0 +1,29 @@ +--- pygobject-2.14.1/configure.ac 2008-03-19 22:16:07.000000000 +0100 ++++ pygobject-2.14.1.new/configure.ac 2008-03-19 22:17:42.000000000 +0100 +@@ -69,26 +69,6 @@ + + AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) + +-AC_MSG_CHECKING([for PySignal_SetWakeupFd in Python.h]) +-py_prefix=`$PYTHON -c "import sys; print sys.prefix"` +-if test -x "$PYTHON-config"; then +-PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null` +-else +-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" +-fi +-old_CPPFLAGS=$CPPFLAGS +-CPPFLAGS="-Wall -Werror $PYTHON_INCLUDES" +-AC_TRY_COMPILE([#include ], +- [PySignal_SetWakeupFd(0);], +- setwakeupfd_ok=yes, +- setwakeupfd_ok=no) +-AC_MSG_RESULT($setwakeupfd_ok) +-if test "x$setwakeupfd_ok" != xno; then +- AC_DEFINE(HAVE_PYSIGNAL_SETWAKEUPFD, 1, +- [Define to 1 if PySignal_SetWakeupFd is available]) +-fi +-CPPFLAGS=$old_CPPFLAGS +- + PLATFORM=`$PYTHON -c "from distutils import util; print util.get_platform()"` + AC_SUBST(PLATFORM) + --- pygobject-2.14.2.orig/debian/patches/60_use-python-config-for-includes.patch +++ pygobject-2.14.2/debian/patches/60_use-python-config-for-includes.patch @@ -0,0 +1,17 @@ +GNOME #448173, Debian #468130; use python-config to set PYTHON_INCLUDES; fixes +support for -dbg package + +--- pygobject-2.14.2/configure.ac 2008-05-23 18:51:11.000000000 +0200 ++++ pygobject-2.14.2.new/configure.ac 2008-06-16 14:38:45.000000000 +0200 +@@ -71,7 +71,11 @@ + + AC_MSG_CHECKING([for PySignal_SetWakeupFd in Python.h]) + py_prefix=`$PYTHON -c "import sys; print sys.prefix"` ++if test -x "$PYTHON-config"; then ++PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null` ++else + PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" ++fi + old_CPPFLAGS=$CPPFLAGS + CPPFLAGS="-Wall -Werror $PYTHON_INCLUDES" + AC_TRY_COMPILE([#include ],