Imported Upstream version 3.7.2

Change-Id: I6fbadd2c5d032a44b4b424160cdbd0f097320457 Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
author: DongHun Kwak <dh0128.kwak@samsung.com> 2017-07-12 08:48:07 +0900
committer: DongHun Kwak <dh0128.kwak@samsung.com> 2017-07-12 08:48:11 +0900
commit: 3b5dc6176476d5ed2313cd7185d985f47e225165 (patch)
tree: aee8e1d1c516bf7528eceae708baecfe484baddc
parent: d80fc1d31f28c6bcf9ea34b253e8765321616c3c (diff)
download: pygobject2-3b5dc6176476d5ed2313cd7185d985f47e225165.tar.gz
pygobject2-3b5dc6176476d5ed2313cd7185d985f47e225165.tar.bz2
pygobject2-3b5dc6176476d5ed2313cd7185d985f47e225165.zip
109 files changed, 21156 insertions, 23505 deletions
diff --git a/AUTHORS b/AUTHORS
index 4a37fe3..76b1091 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,8 +1,11 @@
-Original Authors
+Original Authors:
 James Henstridge <james@daa.com.au>
 Johan Dahlin <johan@gnome.org>
 
-Current Maintainers
-Gustavo J A M Carneiro <gjc@gnome.org>
-Paul Pogonyshev <pogonyshev@gmx.net>
-Gian Mario Tagliaretti <gianmt@gnome.org>
+Current Maintainers:
+Ignacio Casal Quinteiro <icq@gnome.org>
+Martin Pitt <martinpitt@gnome.org>
+Paolo Borelli <pborelli@gnome.org>
+Sebastian Pölsterl <sebp@k-d-w.org>
+Simon Feltman <s.feltman@gmail.com>
+Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
diff --git a/ChangeLog b/ChangeLog
index 97017f4..31a2925 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,2061 @@
+commit d0ed62afbc4cada0bf6abc4f8754e5a8d73036e4
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Mon Nov 19 15:13:28 2012 +0100
+
+    release 3.7.2
+
+ NEWS | 47 +++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 47 insertions(+)
+
+commit 29dc7425dd7584411b52ef07b50f929ed119a000
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Mon Nov 19 14:37:02 2012 +0100
+
+    Fix distcheck
+
+    Commit e617f76e forgot to rename the file in EXTRA_DIST
+
+ tests/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 567aae6e7c56bb89f53fcfccb1b0bc732f85b847
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Mon Nov 19 14:34:13 2012 +0100
+
+    tests: Fix unicode vs. str issues in Python 2
+
+    Some of the tests assumed a system default encoding of UTF-8, which
+    is not true
+    in Python 2 unless pygtkcompat is imported. Commit e617f76 uncovered
+    this.
+
+ tests/test_gi.py        |  8 ++++----
+ tests/test_iochannel.py | 16 +++++++++-------
+ 2 files changed, 13 insertions(+), 11 deletions(-)
+
+commit 509e5ac1a6dd8504e89c33c559fe4f72156a1ddf
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Mon Nov 19 14:20:56 2012 +0100
+
+    tests: Fix previous commit to fail properly on test failures
+
+ tests/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit e617f76e5b0c301c3ae92e1091aa86792de4d8e8
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Mon Nov 19 14:09:14 2012 +0100
+
+    tests: Run pygtkcompat tests separately
+
+    pygtkcompat changes the global namespace, in particular patching
+    Gdk and Gtk
+    overrides. Run the tests in a separate process so that the main
+    tests are not
+    potentially affected by the pygtkcompat test.
+
+    runtests.py runs all tests/test_*.py by default, so rename to
+    compat_test_pygtk.py and run that explicitly after successfully
+    running the
+    main tests.
+
+    See https://bugzilla.gnome.org/show_bug.cgi?id=688219
+
+ tests/Makefile.am          |   3 +
+ tests/compat_test_pygtk.py | 147
+ +++++++++++++++++++++++++++++++++++++++++++++
+ tests/test_pygtkcompat.py  | 147
+ ---------------------------------------------
+ 3 files changed, 150 insertions(+), 147 deletions(-)
+
+commit 8180b8092f99b7c9f0dee1742418efdbd23ab330
+Author: Simon Feltman <sfeltman@src.gnome.org>
+Date:   Thu Nov 15 02:51:52 2012 -0800
+
+    Move pygtkcompat into sibling package of gi
+
+    Move the pygtkcompat module out of the gi package and into
+    a sibling package as follows:
+
+    pygobject/
+      gi/
+      pygtkcompat/
+
+    This allows for pygtkcompat to grow without affecting the gi package.
+    Add deprecation message to gi/pygtkcompat.py
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=688219
+
+ Makefile.am                |   2 +-
+ configure.ac               |   1 +
+ gi/pygtkcompat.py          | 524
+ +++------------------------------------------
+ pygtkcompat/Makefile.am    |  15 ++
+ pygtkcompat/__init__.py    |  20 ++
+ pygtkcompat/pygtkcompat.py | 501
+ +++++++++++++++++++++++++++++++++++++++++++
+ tests/test_pygtkcompat.py  |   6 +-
+ 7 files changed, 565 insertions(+), 504 deletions(-)
+
+commit f736694d09e9d0fca4769d9f1f34ec34e6354d87
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Mon Nov 19 13:59:20 2012 +0100
+
+    Bump g-i dependency to >= 1.34.2
+
+    We need this for updated GLib annotations and new test API.
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit f6c994c76cd8010460b76bf455e1a341348d735b
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Mon Nov 19 10:39:26 2012 +0100
+
+    test_gi: Fix failing tests with g-i 1.34.x
+
+    Skip tests which require g-i test API from 1.35.x when building
+    with g-i
+    1.34.x.
+
+ tests/test_gi.py | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+commit 8ce0d028fe79e2ce52cfecbb682afba6651a7a70
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Wed Nov 14 11:57:21 2012 +0100
+
+    test_gi: Add tests for type "filename"
+
+ tests/test_gi.py | 30 ++++++++++++++++++++++++++++++
+ 1 file changed, 30 insertions(+)
+
+commit 3408a151e49d9520f54ad9bc04f620c7777125ec
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Wed Nov 14 11:09:33 2012 +0100
+
+    Drop foreign GVariant registration/support
+
+    This is dead code. We have tests for GVariant in and out method
+    arguments,
+    callback arguments and return values, properties, etc to ensure that
+    this stays
+    working.
+
+ gi/Makefile.am             |  2 --
+ gi/pygi-foreign-gvariant.c | 63
+ ----------------------------------------------
+ gi/pygi-foreign-gvariant.h | 41 ------------------------------
+ gi/pygi-foreign.c          |  8 +-----
+ 4 files changed, 1 insertion(+), 113 deletions(-)
+
+commit 47c46d847bb69ebc139d5e0b6c609da6f27201f2
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Wed Nov 14 10:33:24 2012 +0100
+
+    test_properties.py: Fix PEP-8 errors
+
+ tests/test_properties.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+commit 78f49e6253500bfa382ce6c07412613d8f7f9d7f
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Wed Nov 14 10:14:36 2012 +0100
+
+    Add support for GVariant properties defined in Python
+
+ gi/_gobject/gobjectmodule.c   | 13 +++++++
+ gi/_gobject/propertyhelper.py | 11 ++++--
+ tests/test_properties.py      | 81
+ +++++++++++++++++++++++++++++++++++++------
+ 3 files changed, 91 insertions(+), 14 deletions(-)
+
+commit f3b77f4304be20b7422c262b973f3eeb540c4bf6
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Wed Nov 14 09:33:43 2012 +0100
+
+    pyg_value_from_pyobject(): Simplify GVariant type check
+
+    Use pyg_type_from_object_strict() instead of the much more expensive
+    and local
+    pyg_get_gvariant_type().
+
+ gi/_gobject/pygtype.c | 23 +----------------------
+ 1 file changed, 1 insertion(+), 22 deletions(-)
+
+commit 0c0fb8ef88a2c61cf95cd1cb96f6d5f296cad5fc
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Wed Nov 14 09:27:42 2012 +0100
+
+    test_everything: Add test for callback returning wrong type
+
+    This covers the "expected a GVariant, got something else" check in
+    pyg_value_from_pyobject().
+
+ tests/test_everything.py | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+commit 84db7109dfbaf443758a5a4871ee385686d2703d
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Wed Nov 14 08:42:53 2012 +0100
+
+    Add type checking to GVariant argument assignment
+
+ gi/pygi-argument.c | 7 ++++++-
+ tests/test_gi.py   | 5 ++---
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+commit e944caf5ff53143a98dd4a5578530996358013ec
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Wed Nov 14 08:22:35 2012 +0100
+
+    Add support for GVariant properties defined in C
+
+    Note that trying to assign a non-GVariant value to a GVariant property
+    currently crashes.
+
+ gi/pygi-property.c |  6 +++++-
+ tests/test_gi.py   | 21 +++++++++++++++++++++
+ 2 files changed, 26 insertions(+), 1 deletion(-)
+
+commit 614cc9594cb34d92a6d4b00773427d4fb023c65e
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Wed Nov 14 07:09:58 2012 +0100
+
+    test_unknown.py: Check property interface
+
+    NB that the property implementation in test-unknown.c does not
+    actually do
+    anything, we just want to assert that the properties are properly
+    registered.
+
+ tests/test_unknown.py | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+commit 9d7771affcf788d251cced65da56fc2773a278b3
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Wed Nov 14 07:01:24 2012 +0100
+
+    Fix previous commit for Python 2
+
+ gi/pygi-foreign-cairo.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 997d4e70b2793039d916acf8921087576622152e
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Wed Nov 14 06:57:04 2012 +0100
+
+    pygi-foreign-cairo.c: Use official py3cairo API
+
+    Do not clobber py3cairo's Pycairo_CAPI global variable, and use
+    import_cairo()
+    instead of our own code.
+
+ gi/pygi-foreign-cairo.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit cec5d1a55347b81c1ae4ddc47ea2b4fbf964d239
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Wed Nov 14 06:47:23 2012 +0100
+
+    Drop dead code from pygi-callbacks.[hc]
+
+    _pygi_create_callback() and _pygi_scan_for_callbacks() are not
+    used anywhere.
+    _pygi_destroy_notify_create() fits better in pygi-marshal-from-py.c,
+    so move it
+    there, and drop pygi-callbacks.[hc] completely.
+
+ gi/Makefile.am            |   2 -
+ gi/pygi-callbacks.c       | 217
+ ----------------------------------------------
+ gi/pygi-callbacks.h       |  48 ----------
+ gi/pygi-marshal-from-py.c |  44 ++++++++++
+ gi/pygi-private.h         |   1 -
+ 5 files changed, 44 insertions(+), 268 deletions(-)
+
+commit 55070cc9c98993ccda7ebcb05783fad182b2eb11
+Author: Carlos Garnacho <carlos@lanedo.com>
+Date:   Tue Nov 13 18:24:28 2012 +0100
+
+    Fix marshalling of arrays of struct pointers to Python
+
+    Fill in the pointer to the struct, not the pointer to the
+    array position. This makes the GdkAtom** argument in
+    gtk_clipboard_wait_for_targets() work.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=678620
+
+ gi/pygi-marshal-to-py.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+commit fc021516552b1720bacc4afe6b7a610c413194c4
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Wed Nov 14 06:27:17 2012 +0100
+
+    test_atoms.py: Add test for out array
+
+    This reproduces https://bugzilla.gnome.org/show_bug.cgi?id=678620
+
+ tests/test_atoms.py | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+commit e2790d22610aae773635d4caef2458082a307283
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Tue Nov 13 16:38:36 2012 +0100
+
+    Fix Gdk.Atom str()/repr() fallback
+
+    Fix regression in commit 6713618: If an atom does not have a name,
+    do not
+    recursively call our own str()/repr() methods, but just print
+    "Gdk.Atom<atom_id>".
+
+ gi/overrides/Gdk.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+commit 9879fd41a7d8d72f8db9cadf5b1ee29fc4d5d6bf
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Tue Nov 13 13:16:14 2012 +0100
+
+    test_gi: Stop using GLib.bytes.unref_to_array()
+
+    This method isn't safe for GI, and should be (skip)ed. Use get_data()
+    instead
+    which is safe and works fine.
+
+    See https://bugzilla.gnome.org/show_bug.cgi?id=688242
+
+ tests/test_gi.py | 6 ------
+ 1 file changed, 6 deletions(-)
+
+commit 671361841de797ef62b59d1d7568fc3d431898c7
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Tue Nov 13 12:56:11 2012 +0100
+
+    Fix Gdk.Atom to have a proper str() and repr()
+
+    Gdk.Atom is not proper GType'd class, so we cannot override the
+    whole class.
+    Just override its __str__() and __repr__() methods so that printing
+    atoms shows
+    something sensible. For nameless/invalid atoms, fall back to the old
+    <void at 0xdeadbeef> output to help with debugging.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=678620
+
+ gi/overrides/Gdk.py | 21 +++++++++++++++++++++
+ tests/test_atoms.py | 12 ++++++++++++
+ 2 files changed, 33 insertions(+)
+
+commit 56e62858e9c2bdde3186f5cf4e83be94fb4e5306
+Author: Simon Feltman <sfeltman@src.gnome.org>
+Date:   Tue Nov 13 02:53:34 2012 -0800
+
+    Make sure g_value_set_boxed does not cause a buffer overrun with
+    GStrvs
+
+    Add NULL terminator to gchar** passed to g_value_set_boxed to
+    make sure it does not overrun memory in pygi_set_property_value_real.
+    Add MALLOC_CHECK_=3 to "make check" which prints an error and aborts
+    in these cases.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=688232
+
+ gi/pygi-property.c | 8 ++++++--
+ tests/Makefile.am  | 1 +
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+commit ca11ec124fdd3fb2b67efdeb3ac93aaeb8b3fd83
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Mon Nov 12 08:35:28 2012 +0100
+
+    types.py: Fix PEP-8 violation
+
+ gi/types.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit df589458358d7e7bf178dff4e6ad937a70f806e3
+Author: Simon Feltman <sfeltman@src.gnome.org>
+Date:   Sun Nov 11 22:26:19 2012 -0800
+
+    Fix leaks with GValues holding boxed and object types
+
+    Expose read access to PyGIBoxed.free_on_dealloc.
+    Add GObject.Value.__del__ override and call unset() to
+    correctly free reference counts.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=688137
+
+ gi/overrides/GObject.py |  9 +++++++++
+ gi/pygi-boxed.c         | 12 ++++++++++++
+ tests/test_gi.py        |  2 --
+ 3 files changed, 21 insertions(+), 2 deletions(-)
+
+commit c01c95b9fb3d726385efac945f6d1270ae65d109
+Author: Simon Feltman <sfeltman@src.gnome.org>
+Date:   Sun Nov 11 19:46:15 2012 -0800
+
+    Add expectantly failing unittests for GValue boxed/object leaks
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=688137
+
+ tests/test_gi.py | 80
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 80 insertions(+)
+
+commit 13629f5a9c9a7022f3521a3616d9ce8fa4a6161b
+Author: Simon Feltman <s.feltman@gmail.com>
+Date:   Thu Aug 16 15:09:08 2012 -0700
+
+    Add doc strings showing method signatures for gi methods
+
+    Add signature based doc string to all methods pulled in from
+    introspection. For example: Gtk.SpinButton.get_icon_area.__doc__
+    get_icon_area(self, icon_pos:Gtk.EntryIconPosition) ->
+    icon_area:cairo.RectangleInt
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=681967
+
+ gi/overrides/GIMarshallingTests.py |   1 +
+ gi/pygi-info.c                     | 103
+ +++++++++++++++++++++++++++++++++----
+ gi/pygi-type.c                     |  60 +++++++++++++++++++++
+ gi/pygi-type.h                     |   1 +
+ gi/types.py                        |  92
+ ++++++++++++++++++++++++++-------
+ tests/test_gi.py                   |  30 +++++++++++
+ 6 files changed, 259 insertions(+), 28 deletions(-)
+
+commit 7b7277f3cc099280f8e2d6cf6693490290fedc24
+Author: Simon Feltman <sfeltman@src.gnome.org>
+Date:   Fri Nov 9 19:17:03 2012 -0800
+
+    Set Property instance doc string and blurb to getter doc string
+
+    Assign Property getter __doc__ strings or explicit blurb parameters
+    to the Property instances __doc__ attribute. This clobbers the
+    default Property classes lengthy and unhelpful doc string in the case
+    of instances.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=688025
+
+ gi/_gobject/propertyhelper.py | 10 +++++++---
+ tests/test_properties.py      | 14 ++++++++++----
+ 2 files changed, 17 insertions(+), 7 deletions(-)
+
+commit c5343d329ebb452d97afac30e4120ebab8477556
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Mon Nov 12 07:47:02 2012 +0100
+
+    tests: Fix for Python 2
+
+    Add quirks for Python 2's string handling, and disable the
+    Everything.test_array_gint8_in() as there seems to be no way of
+    creating a byte
+    array in Python 2.
+
+ tests/test_everything.py | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+commit 964f33ca3a74bfb7d850f136d0844ac1551d36e9
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Sat Nov 10 15:52:15 2012 +0100
+
+    test_everything: Add tests for more Regress data and container types
+
+    Add more tests for Regress' data and container type test API.
+
+    This detects a number of bugs, which have been marked as expected
+    failure, or
+    disabled completely for the cases where they cause crashes:
+
+     * unsigned enums with values >= 0x80000000 do not work
+     * nested ghashes in return values do not work
+     * array length arguments in callbacks are passed instead of
+     suppressed
+
+ tests/test_everything.py | 156
+ ++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 154 insertions(+), 2 deletions(-)
+
+commit 476e29d1ba3eda92cc021710017bce4ec252e5b5
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Fri Nov 9 18:45:22 2012 +0100
+
+    test_everything: Add tests for Regress type tests
+
+    Add tests for all the data type handling tests of g-i's Regress
+    module.
+
+ tests/test_everything.py | 183
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 183 insertions(+)
+
+commit 0d7974396e8379b518403983d9d13629066680d7
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Fri Nov 9 18:44:50 2012 +0100
+
+    Add GObject.G_MINSSIZE
+
+ gi/_gobject/gobjectmodule.c | 1 +
+ gi/overrides/GObject.py     | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+commit b800a6903300dbe9435ed8eb3677eb9c0536ec31
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Fri Nov 9 16:02:00 2012 +0100
+
+    Fix marshalling of GByteArrays
+
+    In _pygi_marshal_from_py_array(), set the array length after copying
+    the data
+    in the GI_TYPE_TAG_UINT8 case (which applies for GByteArrays),
+    otherwise it
+    will always come out as zero length.
+
+    Enable the TestGByteArray.test_bytearray_none_in() test case as that
+    works now.
+
+ gi/pygi-marshal-from-py.c | 1 +
+ tests/test_gi.py          | 3 +--
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit fa568949c46dd4b537357f1af74d1f675294b760
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Fri Nov 9 15:23:37 2012 +0100
+
+    Fix marshalling of ssize_t to smaller ints
+
+    Add missing marshalling cases for (u)int8 and (u)int16. This fixes the
+    TestArray.test_array_in test, so drop the expected failure.
+
+ gi/pygi-marshal-from-py.c | 30 +++++++++++++++++++++++++++++-
+ tests/test_gi.py          |  2 --
+ 2 files changed, 29 insertions(+), 3 deletions(-)
+
+commit 5a5940a0a0704be8e222d4cad6cedda1ad3e0f71
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Fri Nov 9 09:37:00 2012 +0100
+
+    test_gi: Enable GByteArray constructor tests
+
+    GByteArray annotations have been fixed in GLib now, enable the
+    test case.
+
+    Drop the redundant disabled_test_bytearray_none_in_from_bytes()
+    test, as this
+    is the same as disabled_test_bytearray_none_in().
+
+ tests/test_gi.py | 16 ++++------------
+ 1 file changed, 4 insertions(+), 12 deletions(-)
+
+commit e2c545896ab08b1f1885b502a8472db83f193d08
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Fri Nov 9 09:11:38 2012 +0100
+
+    test_gi: Enable GBytes test cases
+
+    GBytes annotations are fixed in GLib now, enable the test case and
+    add more
+    for g_bytes_new_take() and g_bytes_{compare,equal}().
+
+    Please note that calling unref_to_array() on a GBytes object that
+    we created
+    ourselves currently causes a double free crash, so disable that part
+    for now.
+
+ tests/test_gi.py | 30 +++++++++++++++++++++++++-----
+ 1 file changed, 25 insertions(+), 5 deletions(-)
+
+commit 1ba4e201f86ffa28c645d7c9eea99cf31080ea43
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Fri Nov 9 08:26:29 2012 +0100
+
+    test_gi: Add missing data type tests from GIMarshallingTests
+
+    Add tests for types time_t, GBytes, GByteArray, and various variants
+    of passing
+    around GValues, flags, enums, arrays, and boxed structs. This tests
+    API which
+    is provided by GIMarshallingTests, but which we did not cover yet.
+
+    This detects a number of bugs in annotations and our
+    marshalling. These have
+    been marked as expected failure, or disabled completely for the
+    cases where
+    they cause crashes.
+
+ tests/test_gi.py | 152
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 152 insertions(+)
+
+commit 0456d9c892b76ed79134230a4a8610a23c602964
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Fri Nov 9 06:44:46 2012 +0100
+
+    autogen.sh: Only enable code coverage if lcov is installed
+
+    Otherwise we break minimal build environments.
+
+ autogen.sh | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+commit 76a3acebf73f930c541d0f30249f67d254f948ab
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Fri Nov 9 06:41:58 2012 +0100
+
+    Lower autoconf dependency to 2.68 again
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit f1a5f1b92d577c542d4258e63e595d4da9acd484
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Thu Nov 8 14:54:30 2012 +0100
+
+    Add support for lcov code coverage
+
+    Use gnome-common's new code coverage flags. Default to enabling
+    code coverage
+    in autogen.sh (but not for dist).
+
+    To use this, run "make check-code-coverage" after building.
+
+ .gitignore   | 1 +
+ Makefile.am  | 2 ++
+ autogen.sh   | 2 +-
+ configure.ac | 6 ++++++
+ 4 files changed, 10 insertions(+), 1 deletion(-)
+
+commit e46af4aba220cfaf4b84a9be847f3363da556993
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Wed Nov 7 17:14:22 2012 +0100
+
+    Update documentation files
+
+    Update AUTHORS to have the current maintainers.
+
+    Update HACKING to drop Tomeu's GNOME login (this should be set in
+    ~/.ssh/config)
+
+    Update INSTALL to current upstream version.
+
+ AUTHORS |  13 ++-
+ HACKING |   4 +-
+ INSTALL | 380
+ +++++++++++++++++++++++++++++++++++++++++++---------------------
+ 3 files changed, 267 insertions(+), 130 deletions(-)
+
+commit 06f5ed0ebabce34eca6bc6de80221cba6453feec
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Wed Nov 7 17:08:11 2012 +0100
+
+    Quiesce automake output
+
+    Use $(AM_V_GEN) with custom $(LINK) commands, and avoid error
+    messages about
+    existing symlinks on rebuilds.
+
+ gi/Makefile.am          | 2 +-
+ gi/_glib/Makefile.am    | 2 +-
+ gi/_gobject/Makefile.am | 2 +-
+ tests/Makefile.am       | 6 +++---
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+commit 37270de8ead0b281a1824ff204a4aa9686a7225b
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Wed Nov 7 16:50:07 2012 +0100
+
+    Drop unused variable, fail builds on those
+
+    Build with -Werror=unused-variable, as these could hide programming
+    errors or
+    incomplete refactoring, and are not platform dependent.
+
+    Drop unused variable in pyg_type_add_interfaces().
+
+ configure.ac                | 1 +
+ gi/_gobject/gobjectmodule.c | 1 -
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+
+commit 495fd98555e0c89724bb8fa9478dc096c5d61e22
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Wed Nov 7 16:37:04 2012 +0100
+
+    configure.ac: Drop maintainer mode, modernize libtool declarations
+
+    Use all arguments of AC_INIT.
+
+    AM_MAINTAINER_MODE is discouraged now, drop it.
+
+    Use LT_PREREQ and LT_INIT for libtool initialization instead of
+    the older
+    declarations.
+
+    See https://live.gnome.org/GnomeGoals/ModernAutotools
+
+ configure.ac | 19 ++++++-------------
+ 1 file changed, 6 insertions(+), 13 deletions(-)
+
+commit 059d0cb879fe5a7b0296ec21f3bfcb64c8596cb0
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Wed Nov 7 16:21:13 2012 +0100
+
+    autoupdate configure.ac
+
+    Result of "autoupdate", with slight manual beautification.
+
+    See https://live.gnome.org/GnomeGoals/ModernAutotools
+
+ configure.ac | 21 +++++++++------------
+ 1 file changed, 9 insertions(+), 12 deletions(-)
+
+commit a932446e6648ecd98c9038298b18c6fbd36c01aa
+Author: Jose Rostagno <joserostagno@vijona.com.ar>
+Date:   Mon Nov 5 14:26:05 2012 -0300
+
+    pygi-convert: remove deprecated GLib → GObject conversions
+
+    Using these functions from the GObject module is deprecated now,
+    they should be
+    used from GLib.
+
+ pygi-convert.sh | 5 -----
+ 1 file changed, 5 deletions(-)
+
+commit 21076d4b8f3ec8e253ca236fa3b20b07fde237fe
+Author: Simon Feltman <sfeltman@src.gnome.org>
+Date:   Wed Nov 7 03:49:24 2012 -0800
+
+    Use hasattr when testing for __info__ when finding vfuncs
+
+    Change gi.types.find_vfunc_info_in_interface to use hasattr
+    when finding vfuncs. Using '__info__' in __dict__ was skipping
+    overridden interfaces which don't directly contain the __info__.
+
+ gi/types.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 1b5c9b3d1499b3bc59afb297672abc671e175546
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Wed Nov 7 12:05:24 2012 +0100
+
+    tests: Ensure that the fatal mask is always reset
+
+    On test case failures the fatal mask might be left in a wrong state,
+    so ensure
+    with "finally" that it is reset on failed tests as well, to avoid
+    hiding other
+    failures.
+
+ tests/test_gi.py            | 11 ++++++-----
+ tests/test_overrides_gtk.py | 33 +++++++++++++++++++--------------
+ tests/test_pygtkcompat.py   |  6 ++++--
+ tests/test_signal.py        |  6 ++++--
+ 4 files changed, 33 insertions(+), 23 deletions(-)
+
+commit 463f660cd6bb78ae7f2ea7c70c0491e6b4744942
+Author: Simon Feltman <sfeltman@src.gnome.org>
+Date:   Tue Nov 6 21:34:06 2012 -0800
+
+    Replace GObject notify methods with introspection and python
+
+    Replace static context managers for freeze_notify and
+    handler_block with python context managers. Remove notify,
+    freeze_notify, thaw_notify static methods as the introspection
+    versions work fine.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=672727
+
+ gi/_gobject/pygobject.c | 173
+ ++----------------------------------------------
+ gi/overrides/GObject.py |  61 +++++++++++++++--
+ tests/test_gobject.py   |  26 ++++++--
+ tests/test_signal.py    |  13 +++-
+ 4 files changed, 91 insertions(+), 182 deletions(-)
+
+commit 3fcd987272a779e5ee9173a2c3a043b4b7475842
+Author: Simon Feltman <sfeltman@src.gnome.org>
+Date:   Tue Oct 23 13:56:32 2012 -0700
+
+    Add support for overriding GObject.Object
+
+    Shift pygi module mechanics so the introspection generated 'Object'
+    class becomes derived from the static GObject class. Add initial
+    GObject.Object override which sets all static methods back essentially
+    leapfrogging the introspection methods. This sets the stage for having
+    the ability to remove static methods piecemeal in favor of
+    introspection/python in future commits.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=672727
+
+ gi/module.py             | 30 +++++++++++---------
+ gi/overrides/GObject.py  | 74
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ gi/pygobject-external.h  | 10 +------
+ gi/types.py              |  7 +++++
+ tests/test_gobject.py    | 31 ++++++++++++++++----
+ tests/testhelpermodule.c |  2 +-
+ 6 files changed, 126 insertions(+), 28 deletions(-)
+
+commit 4da6f93d86b104941c5533c3da5edb4a00ec62e9
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Tue Nov 6 13:55:21 2012 +0100
+
+    Bump glib dependency to >= 2.34.2
+
+    We need 2.34.2 or 2.35.2 as we now depend on the GIOChannel annotation
+    fixes.
+
+ README       | 2 +-
+ configure.ac | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 85c8dd7a9bc81fb5df5abc6d8a95f966955ec775
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Tue Nov 6 11:28:42 2012 +0100
+
+    Update README
+
+    Point to python-hackers-list instead of the old pygtk list, update
+    required
+    versions, and point to wiki page and IRC.
+
+ README | 19 ++++++++++---------
+ 1 file changed, 10 insertions(+), 9 deletions(-)
+
+commit 6d8b29ba56fb085948a155c75af36dcea9c71da8
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Tue Nov 6 11:21:32 2012 +0100
+
+    Add --with-python configure option
+
+    This behaves like setting $PYTHON, but also works in build systems
+    like jhbuild
+    which do not support setting environment variables.
+
+    Update README accordingly.
+
+ README       | 15 +++++++++------
+ configure.ac | 43 ++++++++++++++++++++++++++++++++++---------
+ 2 files changed, 43 insertions(+), 15 deletions(-)
+
+commit 4e5556a5238a3b86da9a0e40fd0e23004ed6af75
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Tue Nov 6 10:39:27 2012 +0100
+
+    python.m4: Add python3.3, do not prefer unversioned "python"
+
+    Add python 3.3 to the search list.
+
+    http://www.python.org/dev/peps/pep-0394/ broke the well-defined
+    meaning of
+    "python", so use that as last fallback if more specific versions do
+    not exist.
+
+ configure.ac | 2 +-
+ m4/python.m4 | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit e71c046ed8f5b06e6b7383ddc0fc18f06de6abee
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Tue Nov 6 09:48:50 2012 +0100
+
+    m4: Update py-compile to current upstream version
+
+    Update py-compile to current versions from automake 1.11.6.
+
+ m4/py-compile | 81
+ +++++++++++++++++++++++++++++++++++------------------------
+ 1 file changed, 48 insertions(+), 33 deletions(-)
+
+commit 8406b39f4e9ff98e0d59e880dde3ddb5e5131726
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Tue Nov 6 09:57:00 2012 +0100
+
+    m4: Update introspection.m4 to current upstream version
+
+ m4/introspection.m4 | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit 4ffa61b7c39cf038440dc9acfe8d214c9b77c3a6
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Tue Nov 6 09:53:15 2012 +0100
+
+    option.py: Fix PEP-8 error
+
+ gi/_glib/option.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 2cbb54e79c23b96486d4a2bfa170460df5bd6c84
+Author: Simon Feltman <sfeltman@src.gnome.org>
+Date:   Mon Nov 5 18:27:56 2012 -0800
+
+    Remove DynamicGLibModule and DynamicGObjectModule
+
+    Move final bits of _glib static binding imports directly into
+    the GLib override. Change _glib/option use the .so directly
+    rather than the staged variables in _glib/__init__.py.
+    Remove DynamicGLibModule and DynamicGObjectModule and update
+    unittest.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=687488
+
+ gi/_glib/__init__.py | 11 ----------
+ gi/_glib/option.py   | 16 +++++++-------
+ gi/importer.py       | 12 ++---------
+ gi/module.py         | 60
+ ----------------------------------------------------
+ gi/overrides/GLib.py | 14 ++++++++++++
+ tests/test_gi.py     |  9 ++------
+ 6 files changed, 26 insertions(+), 96 deletions(-)
+
+commit 901c1b6e3722a9cd999e4948297e2c460f101d20
+Author: Daniel Drake <dsd@laptop.org>
+Date:   Thu Nov 1 14:46:22 2012 +0000
+
+    Fix property lookup in class hierarchy
+
+    Commit 4bfe7972546413f46f5c36737ff03bb5612c1921 introduced a bug where
+    a Python subclass of a gi-provided base class overrides a property
+    from the
+    base class.
+
+    The new behaviour in the above commit causes pygobject to seek
+    the property
+    in the base class and try to read it from there (resulting in
+    confusion)
+    rather than noticing that the property is overridden and present
+    in the
+    Python object instance.
+
+    To provide a nicer solution here, we can exploit the fact that
+    g_object_class_find_property() will traverse the hierarchy in order to
+    find the right GParamSpec, and the returned GParamSpec can tell
+    us exactly
+    which GType introduces the property. The strategy is:
+
+     1. Find pspec with g_object_class_find_property()
+     2. Find the class that owns that property (pspec->owner_type)
+     3. See if girepository owns that class.
+     3a. If yes, get property from there.
+     3b. If not, get property "directly"
+
+    And the same for property setting.
+
+    Now that _pygi_lookup_property_from_g_type is always passed the
+    type that
+    implements the property, it no longer has to go recursing through
+    parent
+    classes, which was the original cause of confusion.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=686942
+
+ gi/_gobject/pygobject.c  |  92 +++++++++++++++++++++++----------
+ gi/pygi-property.c       | 130
+ ++++++++++++++++++++++-------------------------
+ gi/pygi-property.h       |   4 +-
+ gi/pygi.h                |  12 ++---
+ tests/test_properties.py |  30 +++++++++++
+ 5 files changed, 164 insertions(+), 104 deletions(-)
+
+commit efcb0f9fda65e24ae98438d61487d06db9eac1b1
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Sat Nov 3 16:14:01 2012 +0100
+
+    Move property and signal creation into _class_init()
+
+    We must not add class interfaces after g_type_class_ref() has been
+    called the
+    first time. Move signal and property creation from pyg_type_register()
+    into
+    pyg_object_class_init(), and drop the hack of registering interfaces
+    twice.
+
+    This changed class initialization order now exposes GLib's warning
+    about
+    unknown signals, so adjust
+    test_signal.TestGSignalsError.test_invalid_name() to
+    not abort on that.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=686149
+
+ gi/_gobject/gobjectmodule.c | 177
+ ++++++++++++++++++--------------------------
+ tests/test_signal.py        |   6 +-
+ 2 files changed, 75 insertions(+), 108 deletions(-)
+
+commit 655a5002ffaa088b775adbc59e5125444f7bc1ca
+Author: Jose Rostagno <joserostagno@vijona.com.ar>
+Date:   Sat Nov 3 13:21:52 2012 -0300
+
+    Remove unused macro definitions
+
+    PYGLIB_*_VERSION are not used anywhere any more, remove those.
+    (dropped in commit 8d52bceb1)
+
+ gi/_glib/glibmodule.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+commit fa054fd15b8874760bee97d9af168a2969e6ece4
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Mon Nov 5 14:38:07 2012 +0100
+
+    testhelpermodule.c: Drop obsolete g_thread_init()
+
+    We already require a new enough glib version as we dropped
+    g_thread_init() in
+    the main code a long time ago. But for formality's sake, bump glib
+    requirement
+    to >= 2.32.
+
+ configure.ac             | 4 ++--
+ tests/testhelpermodule.c | 1 -
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+commit 2e57530a27a44e94927d487cf2f2d9e543777654
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Mon Nov 5 14:37:11 2012 +0100
+
+    pygi-source.c: Drop dead code
+
+ gi/pygi-source.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+commit 2a24c9ccd59bff719fa817a0ec5c959f6da03e1c
+Author: Simon Feltman <sfeltman@src.gnome.org>
+Date:   Sun Nov 4 22:22:53 2012 -0800
+
+    Move TYPE constants from _gobject to GObject
+
+    Clear out TYPE constants from _gobject/__init__.py and move them
+    into the
+    GObject overrides. Disperse class imports among modules that use
+    them instead
+    of using _gobject/__init__.py as a staging area (e.g. GInterface).
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=687487
+
+ gi/_gobject/__init__.py  | 30 ------------------------------
+ gi/_gobject/constants.py |  2 +-
+ gi/module.py             | 38 +++++++++++++++++++++++++-------------
+ gi/overrides/__init__.py |  9 ++++++---
+ gi/types.py              | 10 ++++++----
+ 5 files changed, 38 insertions(+), 51 deletions(-)
+
+commit c2aa6f0d0ed4c4e60f081b106dc7a65513963fce
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Mon Nov 5 13:10:05 2012 +0100
+
+    Move G_MIN/MAX constants into GObject overrides
+
+    These really ought to come from GLib's typelib, but are not right
+    now so we
+    need to keep the static bindings for those. But drop them from
+    gi/_gobject/ and
+    move them into the overrides where they belong.
+
+ gi/_gobject/__init__.py       | 17 -----------------
+ gi/_gobject/constants.py      | 21 ---------------------
+ gi/_gobject/propertyhelper.py |  2 +-
+ gi/overrides/GObject.py       |  9 +++++++++
+ tests/test_gi.py              | 32 ++++++++++++++++----------------
+ 5 files changed, 26 insertions(+), 55 deletions(-)
+
+commit 12b84727edc36f686a7031b5c4c6bf662838908d
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Mon Nov 5 11:04:54 2012 +0100
+
+    Replace static OPTION_* constants with GI
+
+    Drop static definitions of GLib.OPTION_* constants and use the ones
+    from GI
+    instead.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=686765
+
+ gi/_glib/__init__.py    | 13 -------------
+ gi/_glib/glibmodule.c   | 32 --------------------------------
+ gi/_glib/option.py      | 46
+ ++++++++++++++++++++++++----------------------
+ gi/overrides/GLib.py    | 13 +++++++++++++
+ gi/overrides/GObject.py |  2 +-
+ 5 files changed, 38 insertions(+), 68 deletions(-)
+
+commit 7372e3c9ecb8e836894c32975eab8c4107ba0b28
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Mon Nov 5 10:14:52 2012 +0100
+
+    tests: Do not use deprecated assertRaisesRegexp()
+
+    Use assertRaisesRegex() instead and provide 2.7 compatibility in
+    tests/runtests.py.
+
+ tests/runtests.py    | 3 +++
+ tests/test_signal.py | 8 ++++----
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+commit da2106902eb3dabebdff1674743cb3040566a745
+Author: Simon Feltman <sfeltman@src.gnome.org>
+Date:   Sun Nov 4 02:57:29 2012 -0800
+
+    Move gobject static functions and constants to gi
+
+    Replace the following functions with gi and overrides:
+    type_children, type_interfaces, signal_list_ids, signal_list_names,
+    signal_lookup, signal_name, type_parent. Assign SIGNAL_* and
+    PARAM_* from gi SignalFlags and ParamFlags respectively.
+    Move module level assignments of a number of static functions to
+    the GObject.py overrides file.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=687487
+
+ docs/reference/pygobject-functions.xml |  25 ---
+ gi/_gobject/__init__.py                |  72 +--------
+ gi/_gobject/gobjectmodule.c            | 272
+ ---------------------------------
+ gi/overrides/GObject.py                | 208 ++++++++++++++++++++++++-
+ gi/overrides/__init__.py               |   5 +-
+ tests/test_signal.py                   |  11 +-
+ 6 files changed, 215 insertions(+), 378 deletions(-)
+
+commit f4acd6a9d14248d459708f61fd01f6d4735f087d
+Author: Simon Feltman <sfeltman@src.gnome.org>
+Date:   Sun Nov 4 02:52:19 2012 -0800
+
+    Make unitests for gobject functions moving to gi more strict
+
+    Add expected failure test for invalid SystemError's coming from
+    signal_lookup and signal_list_ids. Remove excessive type_name
+    tests and type_from_name tests.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=687487
+
+ tests/test_gtype.py  | 53
+ ----------------------------------------------------
+ tests/test_signal.py | 40 ++++++++++++++++++++++++---------------
+ 2 files changed, 25 insertions(+), 68 deletions(-)
+
+commit 3267808318b284814e52f2803b17af56fca648ad
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Sat Nov 3 14:17:25 2012 +0100
+
+    [API change] Remove static filename_from_utf8() binding
+
+    Replace static GLib.filename_from_utf8() with GI. The old static
+    binding always
+    tried to convert the result to an Unicode object, which will fail
+    if the result
+    is not UTF-8 encoded (which is the whole point of this function
+    really!), so
+    return bytes now.
+
+    Although the static binding was rather useless before, this is
+    technically an
+    API break.
+
+ docs/reference/pyglib-functions.xml | 32 --------------------------------
+ gi/_glib/__init__.py                |  1 -
+ gi/_glib/glibmodule.c               | 26 --------------------------
+ gi/_gobject/__init__.py             |  1 -
+ gi/overrides/GLib.py                |  8 ++++++++
+ gi/overrides/GObject.py             |  3 ++-
+ tests/test_glib.py                  |  8 ++++++++
+ 7 files changed, 18 insertions(+), 61 deletions(-)
+
+commit 8d52bceb1e0aa0dc79cf77f36dda9f953f170459
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Sat Nov 3 13:14:15 2012 +0100
+
+    Drop static glib_version and pyglib_version constants
+
+    Use the GLib version from GI instead, and the already existing
+    gi.version_info.
+
+ docs/reference/pyglib-constants.xml    | 50
+ ----------------------------------
+ docs/reference/pygobject-constants.xml | 19 -------------
+ gi/_glib/__init__.py                   |  2 --
+ gi/_glib/glibmodule.c                  | 21 --------------
+ gi/_gobject/__init__.py                |  1 -
+ gi/overrides/GLib.py                   |  8 +++++-
+ gi/overrides/GObject.py                |  3 +-
+ tests/test_glib.py                     | 12 ++++++++
+ 8 files changed, 21 insertions(+), 95 deletions(-)
+
+commit 9f96325e75f7c5f88789ea3f74a068e73cfde1a2
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Sat Nov 3 12:12:44 2012 +0100
+
+    Drop static G_MININT8 and related constants
+
+    Use the introspected constants from GLib instead.
+
+ gi/_gobject/__init__.py     | 12 ------------
+ gi/_gobject/constants.py    | 12 ------------
+ gi/_gobject/gobjectmodule.c | 18 +-----------------
+ gi/overrides/GObject.py     | 17 +++++++++++++++++
+ tests/test_gobject.py       |  4 ++++
+ 5 files changed, 22 insertions(+), 41 deletions(-)
+
+commit 3354c4eda0f098d1a8f744264ef9a2565a38b50d
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Sat Nov 3 11:58:40 2012 +0100
+
+    test_gobject: Add test case for min/max int constants
+
+    Related to https://bugzilla.gnome.org/show_bug.cgi?id=685022
+
+ tests/test_gobject.py | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+commit d70cb32789e057fe5a16e61a0cce77d9c54a3ee1
+Author: Jose Rostagno <joserostagno@vijona.com.ar>
+Date:   Sat Oct 27 15:37:32 2012 -0300
+
+    Use g_object_info_find_signal()
+
+    Replace our custom code with a call to the corresponding
+    gobject-instrospection
+    function.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=687371
+
+ gi/pygi-signal-closure.c | 21 ++++-----------------
+ 1 file changed, 4 insertions(+), 17 deletions(-)
+
+commit ae6d0aada9587cd4dca168375527b80785b604a0
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Sat Nov 3 11:23:06 2012 +0100
+
+    GLib overrides: code cleanup
+
+    Factorize the logic to handle zero or multiple user_data arguments
+    into
+    user_data_varargs_shim(), and put code that handles deprecated API
+    into the
+    corresponding "then" branches, to improve readability.
+
+ gi/overrides/GLib.py | 87
+ ++++++++++++++++++++++++++++------------------------
+ 1 file changed, 47 insertions(+), 40 deletions(-)
+
+commit d7f095b01e7208273703c880f4f0dfcc1a152a9a
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Sat Nov 3 09:33:08 2012 +0100
+
+    Restore actual GLib API after previous fix
+
+    Re-fix the acceptance of priority as first argument for idle_add(),
+    io_add_watch() and timeout_add(), as that is the real GLib API. Ensure
+    that
+    this keeps supporting the backwards compatible API with supplying
+    multiple user
+    data arguments.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=687047
+
+ gi/overrides/GLib.py    | 117
+ +++++++++++++++++++++++++-----------------------
+ tests/test_iochannel.py |  74 +++++++++++++++++++++++++++---
+ tests/test_source.py    |  30 +++++++++++++
+ 3 files changed, 158 insertions(+), 63 deletions(-)
+
+commit 648b653d85bf3bc28dc59c6d309f15d388076af9
+Author: Simon Feltman <sfeltman@src.gnome.org>
+Date:   Fri Nov 2 21:01:38 2012 -0700
+
+    Add unittests for module level type and signal functions
+
+    Add tests for the following methods: signal_list_ids,
+    signal_name, signal_lookup, signal_query, type_children,
+    type_from_name, type_name, type_is_a, and type_interfaces.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=687487
+
+ tests/Makefile.am    |   1 +
+ tests/test_gtype.py  | 106
+ +++++++++++++++++++++++++++++++++++++++++++++++++++
+ tests/test_signal.py |  43 +++++++++++++++++++++
+ 3 files changed, 150 insertions(+)
+
+commit 80db2a50feab9898d7c5f88ea27aadc3dfb5bec3
+Author: Simon Feltman <sfeltman@src.gnome.org>
+Date:   Tue Oct 30 18:33:44 2012 -0700
+
+    Fix GLib override incompatibilities with old static API
+
+    Change idle_add, timeout_add, timeout_add_seconds, and
+    io_add_watch to accept *args and **kwargs as arguments
+    to the callback functions instead of only accepting a single
+    user_data arg. This ensures the new overridden introspection
+    methods are backwards compatible with the static versions
+    they replaced.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=687047
+
+ gi/overrides/GLib.py    | 98
+ ++++++++++++++++++++++++++++---------------------
+ tests/test_iochannel.py | 37 +++++++++++++++++--
+ 2 files changed, 90 insertions(+), 45 deletions(-)
+
+commit 9c6399bbf75c312b1ef4933d079712ea5b05a935
+Author: Simon Feltman <sfeltman@src.gnome.org>
+Date:   Tue Oct 30 12:01:44 2012 -0700
+
+    Fix IOChannel unittests for python 2.7
+
+    Use __future__ unicode_literals to minimize difference
+    between python 2.7 and 3. Comparisons need to encode arguments as
+    'UTF-8' for testing readline operations.
+    Add backwards compatible "next" to support the python 2.7 iteration.
+    Change isinstance(channel, file) to hasattr(channel, 'fileno') to
+    support all python versions (and duck typing).
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=687047
+
+ gi/overrides/GLib.py    | 4 +++-
+ tests/test_iochannel.py | 1 +
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+commit 0f94a0a4ebd2bbfd06d8f9a2bb2b17dabf7678ef
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Mon Oct 29 23:00:31 2012 +0100
+
+    Allow calling io_add_watch with a file object
+
+    The old static bindings allowed that, so we need to allow it to
+    maintain
+    backwards compatibility. Deprecate this mode as well, so that we
+    can get rid of
+    it at some point.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=687047
+
+ gi/overrides/GLib.py |  7 +++++++
+ tests/test_glib.py   | 26 ++++++++++++++++++++++++++
+ 2 files changed, 33 insertions(+)
+
+commit 3ba67fd41944309077eb81c4c03397519ed29dc4
+Author: John Ralls <jralls@ceridwen.us>
+Date:   Mon Oct 29 14:57:22 2012 -0700
+
+    Fix duplicate symbols error on OSX
+
+ gi/pygi-source.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 5a367aa067e369f2b1e713199614e3426fecc10e
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Sun Oct 28 17:42:34 2012 +0100
+
+    Drop removed markup-escape-text() from reference documentation
+
+ docs/reference/pyglib-functions.xml | 36
+ ------------------------------------
+ 1 file changed, 36 deletions(-)
+
+commit 057b3d3791e6f1947004f2482c0ae40529de03ae
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Sun Oct 28 17:41:03 2012 +0100
+
+    Drop some dead code from gi/_glib/glibmodule.c
+
+ gi/_glib/glibmodule.c | 45 ---------------------------------------------
+ 1 file changed, 45 deletions(-)
+
+commit 7b12803bce3418bb487127f497f022c973f35888
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Sun Oct 28 17:37:29 2012 +0100
+
+    Remove static get_current_time() binding
+
+    Use GLib.get_real_time() through GI instead. Deprecate the function,
+    as
+    GLib.get_real_time() should be called directly.
+
+ docs/reference/pyglib-functions.xml | 26 --------------------------
+ gi/_glib/__init__.py                |  1 -
+ gi/_glib/glibmodule.c               | 11 -----------
+ gi/_glib/pyglib.c                   | 16 ----------------
+ gi/_glib/pyglib.h                   |  1 -
+ gi/_gobject/__init__.py             |  1 -
+ gi/overrides/GLib.py                |  8 ++++++++
+ gi/overrides/GObject.py             |  2 +-
+ tests/test_glib.py                  |  6 +++++-
+ 9 files changed, 14 insertions(+), 58 deletions(-)
+
+commit b3dfb780b3a74f6933e3afcd2ba512b36dfbe514
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Sun Oct 28 17:23:23 2012 +0100
+
+    Add more tests for GLib.spawn_async()
+
+    Check spawn_async() with getting stdin/out/err pipes and specifying
+    envp.
+
+ tests/test_subprocess.py | 29 +++++++++++++++++++++++++++++
+ 1 file changed, 29 insertions(+)
+
+commit 70d78eee4a04dcaefea4615fe351e33fa717dffa
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Sun Oct 28 14:15:05 2012 +0100
+
+    Remove static child_add_watch() binding
+
+    Use the GLib API through GI instead, and provide override to keep
+    backwards
+    compatible API. Also allow using the actual GLib API, and deprecate
+    the old
+    static API of calling without a priority as first argument.
+
+ docs/reference/pyglib-functions.xml | 61 ---------------------------
+ gi/_glib/__init__.py                |  1 -
+ gi/_glib/glibmodule.c               | 72 -------------------------------
+ gi/_gobject/__init__.py             |  1 -
+ gi/overrides/GLib.py                | 46 ++++++++++++++++++++
+ gi/overrides/GObject.py             |  2 +-
+ tests/test_mainloop.py              |  2 +-
+ tests/test_subprocess.py            | 84
+ ++++++++++++++++++++++++++++++++++---
+ 8 files changed, 127 insertions(+), 142 deletions(-)
+
+commit 4b16427714b850e33c6020d8de1833bae19a3b87
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Sun Oct 28 13:44:23 2012 +0100
+
+    test_subprocess: Cover more child_watch_add() cases
+
+    Verify that priority is set correctly, and also test calling without
+    userdata.
+
+ tests/test_subprocess.py | 24 +++++++++++++++++++-----
+ 1 file changed, 19 insertions(+), 5 deletions(-)
+
+commit 83ff5938612d37d52f112867a472777dd6786d69
+Author: Colin Walters <walters@verbum.org>
+Date:   Sat Oct 27 12:22:53 2012 -0400
+
+    gi/__init__.py: Pacify pep8 style checker
+
+    It was complaining about finding only 1 blank line.  Regression
+    likely introduced by f976d05b.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=686991
+
+ gi/__init__.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit f976d05b04f26e733d19988e68989e340eb3a29e
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Fri Oct 26 10:39:28 2012 +0200
+
+    Use a custom deprecation warning to make them visible by default
+
+    DeprecationWarning is not shown by default, and is thus rather
+    useless for
+    developers. Use a custom PyGIDeprecationWarning class and derive
+    it from
+    RuntimeWarning to make it visible.
+
+ gi/__init__.py           | 5 +++++
+ gi/overrides/GLib.py     | 5 +++--
+ gi/overrides/Gtk.py      | 5 +++--
+ gi/overrides/__init__.py | 4 ++--
+ gi/pygtkcompat.py        | 4 ++--
+ tests/Makefile.am        | 2 +-
+ tests/test_glib.py       | 5 +++--
+ tests/test_gobject.py    | 3 ++-
+ tests/test_iochannel.py  | 5 +++--
+ tests/test_source.py     | 3 ++-
+ 10 files changed, 26 insertions(+), 15 deletions(-)
+
+commit 366f5d2d3902c6293d0031e0b7dc5d6641a05ac7
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Fri Oct 26 09:26:17 2012 +0200
+
+    Remove static io_add_watch() binding
+
+    Use the GLib API through GI instead, and provide override to keep
+    backwards
+    compatible API. Also allow using the actual GLib API, and deprecate
+    all other
+    variants:
+     - calling with an fd as first argument instead of an IOChannel
+     - calling without a priority as second argument
+
+ docs/reference/pyglib-functions.xml | 106
+ ------------------------------------
+ gi/_glib/__init__.py                |   1 -
+ gi/_glib/glibmodule.c               |  98
+ ---------------------------------
+ gi/_gobject/__init__.py             |   1 -
+ gi/overrides/GLib.py                |  51 ++++++++++++++---
+ gi/overrides/GObject.py             |   3 +-
+ tests/test_glib.py                  |  15 ++++-
+ tests/test_iochannel.py             |  70 +++++++++++++++++++++++-
+ 8 files changed, 126 insertions(+), 219 deletions(-)
+
+commit 284de1eb5c37a3f6caa7d846dbd439f1eac410a2
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Fri Oct 26 08:48:35 2012 +0200
+
+    Add tests for GLib.io_add_watch()
+
+ tests/test_glib.py | 36 ++++++++++++++++++++++++++++++++++++
+ 1 file changed, 36 insertions(+)
+
+commit 15e717ce2c2a26c02c913f79bc7cf6876d943e92
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Thu Oct 25 15:55:46 2012 +0200
+
+    Remove static GIOChannel bindings
+
+    Use the GLib API through GI instead, and provide overrides to keep
+    backwards
+    compatible API, including its bugs.
+
+    We still need to keep a static wrapper around
+    g_io_channel_read_chars() until
+    we teach PyGObject to correctly handle caller allocated out array
+    arguments.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=686795
+
+ gi/_glib/Makefile.am    |   2 -
+ gi/_glib/__init__.py    |   1 -
+ gi/_glib/glibmodule.c   |   2 -
+ gi/_glib/pygiochannel.c | 748
+ ------------------------------------------------
+ gi/_glib/pygiochannel.h |  29 --
+ gi/_gobject/__init__.py |   1 -
+ gi/gimodule.c           |  72 +++++
+ gi/overrides/GLib.py    |  95 +++++-
+ 8 files changed, 161 insertions(+), 789 deletions(-)
+
+commit 0bfa6b44b808d9f8f55199216c29c1aec96c7719
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Thu Oct 25 12:59:46 2012 +0200
+
+    test_iochannel.py: Fix data type of IOFlags
+
+    ~GLib.IOFlags.NONBLOCK yields an int instead of a GLib.IOFlags,
+    so ensure that
+    the result is of type GLib.IOFlags again.
+
+ tests/test_iochannel.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 25d12afd06863ce223a161ba1317bfe5503bca5c
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Thu Oct 25 08:24:31 2012 +0200
+
+    Add environment variable to disable pep8 checks
+
+    pep8 takes quite long for "make check". Skip it if $SKIP_PEP8 is
+    set, which
+    makes the test/fix turnaround time faster.
+
+ tests/Makefile.am | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+commit e9624ed1d38c777de2b430e3b0fbae2acbf34956
+Author: Simon Feltman <sfeltman@src.gnome.org>
+Date:   Wed Oct 24 04:31:26 2012 -0700
+
+    [API add] Add get_introspection_module for getting un-overridden
+    modules
+
+    Add gi.module.get_introspection_module to explicitly get a
+    wrapped module pulled in through introspection without static
+    and python override handling. This API is intended for python
+    overrides to use rather than having them access
+    gi.importer.modules['<name>']._introspection_module directly.
+    Replace aforementioned usage in all overrides.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=686828
+
+ gi/module.py                       | 38
+ +++++++++++++++++++++++++++++++++++---
+ gi/overrides/GIMarshallingTests.py |  4 ++--
+ gi/overrides/GLib.py               |  4 ++--
+ gi/overrides/Gdk.py                |  6 +++---
+ gi/overrides/Gio.py                |  4 ++--
+ gi/overrides/Gtk.py                |  5 +++--
+ gi/overrides/Pango.py              |  4 ++--
+ tests/test_overrides.py            | 29 +++++++++++++++++++++++++++++
+ 8 files changed, 78 insertions(+), 16 deletions(-)
+
+commit e6e047ef9b8575c852b3cdc3f5d4dfbb548cc648
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Wed Oct 24 15:16:13 2012 +0200
+
+    test_option: Use public API
+
+    Use GLib.option, not gi._glib.option.
+
+ tests/test_option.py | 42 ++++++++++++++++++++----------------------
+ 1 file changed, 20 insertions(+), 22 deletions(-)
+
+commit 6a586af41b8740c4ba590591d1068d80071ff2dc
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Wed Oct 24 14:12:05 2012 +0200
+
+    Drop static SPAWN_* constants
+
+    Use the introspected constants instead, which are identical. Add
+    backwards
+    compatible aliases.
+
+    These constants are covered by tests/test_subprocess.py.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=686765
+
+ docs/reference/pyglib-constants.xml    | 68
+ ----------------------------------
+ docs/reference/pyglib-functions.xml    | 26 ++++++-------
+ docs/reference/pygobject-constants.xml | 67
+ ---------------------------------
+ gi/_glib/__init__.py                   |  7 ----
+ gi/_glib/glibmodule.c                  | 15 --------
+ gi/_gobject/__init__.py                |  7 ----
+ gi/overrides/GLib.py                   |  6 +++
+ gi/overrides/GObject.py                |  6 ++-
+ tests/test_subprocess.py               |  6 ++-
+ 9 files changed, 29 insertions(+), 179 deletions(-)
+
+commit 0137a7af7bf69421e0c8e94120a1f8cff01fbeea
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Wed Oct 24 13:59:31 2012 +0200
+
+    Drop static IO_* constants
+
+    Use the introspected constants instead, which are identical. Add
+    backwards
+    compatible aliases.
+
+    These constants are covered by tests/test_iochannel.py.
+
+ docs/reference/pyglib-constants.xml | 52
+ -------------------------------------
+ gi/_glib/__init__.py                | 19 --------------
+ gi/_glib/glibmodule.c               | 32 -----------------------
+ gi/_gobject/__init__.py             | 18 -------------
+ gi/overrides/GLib.py                | 18 ++++++++++++-
+ gi/overrides/GObject.py             |  8 +++++-
+ tests/test_iochannel.py             |  1 +
+ tests/test_source.py                |  2 +-
+ 8 files changed, 26 insertions(+), 124 deletions(-)
+
+commit 0e1a6ccee45ae2239da1c44de1866596343165ba
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Wed Oct 24 12:50:50 2012 +0200
+
+    Fix various bugs in GLib.IOChannel
+
+    - Fix segfault when using an IOChannel as an iterator: PyIter_Next()
+    returns
+      NULL on the last element, instead of raising a StopIteration.
+
+    - The default encoding of a stream is 'UTF-8', not NULL. NULL means
+    that the
+      stream is being used in binary mode; in that case, we should not
+      attempt to
+      do any automagic conversion to an Unicode object. As this special
+      case is
+      inconsistent and has never worked anyway, and the current buggy
+      implementation breaks binary streams, just drop it without
+      replacement.
+      (Introduced in commit de9eae4dfcce8)
+
+    These bugs were uncovered by the previously committed tests.
+
+ gi/_glib/pygiochannel.c | 25 +++++--------------------
+ 1 file changed, 5 insertions(+), 20 deletions(-)
+
+commit a98c37937a4f7cb81a0b02c023d12097f386a22c
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Wed Oct 24 12:49:04 2012 +0200
+
+    Add tests for GLib.IOChannel
+
+    This did not have any code coverage at all. The tests uncover a
+    range of bugs,
+    which will be fixed in the next commit.
+
+ tests/Makefile.am       |   1 +
+ tests/test_iochannel.py | 262
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 263 insertions(+)
+
+commit 1b27432abf6004553e9476d5ffeb2bf603534419
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Wed Oct 24 08:50:37 2012 +0200
+
+    Remove static idle_add/timeout_add bindings
+
+    Use the GLib functions through GI instead. Add overrides to ensure
+    that default
+    arguments continue to work as before, and that callbacks are called
+    without an
+    userdata argument if it wasn't specified.
+
+ docs/reference/pyglib-functions.xml | 165
+ ------------------------------------
+ gi/_glib/__init__.py                |   3 -
+ gi/_glib/glibmodule.c               | 139 ------------------------------
+ gi/_gobject/__init__.py             |   3 -
+ gi/overrides/GLib.py                |  31 +++++++
+ gi/overrides/GObject.py             |   3 +-
+ tests/test_source.py                |  19 +++++
+ 7 files changed, 52 insertions(+), 311 deletions(-)
+
+commit 2357f4a0237feabcf6886f2a448aa3f42f6781b9
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Wed Oct 24 09:14:57 2012 +0200
+
+    Add tests for priority argument of idle_add/timeout_add
+
+    There is a potential to treat the priority as user data in a call like
+    "GLib.idle_add(cb, GLib.PRIORITY_HIGH)". The current static bindings
+    force
+    using a keyword argument for the priority (but silently ignore it
+    if you
+    specify both userdata and priority as a positional argument).
+
+    Test the correct handling of priority as well.
+
+ tests/test_source.py | 63
+ ++++++++++++++++++++++++++++++++++++++++++++++++----
+ 1 file changed, 59 insertions(+), 4 deletions(-)
+
+commit dceb4d60e210cb1531ad81935733a3f0be0c8edb
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Wed Oct 24 08:40:50 2012 +0200
+
+    Drop old ChangeLog.pre-2.18
+
+    This is ancient by now, quite sizable, and the complete history can
+    always be
+    seen in the git log.
+
+ ChangeLog.pre-2.18 | 3608
+ ----------------------------------------------------
+ Makefile.am        |    1 -
+ 2 files changed, 3609 deletions(-)
+
+commit 127ef91f1563caa346bc2ac2adb064487a84e6a0
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Wed Oct 24 08:39:05 2012 +0200
+
+    Fix PEP-8 whitespace in previous commit
+
+ tests/test_source.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit 0bc0b55be0dae7528c2fc7439d672ad4e417335d
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Wed Oct 24 08:33:49 2012 +0200
+
+    Add tests for idle_add()/timeout_add with and without user data
+
+    This is implicitly spread over various test cases, but let's test
+    it explicitly
+    to ensure that the behaviour stays consistent when moving this to GI.
+
+ tests/test_source.py | 35 +++++++++++++++++++++++++++++++++++
+ 1 file changed, 35 insertions(+)
+
+commit d0a0332feb7946f4bb6b43211d6fe3ae67e7dba5
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Wed Oct 24 08:05:43 2012 +0200
+
+    tests: consitent naming style
+
+    Stop mixing camel case and underline naming, use the latter
+    consistently
+    in all tests.
+
+ tests/test_gobject.py     | 64
+ +++++++++++++++++++++++------------------------
+ tests/test_interface.py   |  4 +--
+ tests/test_option.py      | 14 +++++------
+ tests/test_pygtkcompat.py | 32 ++++++++++++------------
+ tests/test_signal.py      | 10 ++++----
+ tests/test_source.py      | 23 ++++++++---------
+ tests/test_subprocess.py  |  2 +-
+ tests/test_thread.py      |  2 +-
+ tests/test_unknown.py     |  2 +-
+ 9 files changed, 76 insertions(+), 77 deletions(-)
+
+commit 4b460e2eb18b8340fe99252063fdb08b0c222968
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Wed Oct 24 07:28:10 2012 +0200
+
+    Work around wrong 64 bit constants in GLib Gir
+
+    GLib's gir currently has wrong constants for MININT64 and MAXUINT64;
+    explicitly
+    set them in an override, until this gets fixed properly.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=685022
+
+ gi/overrides/GLib.py | 8 ++++++++
+ tests/test_gi.py     | 9 +++++++++
+ 2 files changed, 17 insertions(+)
+
+commit f30efd2619911c89ca873fac6bec06a1b60fab82
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Tue Oct 23 13:32:14 2012 +0200
+
+    Mark GLib.Source.get_current_time() as deprecated
+
+    This method has been deprecated in GLib long ago. We have a workaround
+    implementation using GLib.get_real_time(), but eventually this should
+    go away.
+
+ gi/overrides/GLib.py | 5 ++++-
+ tests/test_source.py | 8 +++++++-
+ 2 files changed, 11 insertions(+), 2 deletions(-)
+
+commit 483c86267f2623eaa88d6a9e685c96ec3ba4f121
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Tue Oct 23 08:56:19 2012 +0200
+
+    Mark GLib API that is exposed in GObject as deprecated
+
+    A lot of API in GObject really belongs into GLib and is just there for
+    historical/backwards compatible reasons. Mark these methods as
+    deprecated so
+    that at some point we can drop them.
+
+ gi/overrides/GObject.py  |  3 ++-
+ gi/overrides/__init__.py | 13 +++++++++++++
+ tests/test_gobject.py    | 24 ++++++++++++++----------
+ 3 files changed, 29 insertions(+), 11 deletions(-)
+
+commit 191cf45af44850fc29f2392ae2f0042aed6d13a9
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Fri Oct 19 09:55:05 2012 +0200
+
+    Remove static MainLoop, MainContext, and some GSource bindings
+
+    glib's MainLoop and MainContext are fully introspectable these days,
+    so remove
+    our static bindings. This reduces our code, as well enables GLib
+    API which
+    hasn't been available through the static bindings before.
+
+    This also requires dropping our custom static types for GLib Source,
+    Timeout,
+    and Idle. The latter two work fine with introspection and just
+    need tiny
+    overrides for a backwards compatible API. g_source_new() is not
+    introspectable,
+    though, so we need to keep our static wrappers for that. Move
+    them from
+    gi/_glib/pygsource.c to gi/pygi-source.c, so that it can use the
+    GI API.
+
+    Note that gi/_glib/pygsource.[hc] is still required for the static
+    PollFD type
+    which is used by the static IOChannel binding. Once the latter
+    goes away,
+    PollFD can be dropped as well.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=686443
+
+ docs/Makefile.am                      |   6 +-
+ docs/reference/pyglib-classes.xml     |   2 -
+ docs/reference/pyglib-constants.xml   |  53 ---
+ docs/reference/pyglib-functions.xml   |  58 ---
+ docs/reference/pyglib-maincontext.xml | 152 --------
+ docs/reference/pyglib-mainloop.xml    | 202 -----------
+ gi/Makefile.am                        |   2 +
+ gi/_glib/Makefile.am                  |   4 -
+ gi/_glib/__init__.py                  |  12 -
+ gi/_glib/glibmodule.c                 |  45 +--
+ gi/_glib/pyglib.c                     |  15 -
+ gi/_glib/pyglib.h                     |   1 -
+ gi/_glib/pygmaincontext.c             | 126 -------
+ gi/_glib/pygmaincontext.h             |  40 ---
+ gi/_glib/pygmainloop.c                | 362 -------------------
+ gi/_glib/pygmainloop.h                |  36 --
+ gi/_glib/pygsource.c                  | 640
+ ----------------------------------
+ gi/_glib/pygsource.h                  |   3 -
+ gi/_gobject/__init__.py               |  13 -
+ gi/gimodule.c                         |   9 +
+ gi/overrides/GLib.py                  | 116 +++++-
+ gi/overrides/GObject.py               |  10 +-
+ gi/pygi-private.h                     |   1 +
+ gi/pygi-source.c                      | 247 +++++++++++++
+ gi/pygi-source.h                      |  31 ++
+ tests/test_glib.py                    |  22 +-
+ tests/test_gobject.py                 |   2 +
+ tests/test_source.py                  |   3 -
+ 28 files changed, 437 insertions(+), 1776 deletions(-)
+
+commit 326218a20681c1f2234a6eea1ed800382be57626
+Author: Simon Feltman <s.feltman@gmail.com>
+Date:   Wed Sep 19 15:37:14 2012 -0700
+
+    Deprecate void pointer fields as general PyObject storage.
+
+    Complete deprecation of gpointer struct fields as general
+    PyObject storage. Only int types are now allowed.
+    Assignment of anything other than an int or None raises
+    a TypeError stating the error and  associated bug URL.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=683599
+
+ gi/pygi-argument.c          | 25 ++++++++++++++++-----
+ gi/pygi-info.c              | 28 ++++--------------------
+ tests/test_everything.py    | 53
+ +++++++++++++++++++++++++--------------------
+ tests/test_overrides_gtk.py | 41 -----------------------------------
+ 4 files changed, 54 insertions(+), 93 deletions(-)
+
+commit 3dba328010a4ffd9259700ffec95871c7341d491
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Tue Oct 23 11:59:08 2012 +0200
+
+    Add some MainLoop, MainContext, and Source test cases
+
+    These cover the remaining static API and behaviour, so that we
+    have good
+    regression tests for converting them to GI.
+
+    See https://bugzilla.gnome.org/show_bug.cgi?id=686443
+
+ tests/test_glib.py     | 21 +++++++++++++++++++++
+ tests/test_gobject.py  | 11 +++++++++++
+ tests/test_mainloop.py | 16 ++++++++++++++++
+ tests/test_source.py   | 44 ++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 92 insertions(+)
+
+commit 7635340271df0a135873459e6a2a365fd4b187a2
+Author: Steve Frécinaux <code@istique.net>
+Date:   Wed Feb 9 18:37:33 2011 +0100
+
+    [API change] Do not bind gobject_get_data() and gobject_set_data()
+
+    They will basically cause a crash if misused, and you can always use a
+    python member attribute instead.
+
+    These methods were marked as deprecated for 3.4 and throwing a
+    warning, so
+    let's remove them for good now.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=641944
+
+    Co-Authored-By: Martin Pitt <martinpitt@gnome.org>
+
+ docs/reference/pygobject.xml | 63
+ --------------------------------------------
+ gi/_gobject/pygobject.c      | 44 -------------------------------
+ 2 files changed, 107 deletions(-)
+
+commit cfec113e3b3eabf8db834f48b2f16792d1e841a3
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Tue Oct 23 08:17:40 2012 +0200
+
+    Add test for GLib.get_current_time()
+
+    This adds a plausibility test, as well as ensuring the documented
+    return type.
+    This will be useful if/once we drop the static _glib binding.
+
+ tests/test_glib.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+commit fb473b31054744e5ab59e9d4ed3b74571e27d3ff
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Tue Oct 23 07:48:52 2012 +0200
+
+    Drop unnecessary static _glib bindings
+
+    Drop static pyglib bindings which have straightforward and working
+    GLib GI
+    bindings. Add tests for all dropped functions to ensure they keep
+    working.
+
+ docs/reference/pyglib-constants.xml |  59 -------
+ docs/reference/pyglib-functions.xml | 270 ------------------------------
+ gi/_glib/__init__.py                |  24 ---
+ gi/_glib/glibmodule.c               | 319
+ ------------------------------------
+ gi/_gobject/__init__.py             |   9 -
+ gi/overrides/GLib.py                |  16 ++
+ gi/overrides/GObject.py             |  32 ++++
+ gi/overrides/Makefile.am            |   1 +
+ tests/Makefile.am                   |   1 -
+ tests/test_glib.py                  |  46 ++++++
+ tests/test_gobject.py               |   4 +
+ tests/test_uris.py                  |  16 --
+ 12 files changed, 99 insertions(+), 698 deletions(-)
+
+commit 126a10f765af3d3a6f08ce5db7ed9f3ef647848f
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Tue Oct 23 06:12:08 2012 +0200
+
+    Fix OverflowError in source_remove()
+
+    GSource IDs are unsigned, so we must use 'I' for parsing then, not
+    'i'.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=684526
+
+ gi/_glib/glibmodule.c |  2 +-
+ tests/test_source.py  | 13 ++++++++++++-
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+commit 15f7442bd0c45db25073e3d8494094f1c284ffa4
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Mon Oct 22 13:38:23 2012 +0200
+
+    Fix TestSource.testSources() test case
+
+    PyGObject has established the assumption that the destruction of
+    a GLib.Source
+    Python object does not destroy the actual GSource, as shown in
+    TestSource.setup_timeout(), TestTimeout.test504337(), and
+    https://bugzilla.gnome.org/show_bug.cgi?id=504337.
+
+    So we need to explicitly destroy our MySource and Idle objects
+    after using
+    them, as their callbacks always return True and we do not want them
+    to spill
+    over into other tests.
+
+    Also fix the assertions to actually verify that MySources' callback
+    was callied
+    (pos > 0, not pos >= 0), and use the unittest comparison API instead
+    of a
+    simple assert statement.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=686627
+
+ tests/test_source.py | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+commit b984a5fe0d065818a153f259db4dbde79534f084
+Author: Martin Pitt <martinpitt@gnome.org>
+Date:   Mon Oct 22 17:38:56 2012 +0200
+
+    configure.ac: post-release bump to 3.7.2
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 commit ce0825f58c3eba6084143e430605ffb597622369
 Author: Martin Pitt <martinpitt@gnome.org>
 Date:   Mon Oct 22 17:37:17 2012 +0200
 
     release 3.7.1
 
- NEWS |   42 ++++++++++++++++++++++++++++++++++++++++++
+ NEWS | 42 ++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 42 insertions(+)
 
 commit a93763337ba7f952d787c42f45bfbb3ff02cc80d
@@ -15,7 +2066,7 @@ Date:   Mon Oct 22 17:33:12 2012 +0200
 
     Let's follow the real GNOME versioning from now on.
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 3fb13cc05a281970c3a624c2dd152996031b482c
@@ -30,7 +2081,7 @@ Date:   Mon Oct 22 11:36:49 2012 +0200
     more useful
     failure messages.
 
- tests/test_mainloop.py |   19 ++++++++++---------
+ tests/test_mainloop.py | 19 ++++++++++---------
  1 file changed, 10 insertions(+), 9 deletions(-)
 
 commit 31061f20083aa60919f6763a12addbf2b052cab7
@@ -48,8 +2099,8 @@ Date:   Sun Oct 21 18:55:24 2012 -0700
 
     https://bugzilla.gnome.org/show_bug.cgi?id=686559
 
- gi/_gobject/propertyhelper.py |    2 +-
- tests/test_properties.py      |    6 ++++--
+ gi/_gobject/propertyhelper.py | 2 +-
+ tests/test_properties.py      | 6 ++++--
  2 files changed, 5 insertions(+), 3 deletions(-)
 
 commit 438d3e68f19e2af5d027e18842ab05e0421d088d
@@ -63,10 +2114,10 @@ Date:   Sat Oct 20 19:56:04 2012 -0700
 
     https://bugzilla.gnome.org/show_bug.cgi?id=686559
 
- gi/_gobject/__init__.py       |   45 ++---------------------------
- gi/_gobject/propertyhelper.py |   45 +++++++++++++++++++++++++++++
- tests/test_properties.py      |   63
- +++++++++++++++++++++++++++++++++++++++++
+ gi/_gobject/__init__.py       | 45 +++----------------------------
+ gi/_gobject/propertyhelper.py | 45 +++++++++++++++++++++++++++++++
+ tests/test_properties.py      | 63
+ +++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 111 insertions(+), 42 deletions(-)
 
 commit 695a9077aa8f40357e050f090caa5e2b8c5c9593
@@ -80,8 +2131,8 @@ Date:   Sat Oct 20 03:11:07 2012 -0700
 
     https://bugzilla.gnome.org/show_bug.cgi?id=686496
 
- gi/_gobject/signalhelper.py |    2 +-
- tests/test_signal.py        |   43
+ gi/_gobject/signalhelper.py |  2 +-
+ tests/test_signal.py        | 43
  +++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 44 insertions(+), 1 deletion(-)
 
@@ -93,8 +2144,8 @@ Date:   Fri Oct 19 09:05:01 2012 +0200
 
     ... instead of mixing GObject.MainLoop and GLib.MainLoop.
 
- tests/test_everything.py |    4 ++--
- tests/test_gdbus.py      |   11 +++++------
+ tests/test_everything.py |  4 ++--
+ tests/test_gdbus.py      | 11 +++++------
  2 files changed, 7 insertions(+), 8 deletions(-)
 
 commit ff7e7401b4cf50532fef70263f7559ea513b8333
@@ -109,7 +2160,7 @@ Date:   Wed Oct 17 18:27:14 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=686315
 
- Makefile.am |    6 +++---
+ Makefile.am | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 91e4cb2063d4e83fb1f6586a4396471d64f234f4
@@ -123,8 +2174,8 @@ Date:   Mon Oct 15 04:03:50 2012 -0700
 
     https://bugzilla.gnome.org/show_bug.cgi?id=686140
 
- gi/pygi-closure.c |    1 +
- tests/test_gi.py  |   21 +++++++++++++++++++--
+ gi/pygi-closure.c |  1 +
+ tests/test_gi.py  | 21 +++++++++++++++++++--
  2 files changed, 20 insertions(+), 2 deletions(-)
 
 commit 75e373b99c3cb66dd60b13c803e5f7eec77cc415
@@ -142,11 +2193,11 @@ Date:   Mon Oct 15 07:42:05 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=685094
 
- configure.ac             |    5 ++---
- tests/Makefile.am        |   45
+ configure.ac             |  5 ++---
+ tests/Makefile.am        | 45
  +++++++++++++++++++++++++++------------------
- tests/test_everything.py |   15 +++++++++++----
- tests/test_overrides.py  |    7 ++++++-
+ tests/test_everything.py | 15 +++++++++++----
+ tests/test_overrides.py  |  7 ++++++-
  4 files changed, 46 insertions(+), 26 deletions(-)
 
 commit a2ab72aa39824579d1767d1fdba7e1031341f86c
@@ -161,7 +2212,7 @@ Date:   Fri Oct 12 11:05:24 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=685000
 
- gi/pygi-marshal-from-py.c |    6 +++---
+ gi/pygi-marshal-from-py.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 22c22124b787ae67638aff89796d7ce14900ea8e
@@ -177,15 +2228,15 @@ Date:   Mon Oct 8 05:54:30 2012 -0700
 
     https://bugzilla.gnome.org/show_bug.cgi?id=685598
 
- gi/pygi-cache.c               |    1 +
- gi/pygi-closure.c             |   41 ++++++++----
- gi/pygi-invoke-state-struct.h |    4 ++
- gi/pygi-invoke.c              |    7 +++
- gi/pygi-marshal-cleanup.c     |   14 +++++
- gi/pygi-marshal-cleanup.h     |    4 ++
- gi/pygi-marshal-from-py.c     |   57 +++++++++++++----
- tests/test_everything.py      |  137
- ++++++++++++++++++++++++++++++-----------
+ gi/pygi-cache.c               |   1 +
+ gi/pygi-closure.c             |  41 +++++++++----
+ gi/pygi-invoke-state-struct.h |   4 ++
+ gi/pygi-invoke.c              |   7 +++
+ gi/pygi-marshal-cleanup.c     |  14 +++++
+ gi/pygi-marshal-cleanup.h     |   4 ++
+ gi/pygi-marshal-from-py.c     |  57 ++++++++++++++----
+ tests/test_everything.py      | 137
+ +++++++++++++++++++++++++++++++-----------
  8 files changed, 206 insertions(+), 59 deletions(-)
 
 commit c0bc69906df2db64560f7c054277ad1956aab57f
@@ -196,8 +2247,8 @@ Date:   Thu Oct 11 17:49:30 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=685947
 
- gi/overrides/Gio.py         |    9 ++++++++-
- tests/test_overrides_gio.py |    3 +++
+ gi/overrides/Gio.py         | 9 ++++++++-
+ tests/test_overrides_gio.py | 3 +++
  2 files changed, 11 insertions(+), 1 deletion(-)
 
 commit bbbb7c9ed047a22ac3c43f2b0331d3b5ea32e812
@@ -208,8 +2259,8 @@ Date:   Thu Oct 11 17:20:38 2012 +0200
 
     Also split test_override() into several smaller test cases.
 
- tests/org.gnome.test.gschema.xml |    9 +++++++++
- tests/test_overrides_gio.py      |   14 +++++++++-----
+ tests/org.gnome.test.gschema.xml |  9 +++++++++
+ tests/test_overrides_gio.py      | 14 +++++++++-----
  2 files changed, 18 insertions(+), 5 deletions(-)
 
 commit 8a2e96cd4e33b6c119a368d73a9d5504576cdccb
@@ -222,8 +2273,8 @@ Date:   Thu Oct 11 16:08:11 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=685860
 
- gi/pygi-argument.c |    9 +++++++++
- tests/test_gi.py   |   12 ++++++++++++
+ gi/pygi-argument.c |  9 +++++++++
+ tests/test_gi.py   | 12 ++++++++++++
  2 files changed, 21 insertions(+)
 
 commit d394acbb58b38e6f52ee71e8e663a892676ab9e4
@@ -232,7 +2283,7 @@ Date:   Thu Oct 4 20:13:55 2012 -0400
 
     build: Fix srcdir != builddir
 
- Makefile.am |    2 +-
+ Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 1bfcd5d94b71edc9f03c8b3e87952a8bc8097586
@@ -247,7 +2298,7 @@ Date:   Thu Sep 27 22:44:22 2012 +0200
 
     Side issue in https://bugzilla.gnome.org/show_bug.cgi?id=685000
 
- gi/pygi-marshal-from-py.c |    4 ++--
+ gi/pygi-marshal-from-py.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit f0870336b9fc7797895f206e0d3ef17a19efe253
@@ -261,7 +2312,7 @@ Date:   Tue Oct 2 05:30:16 2012 -0700
 
     https://bugzilla.gnome.org/show_bug.cgi?id=680138
 
- Makefile.am |   13 ++++++++-----
+ Makefile.am | 13 ++++++++-----
  1 file changed, 8 insertions(+), 5 deletions(-)
 
 commit 4c9318d97aa34051a0460e8db2ed0f963126b7f5
@@ -272,7 +2323,7 @@ Date:   Thu Oct 4 09:42:41 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=685218
 
- gi/_gobject/pygobject.c |    4 +++-
+ gi/_gobject/pygobject.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit 2aa61520eb4f293ce94d54605d7642a39e18e03d
@@ -283,7 +2334,7 @@ Date:   Mon Sep 17 15:16:32 2012 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=684062
 
- gi/_gobject/pygobject.c |    6 +++++-
+ gi/_gobject/pygobject.c | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit 43d356d03d4c83e9de3c56f98a70d387b46f17af
@@ -296,7 +2347,7 @@ Date:   Sat Sep 29 01:17:14 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=685082
 
- gi/pygi-argument.c |    3 +++
+ gi/pygi-argument.c | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 34270a109d2af20391c80e88874ee7303eaf5c09
@@ -317,7 +2368,7 @@ Date:   Fri Sep 28 07:42:51 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=684314
 
- gi/pygi-marshal-from-py.c |   21 ++++++++-------------
+ gi/pygi-marshal-from-py.c | 21 ++++++++-------------
  1 file changed, 8 insertions(+), 13 deletions(-)
 
 commit 7f1422bf929976722edd6144beb0b4c96d74391b
@@ -333,7 +2384,7 @@ Date:   Fri Sep 28 06:59:38 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=685009
 
- tests/Makefile.am |    5 ++++-
+ tests/Makefile.am | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit bfd9c8fac1ea240b29fbcd4185dc1702539c1e96
@@ -350,8 +2401,8 @@ Date:   Thu Sep 27 08:18:34 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=684928
 
- gi/overrides/GLib.py         |   30 +++++++++++++++++++++++-------
- tests/test_overrides_glib.py |   31 +++++++++++++++++++++++++++++++
+ gi/overrides/GLib.py         | 30 +++++++++++++++++++++++-------
+ tests/test_overrides_glib.py | 31 +++++++++++++++++++++++++++++++
  2 files changed, 54 insertions(+), 7 deletions(-)
 
 commit 75d452ea5b179c3585adcf95356b4316c9180768
@@ -360,7 +2411,7 @@ Date:   Thu Sep 27 06:50:12 2012 +0200
 
     TestGVariant: Split creation test case into several smaller ones
 
- tests/test_overrides_glib.py |   20 ++++++--------------
+ tests/test_overrides_glib.py | 20 ++++++--------------
  1 file changed, 6 insertions(+), 14 deletions(-)
 
 commit 4a20bcb3f97614044d351f8e436a81d332db55ba
@@ -371,11 +2422,11 @@ Date:   Tue Sep 25 09:10:10 2012 +0200
 
     This gets rid of all warnings except the deprecated symbol ones.
 
- gi/_glib/pygiochannel.c |    9 +++------
- gi/pygi-argument.c      |    4 +---
- gi/pygi-callbacks.c     |    4 ----
- gi/pygi-ccallback.c     |    1 -
- gi/pygi-repository.c    |    3 +--
+ gi/_glib/pygiochannel.c | 9 +++------
+ gi/pygi-argument.c      | 4 +---
+ gi/pygi-callbacks.c     | 4 ----
+ gi/pygi-ccallback.c     | 1 -
+ gi/pygi-repository.c    | 3 +--
  5 files changed, 5 insertions(+), 16 deletions(-)
 
 commit 5285f14fee93d2729d4422c40a945adc2be69c14
@@ -386,7 +2437,7 @@ Date:   Tue Sep 25 08:56:20 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=684700
 
- tests/testhelpermodule.c |    2 +-
+ tests/testhelpermodule.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e14ebab6099d082466ec11ca21d44de0d6017216
@@ -403,7 +2454,7 @@ Date:   Wed Sep 19 00:10:57 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=684331
 
- gi/pygi-argument.c |   25 +++++++++++++++++++++----
+ gi/pygi-argument.c | 25 +++++++++++++++++++++----
  1 file changed, 21 insertions(+), 4 deletions(-)
 
 commit 50571dd27d1f7c6bed8c5aaa518b504c9f4c4ab6
@@ -417,7 +2468,7 @@ Date:   Wed Sep 19 19:07:00 2012 -0700
 
     https://bugzilla.gnome.org/show_bug.cgi?id=683599
 
- gi/pygi-info.c |    4 ++--
+ gi/pygi-info.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 4bfe7972546413f46f5c36737ff03bb5612c1921
@@ -433,8 +2484,8 @@ Date:   Tue Sep 18 08:52:02 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=684058
 
- gi/pygi-property.c       |   28 ++++++++++++++--------------
- tests/test_everything.py |   12 ++++++++++++
+ gi/pygi-property.c       | 28 ++++++++++++++--------------
+ tests/test_everything.py | 12 ++++++++++++
  2 files changed, 26 insertions(+), 14 deletions(-)
 
 commit 7aa94cc861082147b9c382b930f3257f0a842c84
@@ -443,7 +2494,7 @@ Date:   Mon Sep 24 09:41:10 2012 +0200
 
     post-release bump to 3.4.1
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit fcceed3adb8d78baba68861a1408627321b2c1ef
@@ -452,8 +2503,8 @@ Date:   Mon Sep 24 09:35:33 2012 +0200
 
     release 3.4.0
 
- NEWS         |    3 +++
- configure.ac |    4 ++--
+ NEWS         | 3 +++
+ configure.ac | 4 ++--
  2 files changed, 5 insertions(+), 2 deletions(-)
 
 commit 645a9d9d4712f8f0d1b63899b309bbc97eb1f216
@@ -464,7 +2515,7 @@ Date:   Mon Sep 24 09:27:47 2012 +0200
 
     To ensure we have all the Regress test APIs that we use.
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit b6f4ef327fbeaa10fd74571c3df540311834d6ae
@@ -473,7 +2524,7 @@ Date:   Mon Sep 17 22:52:49 2012 +0200
 
     post-release bump to 3.3.93
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 7e154cf01cf0ce7a8b52c45ba4db755f73b45d1d
@@ -482,7 +2533,7 @@ Date:   Mon Sep 17 22:48:13 2012 +0200
 
     release 3.3.92
 
- NEWS |   12 ++++++++++++
+ NEWS | 12 ++++++++++++
  1 file changed, 12 insertions(+)
 
 commit adbe30dc72b4d88bb31055f6ee33fddf32638af9
@@ -497,8 +2548,8 @@ Date:   Mon Sep 17 22:32:55 2012 +0200
 
     Update HACKING to point this out, too.
 
- HACKING     |    2 +-
- Makefile.am |   22 ++++++++++++++++------
+ HACKING     |  2 +-
+ Makefile.am | 22 ++++++++++++++++------
  2 files changed, 17 insertions(+), 7 deletions(-)
 
 commit be4a0682bdd189ee908ab1961001f759a80e133c
@@ -513,8 +2564,8 @@ Date:   Sun Sep 16 17:27:25 2012 -0700
 
     https://bugzilla.gnome.org/show_bug.cgi?id=675581
 
- gi/pygi-info.c   |    8 ++++++++
- tests/test_gi.py |   12 ++++++++++++
+ gi/pygi-info.c   |  8 ++++++++
+ tests/test_gi.py | 12 ++++++++++++
  2 files changed, 20 insertions(+)
 
 commit 3ada408434860d0c8eee6c6a869b5a3d801cfbc8
@@ -530,7 +2581,7 @@ Date:   Thu Sep 13 20:53:22 2012 -0700
 
     https://bugzilla.gnome.org/show_bug.cgi?id=683599
 
- gi/pygi-info.c |    8 ++++++++
+ gi/pygi-info.c | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 commit a047f61f26d9c78b82d22948199313e5a389e918
@@ -545,7 +2596,7 @@ Date:   Mon Sep 17 09:41:24 2012 +0200
 
     See https://bugzilla.gnome.org/show_bug.cgi?id=684058
 
- tests/test_properties.py |   12 ++++++++++++
+ tests/test_properties.py | 12 ++++++++++++
  1 file changed, 12 insertions(+)
 
 commit 3e6a4000cbc4b0cb503fcd89b50202ed0b70d3a7
@@ -558,8 +2609,8 @@ Date:   Mon Sep 17 09:31:05 2012 +0200
     some test
     cases to better describe what they do.
 
- tests/test_properties.py |   78
- +++++++++++++++++++++++-----------------------
+ tests/test_properties.py | 78
+ ++++++++++++++++++++++++------------------------
  1 file changed, 39 insertions(+), 39 deletions(-)
 
 commit 4069c3d8547f35437e0cee175a5912febe25326d
@@ -568,7 +2619,7 @@ Date:   Wed Sep 12 06:51:24 2012 +0200
 
     test_everything: Ensure TestSignals callback does get called
 
- tests/test_everything.py |    3 +++
+ tests/test_everything.py | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 4e4c87e3868948743e0446abe2ba0cf5626374c4
@@ -585,9 +2636,9 @@ Date:   Fri Sep 7 17:17:09 2012 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=683596
 
- gi/pygi-argument.c       |    8 +++++--
- tests/test_everything.py |   52
- ++++++++++++++++++++++++++++++++++++++++++++++
+ gi/pygi-argument.c       |  8 ++++++--
+ tests/test_everything.py | 52
+ ++++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 58 insertions(+), 2 deletions(-)
 
 commit e474ce243ea7a58358af344ccadb1418f4d2c8eb
@@ -599,7 +2650,7 @@ Date:   Tue Sep 11 12:32:10 2012 +0200
     Signed-off-By: Martin Pitt <martinpitt@gnome.org>
     Signed-off-By: Paolo Borelli <pborelli@gnome.org>
 
- pygobject.doap |    7 +++++++
+ pygobject.doap | 7 +++++++
  1 file changed, 7 insertions(+)
 
 commit ee1fc78258f10e8a7872ee3da6c9ad6e7984706e
@@ -614,7 +2665,7 @@ Date:   Tue Sep 11 10:17:50 2012 +0200
     read, and we
     really do not want global single-letter variables like "f" and "l".
 
- tests/test_signal.py |   38 ++++++++++++++++----------------------
+ tests/test_signal.py | 38 ++++++++++++++++----------------------
  1 file changed, 16 insertions(+), 22 deletions(-)
 
 commit 3688cf6efe7161585b943cfaafcfd4610b7ad768
@@ -625,8 +2676,8 @@ Date:   Tue Sep 11 10:11:58 2012 +0200
 
     Use underscore style method/test case names consistently.
 
- tests/test_signal.py |   88
- +++++++++++++++++++++++++-------------------------
+ tests/test_signal.py | 88
+ ++++++++++++++++++++++++++--------------------------
  1 file changed, 44 insertions(+), 44 deletions(-)
 
 commit 4559247553b792db956f69c9674c12344d719c82
@@ -642,8 +2693,8 @@ Date:   Tue Sep 11 09:43:14 2012 +0200
     not work and it is not clear whether it should:
     https://bugzilla.gnome.org/show_bug.cgi?id=683775
 
- tests/test_signal.py     |   41 +++++++++++++++++++++++++++++++++++++++++
- tests/testhelpermodule.c |   17 +++++++++++++++++
+ tests/test_signal.py     | 41 +++++++++++++++++++++++++++++++++++++++++
+ tests/testhelpermodule.c | 17 +++++++++++++++++
  2 files changed, 58 insertions(+)
 
 commit fddb01b0b71b68d154d130cf40fd5f38647b1a4d
@@ -656,8 +2707,8 @@ Date:   Tue Sep 11 09:31:18 2012 +0200
     https://bugzilla.gnome.org/show_bug.cgi?id=683596
     but this works already.
 
- tests/test_signal.py     |   13 +++++++++++++
- tests/testhelpermodule.c |   36 ++++++++++++++++++++++++++++++++++++
+ tests/test_signal.py     | 13 +++++++++++++
+ tests/testhelpermodule.c | 36 ++++++++++++++++++++++++++++++++++++
  2 files changed, 49 insertions(+)
 
 commit 4f77c7798563ea436ff5b6306a987f03de50b211
@@ -675,8 +2726,8 @@ Date:   Fri Sep 7 02:32:15 2012 -0700
 
     https://bugzilla.gnome.org/show_bug.cgi?id=683150
 
- gi/pygi-argument.c |    8 +-------
- gi/pygi-info.c     |   14 +++++++++++++-
+ gi/pygi-argument.c |  8 +-------
+ gi/pygi-info.c     | 14 +++++++++++++-
  2 files changed, 14 insertions(+), 8 deletions(-)
 
 commit 15046b5a11f6c58a3e5a9c50cf0ce7f31f2cd55f
@@ -685,8 +2736,8 @@ Date:   Mon Sep 10 16:46:30 2012 +0200
 
     Test gint64 C signal arguments and return values
 
- tests/test_signal.py     |   12 ++++++++++++
- tests/testhelpermodule.c |   14 ++++++++++++++
+ tests/test_signal.py     | 12 ++++++++++++
+ tests/testhelpermodule.c | 14 ++++++++++++++
  2 files changed, 26 insertions(+)
 
 commit 822d9e07a95f706a40f64335765293542787da90
@@ -697,7 +2748,7 @@ Date:   Mon Sep 10 16:29:32 2012 +0200
 
     See https://bugzilla.gnome.org/show_bug.cgi?id=683596
 
- tests/test_gi.py |    9 +++++++++
+ tests/test_gi.py | 9 +++++++++
  1 file changed, 9 insertions(+)
 
 commit 2d83e52233812618493af4b165615e8741ba41c8
@@ -708,7 +2759,7 @@ Date:   Wed Sep 5 08:54:53 2012 +0200
 
     To ensure we have all the Regress test APIs that we use.
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 6a4f4dc9a3d21c3ac8a0aa51432fb8952b4e1ebf
@@ -719,7 +2770,7 @@ Date:   Wed Aug 8 12:57:41 2012 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=683379
 
- pygobject-3.0-uninstalled.pc.in |    6 +++---
+ pygobject-3.0-uninstalled.pc.in | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit d8f1398dbc7fa7803639c542a607f24f18614ad6
@@ -728,7 +2779,7 @@ Date:   Mon Sep 3 22:16:47 2012 +0200
 
     post-release bump to 3.3.92
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit ea992324b8197b2d04ff2849b9ab46f8a04b4ed7
@@ -737,7 +2788,7 @@ Date:   Mon Sep 3 22:04:01 2012 +0200
 
     release 3.3.91
 
- NEWS |   32 ++++++++++++++++++++++++++++++++
+ NEWS | 32 ++++++++++++++++++++++++++++++++
  1 file changed, 32 insertions(+)
 
 commit 1e1f5b2f2f15547c1f2cbc948d2b764bd0a37c44
@@ -748,7 +2799,7 @@ Date:   Mon Sep 3 21:57:00 2012 +0200
 
     Regression from commit 77844c5 which did not work with Python 2.
 
- tests/test_everything.py |   12 +++++++-----
+ tests/test_everything.py | 12 +++++++-----
  1 file changed, 7 insertions(+), 5 deletions(-)
 
 commit 41bb687c058e08b05108b4b2f081cd83d4f93da8
@@ -763,7 +2814,7 @@ Date:   Mon Sep 3 21:16:01 2012 +0200
     for all
     tests to succeed, but that hasn't been released yet.
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 77844c571ad0badc189428b93de9f2572051b67e
@@ -777,8 +2828,8 @@ Date:   Mon Sep 3 17:58:38 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=639972
 
- gi/pygi-struct.c         |    7 +++++++
- tests/test_everything.py |   13 +++++++++++++
+ gi/pygi-struct.c         |  7 +++++++
+ tests/test_everything.py | 13 +++++++++++++
  2 files changed, 20 insertions(+)
 
 commit 0d099bdb3f4bbd962e5e60b583673d9e6f5673cc
@@ -793,8 +2844,8 @@ Date:   Mon Sep 3 16:47:22 2012 +0200
 
     Co-Authored-By: Martin Pitt <martinpitt@gnome.org>
 
- gi/pygi-argument.c   |   10 +++++++++-
- tests/test_signal.py |   14 ++++++++++++++
+ gi/pygi-argument.c   | 10 +++++++++-
+ tests/test_signal.py | 14 ++++++++++++++
  2 files changed, 23 insertions(+), 1 deletion(-)
 
 commit 69fb92c22b3f3d1d5e8c3e14134eee3242fdc5fc
@@ -805,8 +2856,8 @@ Date:   Mon Sep 3 16:06:49 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=683265
 
- tests/test_signal.py     |    6 ++++++
- tests/testhelpermodule.c |   12 ++++++++++++
+ tests/test_signal.py     |  6 ++++++
+ tests/testhelpermodule.c | 12 ++++++++++++
  2 files changed, 18 insertions(+)
 
 commit a7c524219987fbf37e455a91e4c78d2b9b4db12d
@@ -830,12 +2881,12 @@ Date:   Tue Mar 20 04:33:50 2012 -0700
 
     https://bugzilla.gnome.org/show_bug.cgi?id=434924
 
- examples/signal.py          |   34 ++++--
- gi/_gobject/Makefile.am     |    3 +-
- gi/_gobject/__init__.py     |    5 +
- gi/_gobject/signalhelper.py |  251
- +++++++++++++++++++++++++++++++++++++++++++
- tests/test_signal.py        |  208 +++++++++++++++++++++++++++++++++--
+ examples/signal.py          |  34 ++++--
+ gi/_gobject/Makefile.am     |   3 +-
+ gi/_gobject/__init__.py     |   5 +
+ gi/_gobject/signalhelper.py | 251
+ ++++++++++++++++++++++++++++++++++++++++++++
+ tests/test_signal.py        | 208 ++++++++++++++++++++++++++++++++++--
  5 files changed, 482 insertions(+), 19 deletions(-)
 
 commit 96fa22369fd188465559fc904c7f76e73040e6dd
@@ -851,8 +2902,8 @@ Date:   Mon Sep 3 15:32:12 2012 +0200
     Also improve test case for
     Gtk.TreeView.insert_column_with_attributes().
 
- gi/pygtkcompat.py           |    6 ------
- tests/test_overrides_gtk.py |   16 ++++++++--------
+ gi/pygtkcompat.py           |  6 ------
+ tests/test_overrides_gtk.py | 16 ++++++++--------
  2 files changed, 8 insertions(+), 14 deletions(-)
 
 commit 542cf22c9de9b2094868c4e879b0f24b15c4c012
@@ -865,8 +2916,8 @@ Date:   Mon Sep 3 13:06:22 2012 +0200
 
     Co-Authored-By: Martin Pitt <martinpitt@gnome.org>
 
- gi/overrides/Gtk.py         |    7 +++++++
- tests/test_overrides_gtk.py |   38 ++++++++++++++++++++++++++++++++++++++
+ gi/overrides/Gtk.py         |  7 +++++++
+ tests/test_overrides_gtk.py | 38 ++++++++++++++++++++++++++++++++++++++
  2 files changed, 45 insertions(+)
 
 commit 1c73e845361e471b1c3a3f17e40e6a6cfa740877
@@ -875,7 +2926,7 @@ Date:   Mon Sep 3 11:09:55 2012 +0200
 
     .gitignore: Add missing built files
 
- .gitignore |    9 +++++++--
+ .gitignore | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 commit 96431f393036a688666dcf67911bf12b9824b264
@@ -886,7 +2937,7 @@ Date:   Mon Sep 3 11:07:32 2012 +0200
 
     Spotted by distcheck.
 
- tests/Makefile.am |    6 +++++-
+ tests/Makefile.am | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit dc2c6e6f60d2757462cbceef6176b0b3013904d3
@@ -905,8 +2956,8 @@ Date:   Mon Sep 3 10:18:45 2012 +0200
     otherwise
     we fail to import the built libraries.
 
- tests/runtests-windows.py |   10 +++++++---
- tests/runtests.py         |   13 ++++++++-----
+ tests/runtests-windows.py | 10 +++++++---
+ tests/runtests.py         | 13 ++++++++-----
  2 files changed, 15 insertions(+), 8 deletions(-)
 
 commit 2d8f48f4ff56bb75985136452b50b75895258608
@@ -945,7 +2996,7 @@ Date:   Mon Sep 3 07:17:57 2012 +0200
     Emit a critical if we fail to allocate a Python array of the
     requested size.
 
- gi/pygi-argument.c |   47 ++++++++++++++++-------------------------------
+ gi/pygi-argument.c | 47 ++++++++++++++++-------------------------------
  1 file changed, 16 insertions(+), 31 deletions(-)
 
 commit 65bfbc624bc9da6e18ff2945b14099ab8eeb7601
@@ -959,7 +3010,7 @@ Date:   Wed Aug 29 21:24:17 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=682979
 
- gi/pygi-argument.c |    4 ++++
+ gi/pygi-argument.c | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 21b1d17d2ada2edf4063a4262b3436c279da3dc2
@@ -974,8 +3025,8 @@ Date:   Sat Sep 1 03:40:31 2012 -0700
 
     https://bugzilla.gnome.org/show_bug.cgi?id=683150
 
- gi/pygi-argument.c      |    8 +++++++-
- tests/test_overrides.py |   41 +++++++++++++++++++++++++++++++++++++++++
+ gi/pygi-argument.c      |  8 +++++++-
+ tests/test_overrides.py | 41 +++++++++++++++++++++++++++++++++++++++++
  2 files changed, 48 insertions(+), 1 deletion(-)
 
 commit 6123e6f5001ca5eaea18123d8a53525abab31a45
@@ -1001,12 +3052,12 @@ Date:   Thu Aug 23 06:44:27 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=682422
 
- configure.ac                    |    2 +-
- gi/_glib/pyglib-python-compat.h |    8 --------
- gi/_gobject/gobjectmodule.c     |    8 --------
- gi/module.py                    |    2 +-
- tests/runtests.py               |   27 +++++++++++++++++++++++++++
- tests/test_gi.py                |    2 +-
+ configure.ac                    |  2 +-
+ gi/_glib/pyglib-python-compat.h |  8 --------
+ gi/_gobject/gobjectmodule.c     |  8 --------
+ gi/module.py                    |  2 +-
+ tests/runtests.py               | 27 +++++++++++++++++++++++++++
+ tests/test_gi.py                |  2 +-
  6 files changed, 30 insertions(+), 19 deletions(-)
 
 commit b1a9848a7a7255e6b1ccd98712dd62b1514078b9
@@ -1032,12 +3083,12 @@ Date:   Tue Aug 21 07:54:09 2012 +0200
     Co-Authored-By: Martin Pitt <martinpitt@gnome.org>
     Co-Authored-By: Simon Feltman <s.feltman@gmail.com>
 
- gi/__init__.py                 |    4 ++++
- gi/overrides/__init__.py       |    4 ++++
- tests/gi/__init__.py           |    2 ++
- tests/gi/overrides/Regress.py  |   26 ++++++++++++++++++++++++++
- tests/gi/overrides/__init__.py |    2 ++
- tests/test_overrides.py        |    6 ++++++
+ gi/__init__.py                 |  4 ++++
+ gi/overrides/__init__.py       |  4 ++++
+ tests/gi/__init__.py           |  2 ++
+ tests/gi/overrides/Regress.py  | 26 ++++++++++++++++++++++++++
+ tests/gi/overrides/__init__.py |  2 ++
+ tests/test_overrides.py        |  6 ++++++
  6 files changed, 44 insertions(+)
 
 commit c7c95a795eee499373499ea5b771447746317bfb
@@ -1056,12 +3107,12 @@ Date:   Thu Aug 23 06:03:09 2012 +0200
 
     Side issue in https://bugzilla.gnome.org/show_bug.cgi?id=680913
 
- tests/runtests-windows.py |    6 +++++-
- tests/runtests.py         |    3 +++
- tests/test_everything.py  |    1 -
- tests/test_gdbus.py       |    3 ---
- tests/test_overrides.py   |    3 ---
- tests/test_pygtkcompat.py |    3 ---
+ tests/runtests-windows.py | 6 +++++-
+ tests/runtests.py         | 3 +++
+ tests/test_everything.py  | 1 -
+ tests/test_gdbus.py       | 3 ---
+ tests/test_overrides.py   | 3 ---
+ tests/test_pygtkcompat.py | 3 ---
  6 files changed, 8 insertions(+), 11 deletions(-)
 
 commit 3e3525e93d852cde0f63e835b774a9b004773c69
@@ -1081,8 +3132,8 @@ Date:   Sun Aug 19 02:30:39 2012 -0700
 
     https://bugzilla.gnome.org/show_bug.cgi?id=682323
 
- gi/_gobject/pygenum.c  |   29 ++++++++++++++++-------------
- gi/_gobject/pygflags.c |   21 +++++++++------------
+ gi/_gobject/pygenum.c  | 29 ++++++++++++++++-------------
+ gi/_gobject/pygflags.c | 21 +++++++++------------
  2 files changed, 25 insertions(+), 25 deletions(-)
 
 commit dd31b67e821f92b5f1c2ee0382cac5edd477cd11
@@ -1096,8 +3147,8 @@ Date:   Wed Aug 22 10:45:39 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=682436
 
- gi/overrides/Gio.py     |   10 ++++++++++
- tests/test_overrides.py |   11 +++++++++++
+ gi/overrides/Gio.py     | 10 ++++++++++
+ tests/test_overrides.py | 11 +++++++++++
  2 files changed, 21 insertions(+)
 
 commit 836902801373e386d370c44e7487aac3432f19f6
@@ -1106,7 +3157,7 @@ Date:   Mon Aug 20 23:37:40 2012 +0200
 
     post-release bump to 3.3.91
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 6a629e23ff7b0d6f532184017577c7427d577e28
@@ -1115,8 +3166,8 @@ Date:   Mon Aug 20 23:05:49 2012 +0200
 
     release 3.3.90
 
- NEWS         |   13 +++++++++++++
- configure.ac |    2 +-
+ NEWS         | 13 +++++++++++++
+ configure.ac |  2 +-
  2 files changed, 14 insertions(+), 1 deletion(-)
 
 commit 5cd18c9bd59a60b930ced0b35d728c12bb3291c7
@@ -1129,8 +3180,8 @@ Date:   Mon Aug 20 22:54:52 2012 +0200
 
     Co-Authored-By: Martin Pitt <martinpitt@gnome.org>
 
- gi/pygi-marshal-to-py.c |   16 ++++++++++++----
- tests/test_gi.py        |   14 ++++++++++++++
+ gi/pygi-marshal-to-py.c | 16 ++++++++++++----
+ tests/test_gi.py        | 14 ++++++++++++++
  2 files changed, 26 insertions(+), 4 deletions(-)
 
 commit 16462de3f025f14706ec23fa9b3653feb66ad57f
@@ -1143,7 +3194,7 @@ Date:   Mon Aug 20 15:24:10 2012 +0200
     pyflakes/pep8
     exist, but fail.
 
- tests/Makefile.am |    4 ++--
+ tests/Makefile.am | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 1bee194274bcda9ba5f6751fa921218a92c8ac72
@@ -1163,8 +3214,8 @@ Date:   Thu Aug 16 16:05:52 2012 -0700
 
     https://bugzilla.gnome.org/show_bug.cgi?id=682051
 
- gi/module.py            |    7 +++++--
- gi/pygobject-external.h |    2 +-
+ gi/module.py            | 7 +++++--
+ gi/pygobject-external.h | 2 +-
  2 files changed, 6 insertions(+), 3 deletions(-)
 
 commit 1e056e4f4a19fd1139187467677c2592c2722290
@@ -1178,7 +3229,7 @@ Date:   Mon Aug 20 11:52:08 2012 +0200
     work without
     these tools.
 
- tests/Makefile.am |    4 ++--
+ tests/Makefile.am | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit c219fa6da89a7d55c5c111751684aae6876a9fe3
@@ -1187,9 +3238,9 @@ Date:   Mon Aug 20 11:42:47 2012 +0200
 
     gtk-demo: Fix some PEP-8 whitespace issues
 
- demos/gtk-demo/demos/Icon View/iconviewbasics.py |    3 +--
- demos/gtk-demo/demos/dialogs.py                  |    2 +-
- demos/gtk-demo/demos/rotatedtext.py              |    3 +--
+ demos/gtk-demo/demos/Icon View/iconviewbasics.py | 3 +--
+ demos/gtk-demo/demos/dialogs.py                  | 2 +-
+ demos/gtk-demo/demos/rotatedtext.py              | 3 +--
  3 files changed, 3 insertions(+), 5 deletions(-)
 
 commit 0ac2a85cae368c046839b5619a96efc9e0b91ba3
@@ -1198,8 +3249,8 @@ Date:   Mon Aug 20 11:38:50 2012 +0200
 
     test_overrides.py: Fix PEP8 whitespacing
 
- tests/test_overrides.py |   48
- ++++++++++++++++++++++++-----------------------
+ tests/test_overrides.py | 48
+ +++++++++++++++++++++++++-----------------------
  1 file changed, 25 insertions(+), 23 deletions(-)
 
 commit 631a9cd05cbc7dc3d0f743a84b948ef7d93c0ed4
@@ -1214,7 +3265,7 @@ Date:   Mon Aug 20 11:36:19 2012 +0200
     as the
     opening bracket, not the indentation level of the whole statement.
 
- tests/Makefile.am |    2 +-
+ tests/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 266d37719bb54e6f04d23ff21bcceb9514e20ff2
@@ -1231,12 +3282,12 @@ Date:   Mon Aug 20 11:27:52 2012 +0200
     https://bugzilla.gnome.org/show_bug.cgi?id=680693
     https://bugzilla.redhat.com/show_bug.cgi?id=842880
 
- gi/pygi-argument.c       |   53
- +++++++++++++++++++++++++++++++++++++++++++---
- gi/pygi-argument.h       |    1 +
- gi/pygi-closure.c        |    2 +-
- gi/pygi-info.c           |    4 ++--
- gi/pygi-signal-closure.c |    2 +-
+ gi/pygi-argument.c       | 53
+ +++++++++++++++++++++++++++++++++++++++++++++---
+ gi/pygi-argument.h       |  1 +
+ gi/pygi-closure.c        |  2 +-
+ gi/pygi-info.c           |  4 ++--
+ gi/pygi-signal-closure.c |  2 +-
  5 files changed, 55 insertions(+), 7 deletions(-)
 
 commit 1c5d497d3c354f4d02f1d4570df2c61d6f47300c
@@ -1252,14 +3303,14 @@ Date:   Mon Aug 20 11:19:27 2012 +0200
     https://bugzilla.gnome.org/show_bug.cgi?id=680692
     https://bugzilla.redhat.com/show_bug.cgi?id=841596
 
- gi/pygi-argument.c        |   64 ++++++++++++--
- gi/pygi-argument.h        |    6 ++
- gi/pygi-cache.c           |    2 +
- gi/pygi-closure.c         |   57 ++++++++++++-
- gi/pygi-marshal-from-py.c |  203
- +++++++++++++++++++++++++++++++++++----------
- gi/pygi-marshal-from-py.h |    3 +
- gi/pygi-marshal-to-py.c   |  137 +++++++++++++++++++++++-------
+ gi/pygi-argument.c        |  64 +++++++++++++--
+ gi/pygi-argument.h        |   6 ++
+ gi/pygi-cache.c           |   2 +
+ gi/pygi-closure.c         |  57 ++++++++++++-
+ gi/pygi-marshal-from-py.c | 203
+ ++++++++++++++++++++++++++++++++++++----------
+ gi/pygi-marshal-from-py.h |   3 +
+ gi/pygi-marshal-to-py.c   | 137 ++++++++++++++++++++++++-------
  7 files changed, 391 insertions(+), 81 deletions(-)
 
 commit ee6da6f1aa2cd6e55834f9edc17f785613d00031
@@ -1268,7 +3319,7 @@ Date:   Wed Aug 15 13:16:11 2012 +0200
 
     Add unit test for the TreeModelSort override
 
- tests/test_overrides.py |    7 +++++++
+ tests/test_overrides.py | 7 +++++++
  1 file changed, 7 insertions(+)
 
 commit 9f027daa5737107b5959964b699c0089aec8ab1e
@@ -1284,7 +3335,7 @@ Date:   Thu Aug 9 03:33:06 2012 -0700
 
     https://bugzilla.gnome.org/show_bug.cgi?id=681477
 
- gi/overrides/Gtk.py |    8 ++++++++
+ gi/overrides/Gtk.py | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 commit c8424c2bb19356679e250e73542682dd5f4c74a5
@@ -1297,7 +3348,7 @@ Date:   Fri Aug 10 09:38:24 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=681596
 
- pygi-convert.sh |    5 +++++
+ pygi-convert.sh | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 54d829b34a0d32d852db370f61cc7f25c149f373
@@ -1310,7 +3361,7 @@ Date:   Mon Aug 6 16:19:28 2012 +0200
     minor
     changes
 
- HACKING |   26 ++++++++++----------------
+ HACKING | 26 ++++++++++----------------
  1 file changed, 10 insertions(+), 16 deletions(-)
 
 commit 0788880c6cf4070d3db09896c165fe470d2ec186
@@ -1319,7 +3370,7 @@ Date:   Mon Aug 6 16:00:39 2012 +0200
 
     Post-release version bump to 3.3.6
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 664403d953c3e07077d0db90bfae3b51c7f1767c
@@ -1328,7 +3379,7 @@ Date:   Mon Aug 6 15:52:22 2012 +0200
 
     release 3.3.5
 
- NEWS |   29 +++++++++++++++++++++++++++++
+ NEWS | 29 +++++++++++++++++++++++++++++
  1 file changed, 29 insertions(+)
 
 commit b748753a2a9af018001213e2e58c48d6c8bfadbd
@@ -1337,7 +3388,7 @@ Date:   Mon Aug 6 15:44:32 2012 +0200
 
     Update HACKING file to mention "make release-news"
 
- HACKING |    7 +++----
+ HACKING | 7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
 
 commit 587a0c33901383b891f8eb77351c17f06af20b4f
@@ -1348,7 +3399,7 @@ Date:   Mon Aug 6 15:38:23 2012 +0200
 
     These variables are assigned but never actually used
 
- gi/pygi-closure.c |    8 --------
+ gi/pygi-closure.c | 8 --------
  1 file changed, 8 deletions(-)
 
 commit dbc6df6aad7197fcf8721ade429baadd749f7069
@@ -1363,8 +3414,8 @@ Date:   Fri Aug 3 07:13:55 2012 +0200
     fail on
     those.
 
- tests/test_overrides.py   |    4 ++++
- tests/test_pygtkcompat.py |    6 ++++++
+ tests/test_overrides.py   | 4 ++++
+ tests/test_pygtkcompat.py | 6 ++++++
  2 files changed, 10 insertions(+)
 
 commit 770e6abfd5bc5dad7d5f56a18f1ef63f9754ada9
@@ -1385,9 +3436,9 @@ Date:   Fri Aug 3 06:45:48 2012 +0200
     https://bugzilla.redhat.com/show_bug.cgi?id=842880
     https://bugzilla.gnome.org/show_bug.cgi?id=680693
 
- gi/pygi-marshal-from-py.c |   48 ++++++++++++++++++++++++----------------
- gi/pygi-marshal-to-py.c   |   54
- ++++++++++++++++++++++++++-------------------
+ gi/pygi-marshal-from-py.c | 48 ++++++++++++++++++++++++-----------------
+ gi/pygi-marshal-to-py.c   | 54
+ +++++++++++++++++++++++++++--------------------
  2 files changed, 60 insertions(+), 42 deletions(-)
 
 commit b5cd13f47309ec26727b7574e33595a357602468
@@ -1396,7 +3447,7 @@ Date:   Tue Jul 31 11:47:02 2012 -0400
 
     pygi-marshal: One more 32-bit -Werror=format fix
 
- gi/pygi-marshal-from-py.c |    6 +++---
+ gi/pygi-marshal-from-py.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 526bf43691cb6ed908589312b1693a6389eba00c
@@ -1408,7 +3459,7 @@ Date:   Tue Jul 31 17:14:37 2012 +0200
     Avoid saying "<unknown module>.int", just skip the module name
     completely if we do not have one.
 
- gi/pygi-marshal-from-py.c |   20 ++++++++++++--------
+ gi/pygi-marshal-from-py.c | 20 ++++++++++++--------
  1 file changed, 12 insertions(+), 8 deletions(-)
 
 commit 8fb18c62d9c7faff38df3886cb4289b618c81b85
@@ -1423,10 +3474,10 @@ Date:   Tue Jul 31 13:13:21 2012 +0200
     instead of
     failing the testsuite.
 
- tests/test_atoms.py       |    7 ++++++-
- tests/test_everything.py  |    9 ++++++++-
- tests/test_overrides.py   |   32 ++++++++++++++++++++++++++------
- tests/test_pygtkcompat.py |   30 ++++++++++++++++++++----------
+ tests/test_atoms.py       |  7 ++++++-
+ tests/test_everything.py  |  9 ++++++++-
+ tests/test_overrides.py   | 32 ++++++++++++++++++++++++++------
+ tests/test_pygtkcompat.py | 30 ++++++++++++++++++++----------
  4 files changed, 60 insertions(+), 18 deletions(-)
 
 commit a2e73c109f3ed6080eabc85810e624b9f984317e
@@ -1435,7 +3486,7 @@ Date:   Tue Jul 31 09:02:24 2012 -0400
 
     pygi-argument: Fix -Wformat warning on 32 bit builds
 
- gi/pygi-argument.c |    4 ++--
+ gi/pygi-argument.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 7563bb9f8ed5740f52ddf0ca59daf7839853505b
@@ -1448,7 +3499,7 @@ Date:   Tue Jul 31 11:14:36 2012 +0200
     type. Fixes
     check after commit 121b14028.
 
- tests/test_gi.py |   32 ++++++++++++++++++++------------
+ tests/test_gi.py | 32 ++++++++++++++++++++------------
  1 file changed, 20 insertions(+), 12 deletions(-)
 
 commit 5c5b066854cc0b3b7702f31d212aa3f511c62127
@@ -1461,7 +3512,7 @@ Date:   Tue Jul 31 10:30:22 2012 +0200
     in commit
     dea24f8e12 much more insistently.
 
- configure.ac |    1 +
+ configure.ac | 1 +
  1 file changed, 1 insertion(+)
 
 commit 6e84a3052667fdc88c2081e20cc6dc3257ec9d6c
@@ -1482,7 +3533,7 @@ Date:   Mon Jul 30 02:00:16 2012 -0700
 
     https://bugzilla.gnome.org/show_bug.cgi?id=680814
 
- gi/pygtkcompat.py |   10 +++++++++-
+ gi/pygtkcompat.py | 10 +++++++++-
  1 file changed, 9 insertions(+), 1 deletion(-)
 
 commit dea24f8e1221516b2d8ea578e55124b0409d6a76
@@ -1495,7 +3546,7 @@ Date:   Mon Jul 30 22:17:44 2012 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=680878
 
- gi/pygi-marshal-from-py.c |   18 +++++++++---------
+ gi/pygi-marshal-from-py.c | 18 +++++++++---------
  1 file changed, 9 insertions(+), 9 deletions(-)
 
 commit b630038d9a1c8cb7e5914c77fbacbed646c154d1
@@ -1508,7 +3559,7 @@ Date:   Mon Jul 30 22:30:07 2012 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=680879
 
- gi/pygi-marshal-from-py.c |    8 ++++----
+ gi/pygi-marshal-from-py.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit a8338a991bbe919f0e2d9b92f7b71f89ccd2c875
@@ -1521,7 +3572,7 @@ Date:   Mon Jul 30 12:53:36 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=680320
 
- tests/test_overrides.py |   20 ++++++++++++++++++--
+ tests/test_overrides.py | 20 ++++++++++++++++++--
  1 file changed, 18 insertions(+), 2 deletions(-)
 
 commit 121b1402860407fe46f7501e42447bf3607872ec
@@ -1546,9 +3597,9 @@ Date:   Tue Jul 31 00:37:55 2012 +0200
 
     instead.
 
- gi/pygi-marshal-from-py.c |   41 +++++++++++++++++++++++++-------
- tests/test_gi.py          |   57
- ++++++++++++++++++++++++++++++++++++++++++++-
+ gi/pygi-marshal-from-py.c | 41 ++++++++++++++++++++++++++--------
+ tests/test_gi.py          | 57
+ ++++++++++++++++++++++++++++++++++++++++++++++-
  2 files changed, 88 insertions(+), 10 deletions(-)
 
 commit 8f31e85db1392eb7222593fc0d05144c2bca06a3
@@ -1564,8 +3615,8 @@ Date:   Sun Jul 29 23:36:25 2012 -0700
 
     Signed-off-by: Martin Pitt <martinpitt@gnome.org>
 
- gi/pygi-closure.c       |   10 +++++++---
- tests/test_overrides.py |    9 +++++++++
+ gi/pygi-closure.c       | 10 +++++++---
+ tests/test_overrides.py |  9 +++++++++
  2 files changed, 16 insertions(+), 3 deletions(-)
 
 commit 94e5d58e7794de91d3291e0e51c42070da4fc92b
@@ -1576,7 +3627,7 @@ Date:   Mon Jul 30 11:58:24 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=679415
 
- tests/test_overrides.py |   19 +++++++++++++++++++
+ tests/test_overrides.py | 19 +++++++++++++++++++
  1 file changed, 19 insertions(+)
 
 commit aae4e77482c02e21154ab02b159f380f5f0f74be
@@ -1590,14 +3641,14 @@ Date:   Fri Jul 27 23:06:39 2012 +0200
     Also remove _pygi_marshal_cleanup_closure_unref() which is not
     used anywhere.
 
- gi/_gobject/gobjectmodule.c |    4 ++--
- gi/_gobject/pygobject.c     |    2 +-
- gi/pygi-cache.c             |    2 +-
- gi/pygi-foreign-cairo.c     |   24 ++++++++++++------------
- gi/pygi-foreign.c           |    2 +-
- gi/pygi-marshal-cleanup.c   |    9 ---------
- tests/test-unknown.c        |    2 +-
- tests/testhelpermodule.c    |    4 ++--
+ gi/_gobject/gobjectmodule.c |  4 ++--
+ gi/_gobject/pygobject.c     |  2 +-
+ gi/pygi-cache.c             |  2 +-
+ gi/pygi-foreign-cairo.c     | 24 ++++++++++++------------
+ gi/pygi-foreign.c           |  2 +-
+ gi/pygi-marshal-cleanup.c   |  9 ---------
+ tests/test-unknown.c        |  2 +-
+ tests/testhelpermodule.c    |  4 ++--
  8 files changed, 20 insertions(+), 29 deletions(-)
 
 commit 5f88d3017f853c4ff5e9fd89ef39e4569a9b9c16
@@ -1608,8 +3659,8 @@ Date:   Fri Jul 27 23:01:08 2012 +0200
 
     Add missing includes which caused -Wmissing-prototypes warnings.
 
- gi/_gobject/pygenum.c      |    2 ++
- gi/_gobject/pyginterface.c |    2 ++
+ gi/_gobject/pygenum.c      | 2 ++
+ gi/_gobject/pyginterface.c | 2 ++
  2 files changed, 4 insertions(+)
 
 commit 97b5184c6650964ae8a7616353f5ce8e3ca19af3
@@ -1624,7 +3675,7 @@ Date:   Fri Jul 27 22:59:21 2012 +0200
     currently
     breaks on building g-i's regress.c.
 
- configure.ac |    5 +++++
+ configure.ac | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit c2ee8c550199de59dd220561ed028ec6fb8e1daf
@@ -1635,8 +3686,8 @@ Date:   Fri Jul 27 22:08:47 2012 +0200
 
     Add missing includes which caused -Wmissing-prototypes warnings.
 
- gi/_glib/pygiochannel.c |    2 ++
- gi/_glib/pygspawn.c     |    2 ++
+ gi/_glib/pygiochannel.c | 2 ++
+ gi/_glib/pygspawn.c     | 2 ++
  2 files changed, 4 insertions(+)
 
 commit 8bc98fc6665ebab763ee92361929139a0ebe66b5
@@ -1652,7 +3703,7 @@ Date:   Fri Jul 27 20:52:00 2012 +0200
     pygi-info.c:1277:43: warning: pointer of type 'void *' used in
     arithmetic [-Werror=pointer-arith]
 
- gi/pygi-info.c |    4 ++--
+ gi/pygi-info.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit d0a561057b727ebcc1fd06fa6a3b48f2a1f8338e
@@ -1664,7 +3715,7 @@ Date:   Fri Jul 27 20:50:30 2012 +0200
     Drop unused pyglib_gil_state_ensure_py23() and
     pyglib_gil_state_release_py23().
 
- gi/_glib/pyglib.c |   18 ------------------
+ gi/_glib/pyglib.c | 18 ------------------
  1 file changed, 18 deletions(-)
 
 commit a46d165d906d0ac7613f4d946542423e979f39d5
@@ -1681,8 +3732,8 @@ Date:   Fri Jul 20 10:37:04 2012 -0300
     Signed-off-by: Manuel Quiñones <manuq@laptop.org>
     Signed-off-by: Martin Pitt <martinpitt@gnome.org>
 
- gi/overrides/Gtk.py     |    7 +++++++
- tests/test_overrides.py |    6 ++++++
+ gi/overrides/Gtk.py     | 7 +++++++
+ tests/test_overrides.py | 6 ++++++
  2 files changed, 13 insertions(+)
 
 commit 4df676e10a5ea595a0d491af10268f557dd722d7
@@ -1698,17 +3749,17 @@ Date:   Tue Jul 24 13:49:15 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=678192
 
- Makefile.am               |    3 -
- docs/Makefile.am          |    2 -
- examples/Makefile.am      |    3 -
- gi/Makefile.am            |    3 -
- gi/_glib/Makefile.am      |    3 -
- gi/_gobject/Makefile.am   |    2 -
- gi/overrides/Makefile.am  |    2 -
- gi/repository/Makefile.am |    2 -
- git.mk                    |  200
- ---------------------------------------------
- tests/Makefile.am         |    2 -
+ Makefile.am               |   3 -
+ docs/Makefile.am          |   2 -
+ examples/Makefile.am      |   3 -
+ gi/Makefile.am            |   3 -
+ gi/_glib/Makefile.am      |   3 -
+ gi/_gobject/Makefile.am   |   2 -
+ gi/overrides/Makefile.am  |   2 -
+ gi/repository/Makefile.am |   2 -
+ git.mk                    | 200
+ ----------------------------------------------
+ tests/Makefile.am         |   2 -
  10 files changed, 222 deletions(-)
 
 commit 0d729c1534c7f3226b492f549d8f6ad3bb3ac8b7
@@ -1724,8 +3775,8 @@ Date:   Fri Jul 20 19:55:46 2012 -0700
 
     https://bugzilla.gnome.org/show_bug.cgi?id=680353
 
- gi/overrides/Gtk.py     |    5 ++++-
- tests/test_overrides.py |    4 ++++
+ gi/overrides/Gtk.py     | 5 ++++-
+ tests/test_overrides.py | 4 ++++
  2 files changed, 8 insertions(+), 1 deletion(-)
 
 commit affc7faa3fa7250e2e8c2c65e6860906f6fbc4fb
@@ -1743,9 +3794,9 @@ Date:   Fri Jul 20 21:34:33 2012 -0700
 
     https://bugzilla.gnome.org/show_bug.cgi?id=679939
 
- gi/_gobject/propertyhelper.py |  117
- +++++++++++++++++++----------------------
- tests/test_properties.py      |   55 ++++++++++++++-----
+ gi/_gobject/propertyhelper.py | 117
+ +++++++++++++++++++-----------------------
+ tests/test_properties.py      |  55 +++++++++++++++-----
  2 files changed, 96 insertions(+), 76 deletions(-)
 
 commit 6fddba5bc5ea02938677a89ffeb0cfc53229b894
@@ -1758,7 +3809,7 @@ Date:   Thu Jul 19 12:11:34 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=680259
 
- pygi-convert.sh |    1 +
+ pygi-convert.sh | 1 +
  1 file changed, 1 insertion(+)
 
 commit d58c3553062fd8704a81a8233b4a1563a6611718
@@ -1771,7 +3822,7 @@ Date:   Thu Jul 19 12:04:03 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=680257
 
- pygi-convert.sh |    1 +
+ pygi-convert.sh | 1 +
  1 file changed, 1 insertion(+)
 
 commit a3aae2e152c0b955037b7b85e16d14d00881d870
@@ -1792,8 +3843,8 @@ Date:   Thu Jul 19 15:48:20 2012 +0200
 
     Signed-off-by: Martin Pitt <martinpitt@gnome.org>
 
- gi/__init__.py   |   16 ++++++++++++++++
- tests/test_gi.py |   16 ++++++++++++++++
+ gi/__init__.py   | 16 ++++++++++++++++
+ tests/test_gi.py | 16 ++++++++++++++++
  2 files changed, 32 insertions(+)
 
 commit a2d9b71d84f0fcb7aaf5ce483ffee3b3a1ccaca1
@@ -1809,7 +3860,7 @@ Date:   Mon Jul 16 17:14:46 2012 -0300
     Signed-off-by: Manuel Quiñones <manuq@laptop.org>
     Signed-off-by: Martin Pitt <martinpitt@gnome.org>
 
- pygi-convert.sh |    3 +++
+ pygi-convert.sh | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 0b08c01414ac73a4604acd9a846e7af09574929f
@@ -1825,7 +3876,7 @@ Date:   Tue Jul 17 09:05:27 2012 -0300
     Signed-off-by: Manuel Kaufmann <humitos@gmail.com>
     Signed-off-by: Martin Pitt <martinpitt@gnome.org>
 
- pygi-convert.sh |    2 ++
+ pygi-convert.sh | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 975855d0fff7f2042fe1f0e843f96b9a37cc6b79
@@ -1834,7 +3885,7 @@ Date:   Mon Jul 16 17:35:38 2012 +0200
 
     configure.ac: post-release bump to 3.3.5
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 126842b7227fcc1381dc158acdc5a96d0a465515
@@ -1843,7 +3894,7 @@ Date:   Mon Jul 16 17:33:08 2012 +0200
 
     release 3.3.4
 
- NEWS |   28 ++++++++++++++++++++++++++++
+ NEWS | 28 ++++++++++++++++++++++++++++
  1 file changed, 28 insertions(+)
 
 commit 079b73b3eb9083bd53e06d095f9dccc02acf2a6e
@@ -1852,7 +3903,7 @@ Date:   Mon Jul 16 17:29:22 2012 +0200
 
     test_gi: Fix for Python 2
 
- tests/test_gi.py |    7 +++++--
+ tests/test_gi.py | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 commit 30935fe31bfe201bbfdb7734f09fdd2bbaf80e08
@@ -1866,7 +3917,7 @@ Date:   Mon Jul 16 16:35:33 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=679999
 
- pygi-convert.sh |    1 -
+ pygi-convert.sh | 1 -
  1 file changed, 1 deletion(-)
 
 commit c0607d970fc59528ca27d518282cf2871b92e909
@@ -1883,8 +3934,8 @@ Date:   Mon Jul 16 16:00:40 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=679804
 
- gi/module.py     |    3 ++-
- tests/test_gi.py |   15 +++++++++++++++
+ gi/module.py     |  3 ++-
+ tests/test_gi.py | 15 +++++++++++++++
  2 files changed, 17 insertions(+), 1 deletion(-)
 
 commit 3235f1a397c334de5a7570f5ceed4da709fe1714
@@ -1903,8 +3954,8 @@ Date:   Mon Jul 16 15:53:31 2012 +0200
 
     Prerequisite for https://bugzilla.gnome.org/show_bug.cgi?id=679804
 
- gi/module.py     |    7 +++++--
- tests/test_gi.py |   14 ++++++++++++++
+ gi/module.py     |  7 +++++--
+ tests/test_gi.py | 14 ++++++++++++++
  2 files changed, 19 insertions(+), 2 deletions(-)
 
 commit f6cc039e014448a553d626aac4020ee69717edab
@@ -1917,8 +3968,8 @@ Date:   Mon Jul 16 15:38:05 2012 +0200
     need to decode
     it to get a proper __path__ attribute.
 
- gi/module.py     |   17 +++++++++++++++++
- tests/test_gi.py |   10 ++++++++++
+ gi/module.py     | 17 +++++++++++++++++
+ tests/test_gi.py | 10 ++++++++++
  2 files changed, 27 insertions(+)
 
 commit 858048f7cec78129aa914e2341ab80aac0e95cc5
@@ -1929,7 +3980,7 @@ Date:   Mon Jul 16 15:02:10 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=680004
 
- pygi-convert.sh |    2 +-
+ pygi-convert.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a31fabdc12f1da301c8df0af319ca3f4181671ee
@@ -1957,14 +4008,14 @@ Date:   Thu Jul 12 09:19:42 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=667244
 
- gi/pygi-argument.c       |  156
- ++++++++++++++++++++++++++++++++--------------
- gi/pygi-argument.h       |    4 +-
- gi/pygi-closure.c        |   11 ++++
- gi/pygi-info.c           |   20 ++++--
- gi/pygi-property.c       |    1 +
- gi/pygi-signal-closure.c |   14 ++++-
- tests/test_gi.py         |   18 ++++++
+ gi/pygi-argument.c       | 156
+ ++++++++++++++++++++++++++++++++---------------
+ gi/pygi-argument.h       |   4 +-
+ gi/pygi-closure.c        |  11 ++++
+ gi/pygi-info.c           |  20 ++++--
+ gi/pygi-property.c       |   1 +
+ gi/pygi-signal-closure.c |  14 ++++-
+ tests/test_gi.py         |  18 ++++++
  7 files changed, 167 insertions(+), 57 deletions(-)
 
 commit bb80d124269ee2389c04d03a478475868fd9ff7b
@@ -1977,7 +4028,7 @@ Date:   Wed Jul 11 22:05:41 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=679775
 
- pygi-convert.sh |    3 +++
+ pygi-convert.sh | 3 +++
  1 file changed, 3 insertions(+)
 
 commit e3a63eefa5fb2abeabd210790e12642e577363c8
@@ -1990,7 +4041,7 @@ Date:   Wed Jul 11 13:18:16 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=679760
 
- pygi-convert.sh |    5 +++++
+ pygi-convert.sh | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit b4bef457c2d0ca6899e06a021f1f06252a37e326
@@ -2005,7 +4056,7 @@ Date:   Wed Jul 11 08:21:27 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=678914
 
- gi/pygi-cache.c |    2 ++
+ gi/pygi-cache.c | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 41287d8a439c656e4ac60361fddec643c713234c
@@ -2019,7 +4070,7 @@ Date:   Wed Jul 11 11:13:38 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=679754
 
- pygi-convert.sh |    6 ++++++
+ pygi-convert.sh | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit 5403149b900d1b73cbc78767dc43be2eb344c836
@@ -2035,11 +4086,11 @@ Date:   Tue Jul 10 19:07:32 2012 -0700
 
     Signed-off-by: Martin Pitt <martinpitt@gnome.org>
 
- gi/_glib/glibmodule.c       |   10 ++++++--
- gi/_gobject/gobjectmodule.c |   17 ++++++++++----
- gi/_gobject/pygobject.c     |   53
- +++++++++++++++++++++++++++++--------------
- gi/pygi-marshal-from-py.c   |    9 +++++---
+ gi/_glib/glibmodule.c       | 10 +++++++--
+ gi/_gobject/gobjectmodule.c | 17 ++++++++++-----
+ gi/_gobject/pygobject.c     | 53
+ ++++++++++++++++++++++++++++++---------------
+ gi/pygi-marshal-from-py.c   |  9 +++++---
  4 files changed, 62 insertions(+), 27 deletions(-)
 
 commit 0ddfecf3bf0a5d7893cd02cff41503d810ef6ce8
@@ -2052,8 +4103,8 @@ Date:   Wed Jul 4 08:46:30 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=679199
 
- gi/overrides/Gtk.py     |    3 +++
- tests/test_overrides.py |    4 ++++
+ gi/overrides/Gtk.py     | 3 +++
+ tests/test_overrides.py | 4 ++++
  2 files changed, 7 insertions(+)
 
 commit e1e849d1a9af77c29ee35971db8d439bac60d573
@@ -2070,8 +4121,8 @@ Date:   Wed Jul 4 08:35:16 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=679336
 
- gi/overrides/GLib.py    |    6 +++++-
- tests/test_overrides.py |    5 +++++
+ gi/overrides/GLib.py    | 6 +++++-
+ tests/test_overrides.py | 5 +++++
  2 files changed, 10 insertions(+), 1 deletion(-)
 
 commit af20d7c929b9c1888454b52932a308d346e1c12b
@@ -2082,7 +4133,7 @@ Date:   Thu Jun 28 06:51:22 2012 +0200
 
     Thanks to Dieter Verfaillie for pointing  this out.
 
- m4/python.m4 |    3 +--
+ m4/python.m4 | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit a96a26234e2aaa157837d26094864e3ad9b63edf
@@ -2101,7 +4152,7 @@ Date:   Mon Jun 25 09:05:59 2012 -0700
 
     Signed-off-by: Martin Pitt <martinpitt@gnome.org>
 
- gi/overrides/Gtk.py |    5 ++++-
+ gi/overrides/Gtk.py | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit afa12faf339efb4f7780168e884ecf49b630644a
@@ -2110,7 +4161,7 @@ Date:   Mon Jun 25 16:36:31 2012 +0200
 
     configure.ac: Post-release bump to 3.3.4.
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 198066effc0ca44ccb897e9f0738ab627e8b3275
@@ -2119,8 +4170,8 @@ Date:   Mon Jun 25 16:35:49 2012 +0200
 
     release 3.3.3.1
 
- NEWS         |    3 +++
- configure.ac |    2 +-
+ NEWS         | 3 +++
+ configure.ac | 2 +-
  2 files changed, 4 insertions(+), 1 deletion(-)
 
 commit cb70ae0aa52ab7624b2b8c30297d8a52a7db7f44
@@ -2133,9 +4184,9 @@ Date:   Mon Jun 25 16:32:45 2012 +0200
     keywords. This broke
     existing API such as Gtk.ShadowType.IN.
 
- gi/module.py     |    2 +-
- gi/pygi-info.c   |    7 +++++++
- tests/test_gi.py |    3 +++
+ gi/module.py     | 2 +-
+ gi/pygi-info.c   | 7 +++++++
+ tests/test_gi.py | 3 +++
  3 files changed, 11 insertions(+), 1 deletion(-)
 
 commit f2524a982b0b8ba7cdbb77003372416af0b7a978
@@ -2144,7 +4195,7 @@ Date:   Mon Jun 25 15:39:50 2012 +0200
 
     configure.ac: Post-release version bump to 3.3.4
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit fe56faa346c8e8f9fd5915602424778d458a776d
@@ -2153,7 +4204,7 @@ Date:   Mon Jun 25 15:36:37 2012 +0200
 
     release 3.3.3
 
- NEWS |   15 +++++++++++++++
+ NEWS | 15 +++++++++++++++
  1 file changed, 15 insertions(+)
 
 commit 299a2fd726f0aceaf67b1cec7a0ef8b21ff7bcbc
@@ -2164,7 +4215,7 @@ Date:   Mon Jun 25 15:35:19 2012 +0200
 
     This is being used by "make dist".
 
- Makefile.am |   15 +++++++++++++++
+ Makefile.am | 15 +++++++++++++++
  1 file changed, 15 insertions(+)
 
 commit 760118e4ed73de2f022706ef897fcc848e90c005
@@ -2173,7 +4224,7 @@ Date:   Mon Jun 25 15:31:14 2012 +0200
 
     Remove obsolete ChangeLog and release-tag make targets
 
- Makefile.am |   23 -----------------------
+ Makefile.am | 23 -----------------------
  1 file changed, 23 deletions(-)
 
 commit e92278692bb51679d6e957c2ac36db64498a7c73
@@ -2196,7 +4247,7 @@ Date:   Fri Jun 15 16:11:21 2012 +0200
     Signed-off-by: Benjamin Berg <benzea@sugarlabs.org>
     Signed-off-by: Martin Pitt <martinpitt@gnome.org>
 
- gi/_gobject/pygobject.c |   27 ++++++++++++++++++++++-----
+ gi/_gobject/pygobject.c | 27 ++++++++++++++++++++++-----
  1 file changed, 22 insertions(+), 5 deletions(-)
 
 commit de4aa426002eeb09a060f8fd70bd6cb25a17766a
@@ -2213,8 +4264,8 @@ Date:   Mon Jun 25 15:06:47 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=678510
 
- gi/overrides/Gtk.py     |    8 +++++++-
- tests/test_overrides.py |   36 ++++++++++++++++++++++++++++++++++++
+ gi/overrides/Gtk.py     |  8 +++++++-
+ tests/test_overrides.py | 36 ++++++++++++++++++++++++++++++++++++
  2 files changed, 43 insertions(+), 1 deletion(-)
 
 commit 16280d6985f2cf4db9cf062e857650e620fd9da8
@@ -2241,8 +4292,8 @@ Date:   Mon Jun 25 09:40:38 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=676746
 
- gi/pygi-info.c   |   38 +++++++++++++++++++++++++++++++++++++-
- tests/test_gi.py |   17 +++++++++++++++++
+ gi/pygi-info.c   | 38 +++++++++++++++++++++++++++++++++++++-
+ tests/test_gi.py | 17 +++++++++++++++++
  2 files changed, 54 insertions(+), 1 deletion(-)
 
 commit 3864d7a3b7def035ee2daf22ba717371c8d261de
@@ -2259,7 +4310,7 @@ Date:   Fri Jun 22 13:13:37 2012 +0200
     line that
     contains the opening bracket.
 
- tests/Makefile.am |    2 +-
+ tests/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit fb436dd6d3b40b3f2a8ba6f402e2987752ad1902
@@ -2270,34 +4321,34 @@ Date:   Fri Jun 22 13:08:34 2012 +0200
 
     Spotted by current pep8 checker.
 
- demos/gtk-demo/demos/Entry/entry_buffer.py     |    6 +--
- demos/gtk-demo/demos/Entry/entry_completion.py |    6 +--
- demos/gtk-demo/demos/Entry/search_entry.py     |    4 +-
- demos/gtk-demo/demos/appwindow.py              |    2 +-
- demos/gtk-demo/demos/clipboard.py              |    8 +--
- demos/gtk-demo/demos/colorselector.py          |    6 +--
- demos/gtk-demo/demos/rotatedtext.py            |    8 +--
- demos/gtk-demo/gtk-demo.py                     |    6 +--
- examples/option.py                             |   29 +++++-----
- examples/signal.py                             |    3 +-
- gi/_glib/option.py                             |    6 +--
- gi/_gobject/propertyhelper.py                  |   18 +++----
- gi/module.py                                   |   14 ++---
- gi/overrides/GLib.py                           |    2 +-
- gi/overrides/Gio.py                            |   11 ++--
- gi/overrides/Gtk.py                            |   16 +++---
- gi/pygtkcompat.py                              |    7 ++-
- gi/types.py                                    |   17 +++---
- tests/runtests.py                              |    2 +-
- tests/test_gdbus.py                            |   55 ++++++++++---------
- tests/test_gi.py                               |   15 +++---
- tests/test_gobject.py                          |   18 +++----
- tests/test_option.py                           |   26 ++++-----
- tests/test_overrides.py                        |   67
- ++++++++++++------------
- tests/test_properties.py                       |   30 +++++------
- tests/test_signal.py                           |    2 +-
- tests/test_uris.py                             |    9 ++--
+ demos/gtk-demo/demos/Entry/entry_buffer.py     |  6 +--
+ demos/gtk-demo/demos/Entry/entry_completion.py |  6 +--
+ demos/gtk-demo/demos/Entry/search_entry.py     |  4 +-
+ demos/gtk-demo/demos/appwindow.py              |  2 +-
+ demos/gtk-demo/demos/clipboard.py              |  8 +--
+ demos/gtk-demo/demos/colorselector.py          |  6 +--
+ demos/gtk-demo/demos/rotatedtext.py            |  8 +--
+ demos/gtk-demo/gtk-demo.py                     |  6 +--
+ examples/option.py                             | 29 ++++++-----
+ examples/signal.py                             |  3 +-
+ gi/_glib/option.py                             |  6 +--
+ gi/_gobject/propertyhelper.py                  | 18 +++----
+ gi/module.py                                   | 14 +++---
+ gi/overrides/GLib.py                           |  2 +-
+ gi/overrides/Gio.py                            | 11 +++--
+ gi/overrides/Gtk.py                            | 16 +++---
+ gi/pygtkcompat.py                              |  7 ++-
+ gi/types.py                                    | 17 ++++---
+ tests/runtests.py                              |  2 +-
+ tests/test_gdbus.py                            | 55 +++++++++++----------
+ tests/test_gi.py                               | 15 +++---
+ tests/test_gobject.py                          | 18 +++----
+ tests/test_option.py                           | 26 +++++-----
+ tests/test_overrides.py                        | 67
+ +++++++++++++-------------
+ tests/test_properties.py                       | 30 ++++++------
+ tests/test_signal.py                           |  2 +-
+ tests/test_uris.py                             |  9 ++--
  27 files changed, 200 insertions(+), 193 deletions(-)
 
 commit 129462ccc4a2191ecbb42247030c91bd0f1454f6
@@ -2308,8 +4359,8 @@ Date:   Fri Jun 22 12:36:54 2012 +0200
 
     Spotted by current pep8 checker.
 
- gi/overrides/GLib.py     |    2 +-
- gi/overrides/__init__.py |    2 +-
+ gi/overrides/GLib.py     | 2 +-
+ gi/overrides/__init__.py | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 50e45a624e6301e65c150e137aad6d092f203f3f
@@ -2320,11 +4371,11 @@ Date:   Fri Jun 22 12:30:10 2012 +0200
 
     Spotted by current pep8 checker.
 
- demos/gtk-demo/demos/Entry/search_entry.py |    6 +++---
- gi/__init__.py                             |    6 +++---
- gi/_gobject/__init__.py                    |    6 ++----
- gi/module.py                               |    6 +++---
- tests/test_overrides.py                    |   11 +++--------
+ demos/gtk-demo/demos/Entry/search_entry.py |  6 +++---
+ gi/__init__.py                             |  6 +++---
+ gi/_gobject/__init__.py                    |  6 ++----
+ gi/module.py                               |  6 +++---
+ tests/test_overrides.py                    | 11 +++--------
  5 files changed, 14 insertions(+), 21 deletions(-)
 
 commit ef06548b0dc6aee0e8ab208a78966dc1d5d917ee
@@ -2335,13 +4386,13 @@ Date:   Fri Jun 22 12:24:32 2012 +0200
 
     Spotted by current pep8 checker.
 
- demos/gtk-demo/demos/clipboard.py   |    4 ++--
- demos/gtk-demo/demos/drawingarea.py |    4 ++--
- demos/gtk-demo/gtk-demo.py          |    8 ++++----
- gi/overrides/Gdk.py                 |    2 +-
- gi/overrides/Gtk.py                 |    2 +-
- tests/test_gi.py                    |    4 ++--
- tests/test_overrides.py             |    3 +--
+ demos/gtk-demo/demos/clipboard.py   | 4 ++--
+ demos/gtk-demo/demos/drawingarea.py | 4 ++--
+ demos/gtk-demo/gtk-demo.py          | 8 ++++----
+ gi/overrides/Gdk.py                 | 2 +-
+ gi/overrides/Gtk.py                 | 2 +-
+ tests/test_gi.py                    | 4 ++--
+ tests/test_overrides.py             | 3 +--
  7 files changed, 13 insertions(+), 14 deletions(-)
 
 commit 379c1474a071292a1e8da413af2f5438cff09fc8
@@ -2354,9 +4405,9 @@ Date:   Wed Jun 20 12:23:12 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=678119
 
- gi/_glib/glibmodule.c |   10 ++++++++--
- tests/Makefile.am     |    1 +
- tests/test_glib.py    |   15 +++++++++++++++
+ gi/_glib/glibmodule.c | 10 ++++++++--
+ tests/Makefile.am     |  1 +
+ tests/test_glib.py    | 15 +++++++++++++++
  3 files changed, 24 insertions(+), 2 deletions(-)
 
 commit 73531fd7820bd1922347bd856298d68205a27877
@@ -2373,8 +4424,7 @@ Date:   Wed Jun 20 11:16:39 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=641944
 
- gi/_gobject/pygobject.c |   44
- ++++++++++++++++++++++++++++++++++++++++++++
+ gi/_gobject/pygobject.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 44 insertions(+)
 
 commit a0daa843801658929ffee5bcb9eb67d955dc7921
@@ -2387,8 +4437,8 @@ Date:   Mon Jun 18 15:09:34 2012 +0200
 
     Signed-off-by: Martin Pitt <martinpitt@gnome.org>
 
- gi/overrides/GLib.py    |    4 ++--
- tests/test_overrides.py |    1 +
+ gi/overrides/GLib.py    | 4 ++--
+ tests/test_overrides.py | 1 +
  2 files changed, 3 insertions(+), 2 deletions(-)
 
 commit fb39ba934180e1e48fd15774e69d1cecf47a4c84
@@ -2397,7 +4447,7 @@ Date:   Tue Jun 5 19:11:38 2012 +0200
 
     configure.ac: Post-release bump to 3.3.3
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 7f0995e7fa865ebde7490d0570a7135a2f962cdf
@@ -2406,7 +4456,7 @@ Date:   Tue Jun 5 19:09:12 2012 +0200
 
     Release 3.3.2
 
- NEWS |   44 ++++++++++++++++++++++++++++++++++++++++++++
+ NEWS | 44 ++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 44 insertions(+)
 
 commit 8209c1ae1632c77768699481e574d5d378956e71
@@ -2417,7 +4467,7 @@ Date:   Tue Jun 5 19:04:49 2012 +0200
 
     Actually list changes since the previous release, not since 3.1.92.
 
- Makefile.am |    2 +-
+ Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit b21f66d2a399b8c9a36a1758107b7bdff0ec8eaa
@@ -2438,9 +4488,9 @@ Date:   Wed May 9 19:04:01 2012 +0200
 
     Signed-off-by: Martin Pitt <martinpitt@gnome.org>
 
- gi/pygi-foreign-cairo.c  |   85
- ++++++++++++++++++++++++++++++++++++++++++++++
- tests/test_everything.py |    8 +++++
+ gi/pygi-foreign-cairo.c  | 85
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ tests/test_everything.py |  8 +++++
  2 files changed, 93 insertions(+)
 
 commit 635a7d1b48d99ddd1ea123797c493b18b0cdfd45
@@ -2465,8 +4515,8 @@ Date:   Wed May 23 01:51:46 2012 +0200
     Co-authored-by: Martin Pitt <martinpitt@gnome.org>
     Signed-off-by: Martin Pitt <martinpitt@gnome.org>
 
- gi/pygi-argument.c |   10 +++++++---
- tests/test_gi.py   |   19 +++++++++++++++++++
+ gi/pygi-argument.c | 10 +++++++---
+ tests/test_gi.py   | 19 +++++++++++++++++++
  2 files changed, 26 insertions(+), 3 deletions(-)
 
 commit 2305dcd7e8841f87dc2fc683390df78453a5dc2a
@@ -2482,7 +4532,7 @@ Date:   Sat May 12 14:08:51 2012 +0200
 
     Signed-off-by: Martin Pitt <martinpitt@gnome.org>
 
- gi/overrides/Gtk.py |    9 +++++++++
+ gi/overrides/Gtk.py | 9 +++++++++
  1 file changed, 9 insertions(+)
 
 commit 5501fba534696974899f2591929bff9e1b6ecd65
@@ -2498,8 +4548,8 @@ Date:   Sat May 12 13:50:02 2012 +0200
 
     Signed-off-by: Martin Pitt <martinpitt@gnome.org>
 
- gi/_gobject/__init__.py  |    1 +
- gi/_gobject/constants.py |    1 +
+ gi/_gobject/__init__.py  | 1 +
+ gi/_gobject/constants.py | 1 +
  2 files changed, 2 insertions(+)
 
 commit 4c51a5411092f8ab6f8f6e9692a9b49692f621a7
@@ -2516,8 +4566,8 @@ Date:   Fri Jun 1 02:53:13 2012 -0400
 
     Signed-off-by: Martin Pitt <martinpitt@gnome.org>
 
- gi/_gobject/pygboxed.c   |    3 ++-
- tests/test_everything.py |    8 ++++++++
+ gi/_gobject/pygboxed.c   | 3 ++-
+ tests/test_everything.py | 8 ++++++++
  2 files changed, 10 insertions(+), 1 deletion(-)
 
 commit dc8eef26906753fcb3ce057b23ca110137897fa5
@@ -2532,7 +4582,7 @@ Date:   Fri Jun 1 13:43:38 2012 +0200
 
     Signed-off-by: Martin Pitt <martinpitt@gnome.org>
 
- tests/test_properties.py |    4 ++--
+ tests/test_properties.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 853e6a71234ebd66af5a64dfb296e323c2c905a6
@@ -2549,8 +4599,8 @@ Date:   Thu May 17 17:09:15 2012 +0200
 
     Signed-off-by: Martin Pitt <martinpitt@gnome.org>
 
- gi/pygi-closure.c |   17 +++++++++++++++++
- tests/test_gi.py  |    5 +++++
+ gi/pygi-closure.c | 17 +++++++++++++++++
+ tests/test_gi.py  |  5 +++++
  2 files changed, 22 insertions(+)
 
 commit bac9d526f6a9774821d1c9c0e7b35cc6db942975
@@ -2559,7 +4609,7 @@ Date:   Fri Jun 1 12:28:53 2012 +0200
 
     tests: Add more vfunc checks for GIMarshallingTestsObject
 
- tests/test_gi.py |   25 +++++++++++++++++++++++++
+ tests/test_gi.py | 25 +++++++++++++++++++++++++
  1 file changed, 25 insertions(+)
 
 commit e1aaf4a48453be0e69e7f3a70a2e7a790871a4d2
@@ -2571,7 +4621,7 @@ Date:   Fri Jun 1 12:02:55 2012 +0200
     This came up as a side issue in
     https://bugzilla.gnome.org/show_bug.cgi?id=653151
 
- tests/test_gi.py |    3 +++
+ tests/test_gi.py | 3 +++
  1 file changed, 3 insertions(+)
 
 commit edc17e703e1a05e20545d3df9167ceb076450443
@@ -2588,9 +4638,9 @@ Date:   Wed May 16 11:13:05 2012 +0200
 
     Signed-off-by: Martin Pitt <martinpitt@gnome.org>
 
- gi/_gobject/pygobject.c |  130
- ++++++++++++++++++++++++++++++++++++++++++++---
- tests/test_gobject.py   |   59 +++++++++++++++++++++
+ gi/_gobject/pygobject.c | 130
+ +++++++++++++++++++++++++++++++++++++++++++++---
+ tests/test_gobject.py   |  59 ++++++++++++++++++++++
  2 files changed, 181 insertions(+), 8 deletions(-)
 
 commit 07a08b49aae83a297e2f91240448314e4663f724
@@ -2607,8 +4657,8 @@ Date:   Mon May 14 15:31:14 2012 +0200
 
     Co-Authored-by: Martin Pitt <martinpitt@gnome.org>
 
- gi/types.py      |    6 +++---
- tests/test_gi.py |   27 +++++++++++++++++++++++++++
+ gi/types.py      |  6 +++---
+ tests/test_gi.py | 27 +++++++++++++++++++++++++++
  2 files changed, 30 insertions(+), 3 deletions(-)
 
 commit b965ee15bac6cd28d16d32205d96d2b1bdd3f0e1
@@ -2619,7 +4669,7 @@ Date:   Fri Jun 1 08:18:40 2012 +0200
 
     The pep8 check failed on this.
 
- tests/test_properties.py |    2 +-
+ tests/test_properties.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 274d60a7c08d74a299f4b83d8054c00eadb4bdbd
@@ -2634,8 +4684,8 @@ Date:   Wed May 30 16:45:53 2012 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=677124
 
- gi/pygi-cache.c  |   13 ++++---------
- tests/test_gi.py |    3 +++
+ gi/pygi-cache.c  | 13 ++++---------
+ tests/test_gi.py |  3 +++
  2 files changed, 7 insertions(+), 9 deletions(-)
 
 commit 62c2e962a225ec2527aa3d7406aa0dae232a0886
@@ -2646,7 +4696,7 @@ Date:   Fri May 25 17:09:55 2012 -0400
 
     libregress now needs cairo-gobject
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 9477f0f2f17a6d9b97e5ee08378bc009b8d4c30a
@@ -2655,7 +4705,7 @@ Date:   Mon May 14 15:48:34 2012 +0200
 
     Fix comment in previous commit
 
- tests/test_gobject.py |    2 +-
+ tests/test_gobject.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 6610428394d0c65987de5021bf2c38641cdb7116
@@ -2687,9 +4737,9 @@ Date:   Tue May 8 20:04:09 2012 -0700
 
     Signed-off-by: Martin Pitt <martinpitt@gnome.org>
 
- gi/_gobject/pygobject.c |  104
- ++++++++++++++++++++++++++++++++++++++++++++++-
- tests/test_gobject.py   |   90 ++++++++++++++++++++++++++++++++++++++++
+ gi/_gobject/pygobject.c | 104
+ +++++++++++++++++++++++++++++++++++++++++++++++-
+ tests/test_gobject.py   |  90 +++++++++++++++++++++++++++++++++++++++++
  2 files changed, 193 insertions(+), 1 deletion(-)
 
 commit 88babe7377402f6e6f912a8b83615aab848eae81
@@ -2702,8 +4752,8 @@ Date:   Fri May 11 19:08:47 2012 -0300
 
     Signed-off-by: Martin Pitt <martinpitt@gnome.org>
 
- gi/pygtkcompat.py         |    5 ++---
- tests/test_pygtkcompat.py |    1 +
+ gi/pygtkcompat.py         | 5 ++---
+ tests/test_pygtkcompat.py | 1 +
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 commit 3f712b56397296bca2f5358cd52977b1a2011964
@@ -2716,8 +4766,8 @@ Date:   Fri May 11 12:39:05 2012 -0300
 
     Signed-off-by: Martin Pitt <martinpitt@gnome.org>
 
- gi/overrides/Gtk.py     |   16 ++++++++++++----
- tests/test_overrides.py |    9 +++++++++
+ gi/overrides/Gtk.py     | 16 ++++++++++++----
+ tests/test_overrides.py |  9 +++++++++
  2 files changed, 21 insertions(+), 4 deletions(-)
 
 commit 9a1a07742ec0b1821d469603f9996a2b7d832f40
@@ -2733,10 +4783,9 @@ Date:   Sun May 6 18:10:39 2012 -0700
 
     Signed-off-by: Martin Pitt <martinpitt@gnome.org>
 
- gi/overrides/Gdk.py     |   44
- ++++++++++++++++++++++++++++++++++++++++++++
- tests/Makefile.am       |    2 +-
- tests/test_overrides.py |   17 +++++++++++++++++
+ gi/overrides/Gdk.py     | 44 ++++++++++++++++++++++++++++++++++++++++++++
+ tests/Makefile.am       |  2 +-
+ tests/test_overrides.py | 17 +++++++++++++++++
  3 files changed, 62 insertions(+), 1 deletion(-)
 
 commit d9608c332d9592f03545b110cfac8105453ea035
@@ -2755,9 +4804,9 @@ Date:   Sat May 5 12:42:42 2012 -0700
 
     https://bugzilla.gnome.org/show_bug.cgi?id=656554
 
- gi/_gobject/pygtype.c    |   47
- ++++++++++++++++++++++++++++++++++++++++++++--
- tests/test_everything.py |   16 ++++++++++++----
+ gi/_gobject/pygtype.c    | 47
+ +++++++++++++++++++++++++++++++++++++++++++++--
+ tests/test_everything.py | 16 ++++++++++++----
  2 files changed, 57 insertions(+), 6 deletions(-)
 
 commit e7a909c16dc1c625ab11e270f23d540f15c71767
@@ -2766,7 +4815,7 @@ Date:   Mon May 7 10:33:40 2012 -0300
 
     Require gobject-introspection 1.33.0
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 9e8239684433631e0d1650d25416e4d7bf92a058
@@ -2775,7 +4824,7 @@ Date:   Sun May 6 18:28:23 2012 -0700
 
     NEWS: Add API additions since 3.2.0
 
- NEWS |    7 ++++---
+ NEWS | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 commit d1a2bf51eb25b54028fbf496d20dfad9546bcb5e
@@ -2784,7 +4833,7 @@ Date:   Sun May 6 18:25:23 2012 -0700
 
     NEWS: Mark API changes since 3.2.0
 
- NEWS |    6 +++---
+ NEWS | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit a3329539291bd8ea9aa6cb184a05ea7c21f8885a
@@ -2797,7 +4846,7 @@ Date:   Sun May 6 18:19:35 2012 -0700
     string check
     to work with both Python 2 and 3.
 
- gi/pygi-argument.c |   42 +++++++++---------------------------------
+ gi/pygi-argument.c | 42 +++++++++---------------------------------
  1 file changed, 9 insertions(+), 33 deletions(-)
 
 commit 42c717ed77613e02f3c8ef2685bc071462b87d73
@@ -2808,7 +4857,7 @@ Date:   Sun May 6 18:08:57 2012 -0700
 
     Was missing a space around operator, causing the PEP8 check to fail.
 
- gi/pygtkcompat.py |    2 +-
+ gi/pygtkcompat.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 168a08753cec1ff77ccca5d81b9a5fd2af5d3720
@@ -2823,9 +4872,9 @@ Date:   Sun May 6 18:02:04 2012 -0700
     will now raise
     a proper TypeError.
 
- gi/pygi-argument.c |   39 +++++++++++++++++++++++++++++++++++++++
- gi/pygi-property.c |    3 +++
- tests/test_gi.py   |   40 ++++++++++++++++++++++++++++++++++++++++
+ gi/pygi-argument.c | 39 +++++++++++++++++++++++++++++++++++++++
+ gi/pygi-property.c |  3 +++
+ tests/test_gi.py   | 40 ++++++++++++++++++++++++++++++++++++++++
  3 files changed, 82 insertions(+)
 
 commit 5948b62ba3e08ea943e6965ee38c94c363186226
@@ -2840,7 +4889,7 @@ Date:   Sun May 6 17:59:57 2012 -0700
     object from
     that, so we need to scale to 0..65535 and round to int.
 
- gi/pygtkcompat.py |    6 +++---
+ gi/pygtkcompat.py | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 6af74c501bc604559f8b5b4e0d856d022ed882bb
@@ -2849,7 +4898,7 @@ Date:   Sun May 6 06:02:31 2012 -0700
 
     test_gi: Check setting properties in constructor
 
- tests/test_gi.py |   33 +++++++++++++++++++++++++++++++++
+ tests/test_gi.py | 33 +++++++++++++++++++++++++++++++++
  1 file changed, 33 insertions(+)
 
 commit 9f50fd214e4214f83959b2883a0c667f7f157c97
@@ -2858,8 +4907,8 @@ Date:   Sun May 6 05:50:00 2012 -0700
 
     Support getting and setting GStrv properties
 
- gi/pygi-property.c |   36 ++++++++++++++++++++++++++++++++++++
- tests/test_gi.py   |   11 +++++++++++
+ gi/pygi-property.c | 36 ++++++++++++++++++++++++++++++++++++
+ tests/test_gi.py   | 11 +++++++++++
  2 files changed, 47 insertions(+)
 
 commit 8321af2c7df499291e664c676376f149a0c3dcac
@@ -2868,9 +4917,9 @@ Date:   Sat May 5 13:58:29 2012 -0700
 
     Support defining GStrv properties from Python
 
- gi/_gobject/propertyhelper.py |   10 +++++--
- tests/test_properties.py      |   58
- +++++++++++++++++++++++++++++++++++++++--
+ gi/_gobject/propertyhelper.py | 10 ++++++--
+ tests/test_properties.py      | 58
+ +++++++++++++++++++++++++++++++++++++++++--
  2 files changed, 64 insertions(+), 4 deletions(-)
 
 commit f2494526e1c579c41babfe7ff67deef0f6966adf
@@ -2879,10 +4928,10 @@ Date:   Sat May 5 13:21:20 2012 -0700
 
     Add GObject.TYPE_STRV constant
 
- gi/_gobject/__init__.py  |    1 +
- gi/_gobject/constants.py |    1 +
- tests/test_everything.py |    2 +-
- tests/test_signal.py     |    2 +-
+ gi/_gobject/__init__.py  | 1 +
+ gi/_gobject/constants.py | 1 +
+ tests/test_everything.py | 2 +-
+ tests/test_signal.py     | 2 +-
  4 files changed, 4 insertions(+), 2 deletions(-)
 
 commit 8c7306e4d6355ca45f8f1b4adf7d0595b4e8bcf8
@@ -2893,7 +4942,7 @@ Date:   Sat May 5 09:28:36 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=675472
 
- gi/overrides/GLib.py |    3 +++
+ gi/overrides/GLib.py | 3 +++
  1 file changed, 3 insertions(+)
 
 commit d6c091d87c86c8ccc7cb54347fbceccedac61633
@@ -2909,7 +4958,7 @@ Date:   Sat May 5 09:23:55 2012 +0200
     Actually do what they mean to do now and call the corresponding
     GIMarshallingTests methods.
 
- tests/test_gi.py |    4 ++--
+ tests/test_gi.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit fda8a069d503e63c76a6b1ba285a181822549059
@@ -2922,8 +4971,8 @@ Date:   Sat May 5 08:52:41 2012 +0200
 
     Signed-off-by: Martin Pitt <martinpitt@gnome.org>
 
- gi/pygtkcompat.py         |   20 ++++++++++++++++++++
- tests/test_pygtkcompat.py |    8 ++++++++
+ gi/pygtkcompat.py         | 20 ++++++++++++++++++++
+ tests/test_pygtkcompat.py |  8 ++++++++
  2 files changed, 28 insertions(+)
 
 commit 2b49c5f58bb841de7a9077eeeaf996eb9851dab3
@@ -2936,7 +4985,7 @@ Date:   Mon Apr 30 13:44:19 2012 -0300
 
     Signed-off-by: Martin Pitt <martinpitt@gnome.org>
 
- gi/pygtkcompat.py |   14 ++++++++++++++
+ gi/pygtkcompat.py | 14 ++++++++++++++
  1 file changed, 14 insertions(+)
 
 commit 16fbb17a9fd17eeb9f886af99e89a214d328dae1
@@ -2954,8 +5003,8 @@ Date:   Thu May 3 12:25:04 2012 +0200
     byte array
     instead.
 
- tests/test_gi.py        |    2 +-
- tests/test_overrides.py |    2 +-
+ tests/test_gi.py        | 2 +-
+ tests/test_overrides.py | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit fd7f8eefbe8aba0b29d80e3eb9d985d33a268c8a
@@ -2973,9 +5022,9 @@ Date:   Thu May 3 09:38:56 2012 +0200
     Python
     module, which we do not have when building without cairo support.
 
- configure.ac             |    3 +++
- tests/Makefile.am        |    4 ++--
- tests/test_everything.py |    8 +++++++-
+ configure.ac             | 3 +++
+ tests/Makefile.am        | 4 ++--
+ tests/test_everything.py | 8 +++++++-
  3 files changed, 12 insertions(+), 3 deletions(-)
 
 commit 1c5634e6d98c8b67b37a2747951c66f5d8f1907d
@@ -2987,9 +5036,9 @@ Date:   Thu May 3 09:28:51 2012 +0200
     assertAlmostEquals → assertAlmostEqual
     assertNotEquals → assertNotEqual
 
- tests/test_everything.py |    4 ++--
- tests/test_gi.py         |   12 ++++++------
- tests/test_overrides.py  |   10 +++++-----
+ tests/test_everything.py |  4 ++--
+ tests/test_gi.py         | 12 ++++++------
+ tests/test_overrides.py  | 10 +++++-----
  3 files changed, 13 insertions(+), 13 deletions(-)
 
 commit 07f312e66c07357168098d3f96813d2c997e8dc7
@@ -3003,7 +5052,7 @@ Date:   Wed May 2 12:08:19 2012 +0200
     a few edge
     cases.
 
- tests/Makefile.am |    1 +
+ tests/Makefile.am | 1 +
  1 file changed, 1 insertion(+)
 
 commit b0740d386c2cbbd153878209b584b568968e4d98
@@ -3012,7 +5061,7 @@ Date:   Mon Apr 30 16:26:57 2012 +0200
 
     configure.ac: Post-release bump to 3.3.2
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d3977266faadacd3d05705497c1cf51a01a6606f
@@ -3021,7 +5070,7 @@ Date:   Mon Apr 30 16:08:09 2012 +0200
 
     Release 3.3.1
 
- NEWS |   66
+ NEWS | 66
  ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 66 insertions(+)
 
@@ -3040,7 +5089,7 @@ Date:   Sun Apr 29 23:55:15 2012 +0200
 
     Signed-off-by: Martin Pitt <martinpitt@gnome.org>
 
- gi/overrides/Gio.py |    4 ++--
+ gi/overrides/Gio.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 592c67482c254f65817c1a1b5c5de5dfcaab31b4
@@ -3053,8 +5102,8 @@ Date:   Sun Apr 29 12:56:50 2012 -0300
 
     Signed-off-by: Martin Pitt <martinpitt@gnome.org>
 
- gi/pygtkcompat.py         |    2 +-
- tests/test_pygtkcompat.py |    4 ++++
+ gi/pygtkcompat.py         | 2 +-
+ tests/test_pygtkcompat.py | 4 ++++
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit 3551462a429ef30274fa01fc8111da5025f9c342
@@ -3069,7 +5118,7 @@ Date:   Sun Apr 29 20:17:47 2012 +0200
 
     Do include bug numbers from now on, as they are very useful.
 
- Makefile.am |   12 ++++++++++--
+ Makefile.am | 12 ++++++++++--
  1 file changed, 10 insertions(+), 2 deletions(-)
 
 commit fe79ef612a7853f024b73c7997b8ec89015ae94c
@@ -3080,8 +5129,8 @@ Date:   Wed Apr 25 13:07:59 2012 +0200
 
     Similar to "check.gdb", but invokes nemiver.
 
- Makefile.am       |    3 +++
- tests/Makefile.am |    3 +++
+ Makefile.am       | 3 +++
+ tests/Makefile.am | 3 +++
  2 files changed, 6 insertions(+)
 
 commit 3090cc70a7ce8df38dd6cf6c17350417a7367c0b
@@ -3092,7 +5141,7 @@ Date:   Tue Apr 24 13:24:00 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=637466
 
- tests/test_everything.py |   18 ++++++++++++------
+ tests/test_everything.py | 18 ++++++++++++------
  1 file changed, 12 insertions(+), 6 deletions(-)
 
 commit 88d189ec3e3d900a96496a50c1d6e76615b19558
@@ -3108,7 +5157,7 @@ Date:   Tue Apr 24 13:03:36 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=666636
 
- tests/test_everything.py |   24 +++++++++++++-----------
+ tests/test_everything.py | 24 +++++++++++++-----------
  1 file changed, 13 insertions(+), 11 deletions(-)
 
 commit 8ee21619b3cfc179cf114813478470d9aa3f6fb8
@@ -3129,10 +5178,9 @@ Date:   Mon Apr 23 12:33:09 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=661709
 
- gi/pygi-marshal-from-py.c |   18 ++++++++++++++----
- tests/Makefile.am         |    1 +
- tests/test_atoms.py       |   41
- +++++++++++++++++++++++++++++++++++++++++
+ gi/pygi-marshal-from-py.c | 18 ++++++++++++++----
+ tests/Makefile.am         |  1 +
+ tests/test_atoms.py       | 41 +++++++++++++++++++++++++++++++++++++++++
  3 files changed, 56 insertions(+), 4 deletions(-)
 
 commit b9f24b4fbc2ca9f9b94b86f029c59b2fc3e8590f
@@ -3143,7 +5191,7 @@ Date:   Mon Apr 23 20:09:43 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=667954
 
- tests/test_gdbus.py |    2 +-
+ tests/test_gdbus.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 3ae38d7519524288a57e5d522954b9d6725f0185
@@ -3158,7 +5206,7 @@ Date:   Mon Apr 23 18:47:34 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=674475
 
- tests/test_overrides.py |   31 +++++++++++++++++++++++++++++++
+ tests/test_overrides.py | 31 +++++++++++++++++++++++++++++++
  1 file changed, 31 insertions(+)
 
 commit c12b10ca0feaaf61f23354c7b6631a9ef3635c36
@@ -3173,8 +5221,8 @@ Date:   Mon Apr 23 17:40:23 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=660018
 
- gi/overrides/Gtk.py     |   34 ++++++++++++++++++----------------
- tests/test_overrides.py |    6 ++++++
+ gi/overrides/Gtk.py     | 34 ++++++++++++++++++----------------
+ tests/test_overrides.py |  6 ++++++
  2 files changed, 24 insertions(+), 16 deletions(-)
 
 commit d37680bb9390426f7f58ea3d352c3e5e2106e978
@@ -3187,8 +5235,8 @@ Date:   Mon Apr 23 15:24:04 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=660018
 
- gi/overrides/Gtk.py     |    6 ++++++
- tests/test_overrides.py |    4 ++++
+ gi/overrides/Gtk.py     | 6 ++++++
+ tests/test_overrides.py | 4 ++++
  2 files changed, 10 insertions(+)
 
 commit e03284f852f0e404cc91374f3e2e42b0ac1977b4
@@ -3203,7 +5251,7 @@ Date:   Sun Apr 22 16:45:06 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=652860
 
- pygi-convert.sh |    3 ---
+ pygi-convert.sh | 3 ---
  1 file changed, 3 deletions(-)
 
 commit f82eca6006dec21624796074af8ffe9b2256f7a4
@@ -3212,14 +5260,14 @@ Date:   Sat Apr 21 14:00:50 2012 +0200
 
     tests: Replace deprecated assertEquals() with assertEqual()
 
- tests/test_everything.py  |  144 ++++++-------
- tests/test_gi.py          |  502
- ++++++++++++++++++++++-----------------------
- tests/test_gobject.py     |   58 +++---
- tests/test_option.py      |    6 +-
- tests/test_overrides.py   |  352 +++++++++++++++----------------
- tests/test_properties.py  |   18 +-
- tests/test_pygtkcompat.py |   42 ++--
+ tests/test_everything.py  | 144 ++++++-------
+ tests/test_gi.py          | 502
+ +++++++++++++++++++++++-----------------------
+ tests/test_gobject.py     |  58 +++---
+ tests/test_option.py      |   6 +-
+ tests/test_overrides.py   | 352 ++++++++++++++++----------------
+ tests/test_properties.py  |  18 +-
+ tests/test_pygtkcompat.py |  42 ++--
  7 files changed, 561 insertions(+), 561 deletions(-)
 
 commit ddb0bf01e694585d58af52673a21796e7c9578ea
@@ -3230,7 +5278,7 @@ Date:   Sat Apr 21 12:02:54 2012 +0200
 
     Fixes https://bugzilla.gnome.org/show_bug.cgi?id=642754
 
- gi/pygi-info.c |    1 +
+ gi/pygi-info.c | 1 +
  1 file changed, 1 insertion(+)
 
 commit 9c48a561c5ee010410df7d6e430353b41d5fbd88
@@ -3248,9 +5296,9 @@ Date:   Thu Apr 12 20:30:05 2012 +0200
 
     Signed-off-by: Martin Pitt <martinpitt@gnome.org>
 
- gi/pygi-cache.c           |    4 +++-
- gi/pygi-marshal-cleanup.c |    4 ++--
- tests/test_gi.py          |    3 +++
+ gi/pygi-cache.c           | 4 +++-
+ gi/pygi-marshal-cleanup.c | 4 ++--
+ tests/test_gi.py          | 3 +++
  3 files changed, 8 insertions(+), 3 deletions(-)
 
 commit 71246ca0568bf3e9b81e88dd13b6d29e9417e313
@@ -3267,10 +5315,10 @@ Date:   Thu Apr 19 13:11:56 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=674351
 
- gi/_gobject/gobjectmodule.c   |    5 ++++-
- gi/_gobject/propertyhelper.py |    9 ++++++---
- tests/test_properties.py      |   42
- ++++++++++++++++++++++++++++++++++++++---
+ gi/_gobject/gobjectmodule.c   |  5 ++++-
+ gi/_gobject/propertyhelper.py |  9 ++++++---
+ tests/test_properties.py      | 42
+ +++++++++++++++++++++++++++++++++++++++---
  3 files changed, 49 insertions(+), 7 deletions(-)
 
 commit 2158ecd05a2770d6538bae67d01d1f718855a7d4
@@ -3283,7 +5331,7 @@ Date:   Thu Apr 19 16:12:29 2012 +0200
     we test the
     properties of the right object.
 
- tests/test_everything.py |    2 +-
+ tests/test_everything.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 84e3471ba4595534cbe6875f1c8b77776e1d1814
@@ -3298,8 +5346,8 @@ Date:   Wed Apr 18 21:44:08 2012 +0200
 
     Signed-off-by: Martin Pitt <martinpitt@gnome.org>
 
- gi/_gobject/pygtype.c    |    9 +++++++--
- tests/test_everything.py |   15 +++++++++++++++
+ gi/_gobject/pygtype.c    |  9 +++++++--
+ tests/test_everything.py | 15 +++++++++++++++
  2 files changed, 22 insertions(+), 2 deletions(-)
 
 commit d1362451e070e156d2f49c9cde930cc38befb12b
@@ -3308,8 +5356,8 @@ Date:   Thu Apr 19 07:27:10 2012 +0200
 
     Add missing GObject.TYPE_GTYPE
 
- gi/_gobject/__init__.py  |    1 +
- gi/_gobject/constants.py |    1 +
+ gi/_gobject/__init__.py  | 1 +
+ gi/_gobject/constants.py | 1 +
  2 files changed, 2 insertions(+)
 
 commit d3225f1540e09719caa73e52d402e946da3add24
@@ -3318,7 +5366,7 @@ Date:   Tue Apr 10 12:44:00 2012 +0200
 
     Fix test_mainloop.py for Python 3
 
- tests/test_mainloop.py |    9 +++++++--
+ tests/test_mainloop.py | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 commit 903283119896f3e054694484da4147788b02ce60
@@ -3338,7 +5386,7 @@ Date:   Mon Apr 9 15:20:39 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=616279
 
- tests/test_everything.py |   16 ++++++++--------
+ tests/test_everything.py | 16 ++++++++--------
  1 file changed, 8 insertions(+), 8 deletions(-)
 
 commit 0fd900d351c8d7d57dc6a1b049ee05f342f6ab1d
@@ -3364,9 +5412,9 @@ Date:   Sun Mar 18 15:59:58 2012 -0700
 
     Signed-off-by: Martin Pitt <martinpitt@gnome.org>
 
- gi/_gobject/pygobject.c |  138 ++++++++++++++++++++++++++++++++++++++---
- tests/test_gobject.py   |  158
- +++++++++++++++++++++++++++++++++++++++++++++++
+ gi/_gobject/pygobject.c | 138 +++++++++++++++++++++++++++++++++++++++---
+ tests/test_gobject.py   | 158
+ ++++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 288 insertions(+), 8 deletions(-)
 
 commit c0922589964c1d8bffe5a56d2f56df96eedfac10
@@ -3377,8 +5425,8 @@ Date:   Wed Apr 4 19:08:54 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=620943
 
- gi/_gobject/propertyhelper.py |    9 +++++++--
- tests/test_properties.py      |   28 +++++++++++++++++++++++++++-
+ gi/_gobject/propertyhelper.py |  9 +++++++--
+ tests/test_properties.py      | 28 +++++++++++++++++++++++++++-
  2 files changed, 34 insertions(+), 3 deletions(-)
 
 commit d4054be9de3b7e4ed64c8172ebbde0a697462c79
@@ -3391,8 +5439,8 @@ Date:   Wed Apr 4 17:54:52 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=524719
 
- gi/_glib/pygsource.c |   15 +++++++++++++++
- tests/test_source.py |   24 ++++++++++++++++++++++++
+ gi/_glib/pygsource.c | 15 +++++++++++++++
+ tests/test_source.py | 24 ++++++++++++++++++++++++
  2 files changed, 39 insertions(+)
 
 commit 05030a95a4d3090162ed5f510a26d69bbb152942
@@ -3405,8 +5453,8 @@ Date:   Wed Apr 4 15:59:24 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=646667
 
- gi/overrides/__init__.py |    7 ++++---
- tests/test_overrides.py  |   13 +++++++++++++
+ gi/overrides/__init__.py |  7 ++++---
+ tests/test_overrides.py  | 13 +++++++++++++
  2 files changed, 17 insertions(+), 3 deletions(-)
 
 commit 96f14989baea76fe8692f10c1a37e2dfc45fecbf
@@ -3424,8 +5472,8 @@ Date:   Wed Apr 4 15:30:55 2012 +0200
 
     Co-authored-by: Martin Pitt <martinpitt@gnome.org>
 
- gi/_gobject/pygobject.c |    4 ++++
- tests/test_gobject.py   |   11 +++++++++++
+ gi/_gobject/pygobject.c |  4 ++++
+ tests/test_gobject.py   | 11 +++++++++++
  2 files changed, 15 insertions(+)
 
 commit 24cc09a7105299805fcc5bc151f53ac69958d728
@@ -3441,7 +5489,7 @@ Date:   Wed Feb 9 18:37:33 2011 +0100
 
     Signed-off-by: Martin Pitt <martinpitt@gnome.org>
 
- gi/_gobject/pygobject.c |   40 ----------------------------------------
+ gi/_gobject/pygobject.c | 40 ----------------------------------------
  1 file changed, 40 deletions(-)
 
 commit 2a5a33a9c9c170830c98c2e32fa8dcea3c35f2e6
@@ -3456,7 +5504,7 @@ Date:   Tue Apr 3 22:26:34 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=663068
 
- tests/test_mainloop.py |   25 ++++++++++++++++++++++++-
+ tests/test_mainloop.py | 25 ++++++++++++++++++++++++-
  1 file changed, 24 insertions(+), 1 deletion(-)
 
 commit d03696c1aaa7e66f8f16554cf4a4b97addb5aea1
@@ -3478,22 +5526,22 @@ Date:   Tue Feb 21 15:13:42 2012 +0100
 
     Signed-off-by: Martin Pitt <martinpitt@gnome.org>
 
- gi/Makefile.am                |    2 +
- gi/gimodule.c                 |    1 +
- gi/module.py                  |    5 +++
- gi/pygi-argument.c            |   12 +----
- gi/pygi-cache.c               |   28 ++++++++++--
- gi/pygi-cache.h               |    9 ++--
- gi/pygi-ccallback.c           |  100
- +++++++++++++++++++++++++++++++++++++++++
- gi/pygi-ccallback.h           |   41 +++++++++++++++++
- gi/pygi-closure.c             |   50 ++++++++++++++++++++-
- gi/pygi-invoke-state-struct.h |    2 +
- gi/pygi-invoke.c              |   73 +++++++++++++++++++++---------
- gi/pygi-invoke.h              |    3 ++
- gi/pygi-private.h             |    1 +
- gi/pygi.h                     |   10 +++++
- tests/test_gi.py              |   16 +++++++
+ gi/Makefile.am                |   2 +
+ gi/gimodule.c                 |   1 +
+ gi/module.py                  |   5 +++
+ gi/pygi-argument.c            |  12 +----
+ gi/pygi-cache.c               |  28 ++++++++++--
+ gi/pygi-cache.h               |   9 ++--
+ gi/pygi-ccallback.c           | 100
+ ++++++++++++++++++++++++++++++++++++++++++
+ gi/pygi-ccallback.h           |  41 +++++++++++++++++
+ gi/pygi-closure.c             |  50 ++++++++++++++++++++-
+ gi/pygi-invoke-state-struct.h |   2 +
+ gi/pygi-invoke.c              |  73 ++++++++++++++++++++----------
+ gi/pygi-invoke.h              |   3 ++
+ gi/pygi-private.h             |   1 +
+ gi/pygi.h                     |  10 +++++
+ tests/test_gi.py              |  16 +++++++
  15 files changed, 312 insertions(+), 41 deletions(-)
 
 commit db7e1d078db16b6f11dee51aa97525c451346632
@@ -3506,7 +5554,7 @@ Date:   Tue Mar 27 17:34:48 2012 +0200
 
     Signed-off-by: Martin Pitt <martinpitt@gnome.org>
 
- tests/test_everything.py |   19 +++++++++++++++++++
+ tests/test_everything.py | 19 +++++++++++++++++++
  1 file changed, 19 insertions(+)
 
 commit 7c0017c30129a8db391f902ed592782200d69c64
@@ -3519,7 +5567,7 @@ Date:   Mon Mar 26 17:55:41 2012 +0200
     released. So
     continue with 3.3.x on master.
 
- configure.ac |    4 ++--
+ configure.ac | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 8309f305e5ce508fc5f6411c8153bea2cee5f741
@@ -3533,8 +5581,8 @@ Date:   Mon Mar 26 17:51:37 2012 +0200
     - Ignore *.pyc files.
     - Do not ignore .gitignore, we actually want to track this.
 
- .gitignore |   61
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ .gitignore | 61
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 61 insertions(+)
 
 commit 81de788a72b40acd2f857718d78bdeea01d12eb1
@@ -3549,13 +5597,13 @@ Date:   Mon Mar 26 17:45:08 2012 +0200
     - "make clean" should remove *.pyc files
     - tests/runtests.py: Look for tests in srcdir, not in builddir
 
- Makefile.am               |    6 ++++--
- gi/Makefile.am            |   13 +++++++++++--
- gi/_glib/Makefile.am      |   12 ++++++++++--
- gi/_gobject/Makefile.am   |   12 ++++++++++--
- gi/overrides/Makefile.am  |   10 ++++++++++
- gi/repository/Makefile.am |   11 +++++++++++
- tests/runtests.py         |    6 ++++--
+ Makefile.am               |  6 ++++--
+ gi/Makefile.am            | 13 +++++++++++--
+ gi/_glib/Makefile.am      | 12 ++++++++++--
+ gi/_gobject/Makefile.am   | 12 ++++++++++--
+ gi/overrides/Makefile.am  | 10 ++++++++++
+ gi/repository/Makefile.am | 11 +++++++++++
+ tests/runtests.py         |  6 ++++--
  7 files changed, 60 insertions(+), 10 deletions(-)
 
 commit f83d95e6fff572bda659a48e309b4524dafa4e83
@@ -3569,7 +5617,7 @@ Date:   Thu Mar 22 11:14:03 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=672627
 
- tests/Makefile.am |    9 ++++-----
+ tests/Makefile.am | 9 ++++-----
  1 file changed, 4 insertions(+), 5 deletions(-)
 
 commit d1f5474c6c50163aefe660e0689dc7f30e6cd48b
@@ -3580,14 +5628,14 @@ Date:   Thu Mar 22 10:56:59 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=672627
 
- demos/gtk-demo/demos/Icon View/iconviewedit.py |    7 +++---
- demos/gtk-demo/demos/Tree View/liststore.py    |   28
- ++++++++++++------------
- demos/gtk-demo/demos/appwindow.py              |   10 ++++-----
- demos/gtk-demo/demos/rotatedtext.py            |    2 +-
- examples/cairo-demo.py                         |    4 ++--
- tests/test_gi.py                               |   12 +++++-----
- tests/test_overrides.py                        |    2 +-
+ demos/gtk-demo/demos/Icon View/iconviewedit.py |  7 +++----
+ demos/gtk-demo/demos/Tree View/liststore.py    | 28
+ +++++++++++++-------------
+ demos/gtk-demo/demos/appwindow.py              | 10 ++++-----
+ demos/gtk-demo/demos/rotatedtext.py            |  2 +-
+ examples/cairo-demo.py                         |  4 ++--
+ tests/test_gi.py                               | 12 +++++------
+ tests/test_overrides.py                        |  2 +-
  7 files changed, 32 insertions(+), 33 deletions(-)
 
 commit 032fcce2bf6070a9001cbb780e90403051e303b1
@@ -3598,16 +5646,16 @@ Date:   Thu Mar 22 10:56:03 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=672627
 
- demos/gtk-demo/demos/drawingarea.py |    6 +++---
- demos/gtk-demo/demos/images.py      |   10 +++++-----
- demos/gtk-demo/demos/rotatedtext.py |    2 +-
- gi/__init__.py                      |    2 +-
- gi/_glib/option.py                  |    2 +-
- gi/_gobject/__init__.py             |    2 +-
- gi/overrides/GLib.py                |   12 ++++++------
- gi/types.py                         |    4 ++--
- tests/runtests.py                   |    2 +-
- tests/test_gdbus.py                 |    4 ++--
+ demos/gtk-demo/demos/drawingarea.py |  6 +++---
+ demos/gtk-demo/demos/images.py      | 10 +++++-----
+ demos/gtk-demo/demos/rotatedtext.py |  2 +-
+ gi/__init__.py                      |  2 +-
+ gi/_glib/option.py                  |  2 +-
+ gi/_gobject/__init__.py             |  2 +-
+ gi/overrides/GLib.py                | 12 ++++++------
+ gi/types.py                         |  4 ++--
+ tests/runtests.py                   |  2 +-
+ tests/test_gdbus.py                 |  4 ++--
  10 files changed, 23 insertions(+), 23 deletions(-)
 
 commit 6a58edbf11c612e9a14347b1556d1e0dd2ec1823
@@ -3618,12 +5666,11 @@ Date:   Thu Mar 22 10:52:05 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=672627
 
- demos/gtk-demo/demos/Tree View/liststore.py |    2 +-
- demos/gtk-demo/demos/appwindow.py           |    2 +-
- tests/test_everything.py                    |   23
- +++++++++--------------
- tests/test_gi.py                            |    2 +-
- tests/test_overrides.py                     |    2 +-
+ demos/gtk-demo/demos/Tree View/liststore.py |  2 +-
+ demos/gtk-demo/demos/appwindow.py           |  2 +-
+ tests/test_everything.py                    | 23 +++++++++--------------
+ tests/test_gi.py                            |  2 +-
+ tests/test_overrides.py                     |  2 +-
  5 files changed, 13 insertions(+), 18 deletions(-)
 
 commit a8d361e66b2a0e09cfa5dbade4725074b0cc2fd1
@@ -3634,7 +5681,7 @@ Date:   Thu Mar 22 10:49:52 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=672627
 
- tests/test_overrides.py |    2 +-
+ tests/test_overrides.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2b8eb9fa5b9ca454d7130b3eec15a982fee1bdc9
@@ -3645,8 +5692,8 @@ Date:   Thu Mar 22 10:49:27 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=672627
 
- demos/gtk-demo/demos/rotatedtext.py |    1 -
- tests/test_overrides.py             |    1 -
+ demos/gtk-demo/demos/rotatedtext.py | 1 -
+ tests/test_overrides.py             | 1 -
  2 files changed, 2 deletions(-)
 
 commit 03e597cb8f3b075efae556ee51a598695a883ad3
@@ -3657,12 +5704,12 @@ Date:   Thu Mar 22 10:48:59 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=672627
 
- demos/gtk-demo/demos/images.py |    2 +-
- examples/cairo-demo.py         |    8 ++++----
- tests/test_gi.py               |    4 ++--
- tests/test_overrides.py        |    8 ++++----
- tests/test_properties.py       |   14 +++++++-------
- tests/test_signal.py           |    2 +-
+ demos/gtk-demo/demos/images.py |  2 +-
+ examples/cairo-demo.py         |  8 ++++----
+ tests/test_gi.py               |  4 ++--
+ tests/test_overrides.py        |  8 ++++----
+ tests/test_properties.py       | 14 +++++++-------
+ tests/test_signal.py           |  2 +-
  6 files changed, 19 insertions(+), 19 deletions(-)
 
 commit 21aeb19107b718293116e51ecd6479d4d7198b8f
@@ -3673,23 +5720,23 @@ Date:   Thu Mar 22 10:46:17 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=672627
 
- demos/gtk-demo/demos/Entry/entry_buffer.py     |    2 +-
- demos/gtk-demo/demos/Entry/entry_completion.py |    2 +-
- demos/gtk-demo/demos/Entry/search_entry.py     |   12 ++---
- demos/gtk-demo/demos/Icon View/iconviewedit.py |    4 +-
- demos/gtk-demo/demos/Tree View/liststore.py    |    2 +-
- demos/gtk-demo/demos/dialogs.py                |   12 ++---
- demos/gtk-demo/demos/pickers.py                |    8 +--
- demos/gtk-demo/demos/pixbuf.py                 |    4 +-
- demos/gtk-demo/demos/printing.py               |    8 +--
- demos/gtk-demo/demos/rotatedtext.py            |    2 +-
- demos/gtk-demo/gtk-demo.py                     |    4 +-
- gi/module.py                                   |    4 +-
- gi/overrides/Pango.py                          |    2 +-
- gi/pygtkcompat.py                              |    4 +-
- tests/test_everything.py                       |    4 +-
- tests/test_overrides.py                        |   62
- ++++++++++++------------
+ demos/gtk-demo/demos/Entry/entry_buffer.py     |  2 +-
+ demos/gtk-demo/demos/Entry/entry_completion.py |  2 +-
+ demos/gtk-demo/demos/Entry/search_entry.py     | 12 ++---
+ demos/gtk-demo/demos/Icon View/iconviewedit.py |  4 +-
+ demos/gtk-demo/demos/Tree View/liststore.py    |  2 +-
+ demos/gtk-demo/demos/dialogs.py                | 12 ++---
+ demos/gtk-demo/demos/pickers.py                |  8 ++--
+ demos/gtk-demo/demos/pixbuf.py                 |  4 +-
+ demos/gtk-demo/demos/printing.py               |  8 ++--
+ demos/gtk-demo/demos/rotatedtext.py            |  2 +-
+ demos/gtk-demo/gtk-demo.py                     |  4 +-
+ gi/module.py                                   |  4 +-
+ gi/overrides/Pango.py                          |  2 +-
+ gi/pygtkcompat.py                              |  4 +-
+ tests/test_everything.py                       |  4 +-
+ tests/test_overrides.py                        | 62
+ +++++++++++++-------------
  16 files changed, 68 insertions(+), 68 deletions(-)
 
 commit b04d209930ab01bae6563b0d714aec829739bdc6
@@ -3700,7 +5747,7 @@ Date:   Thu Mar 22 10:40:46 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=672627
 
- tests/test_signal.py |   20 ++++++++++----------
+ tests/test_signal.py | 20 ++++++++++----------
  1 file changed, 10 insertions(+), 10 deletions(-)
 
 commit 725483a5dc36739dc7836716b5d6d48091564bf8
@@ -3711,67 +5758,67 @@ Date:   Thu Mar 22 10:38:59 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=672627
 
- demos/gtk-demo/demos/Entry/entry_buffer.py       |    1 +
- demos/gtk-demo/demos/Entry/entry_completion.py   |    1 +
- demos/gtk-demo/demos/Entry/search_entry.py       |    3 +-
- demos/gtk-demo/demos/Icon View/iconviewbasics.py |    1 +
- demos/gtk-demo/demos/Icon View/iconviewedit.py   |    2 +
- demos/gtk-demo/demos/Tree View/liststore.py      |    3 ++
- demos/gtk-demo/demos/appwindow.py                |   13 ++++-
- demos/gtk-demo/demos/assistant.py                |    1 +
- demos/gtk-demo/demos/builder.py                  |    1 +
- demos/gtk-demo/demos/button_box.py               |    1 +
- demos/gtk-demo/demos/clipboard.py                |    2 +-
- demos/gtk-demo/demos/colorselector.py            |    1 +
- demos/gtk-demo/demos/combobox.py                 |    4 +-
- demos/gtk-demo/demos/dialogs.py                  |    2 +
- demos/gtk-demo/demos/drawingarea.py              |    1 +
- demos/gtk-demo/demos/expander.py                 |    4 +-
- demos/gtk-demo/demos/images.py                   |   10 ++--
- demos/gtk-demo/demos/infobars.py                 |    2 +
- demos/gtk-demo/demos/links.py                    |    2 +
- demos/gtk-demo/demos/menus.py                    |    2 +
- demos/gtk-demo/demos/pickers.py                  |    2 +
- demos/gtk-demo/demos/pixbuf.py                   |    2 +
- demos/gtk-demo/demos/printing.py                 |    5 +-
- demos/gtk-demo/demos/rotatedtext.py              |    4 +-
- demos/gtk-demo/demos/test.py                     |    1 +
- demos/gtk-demo/gtk-demo.py                       |    9 ++--
- examples/cairo-demo.py                           |   57
- +++++++++++++---------
- examples/option.py                               |    1 -
- examples/properties.py                           |    1 +
- examples/signal.py                               |    4 ++
- gi/__init__.py                                   |    2 +
- gi/_glib/option.py                               |    4 +-
- gi/_gobject/__init__.py                          |    1 +
- gi/_gobject/propertyhelper.py                    |    5 +-
- gi/module.py                                     |    3 ++
- gi/overrides/GIMarshallingTests.py               |    2 +
- gi/overrides/GLib.py                             |   12 +++--
- gi/overrides/Gdk.py                              |    9 ++++
- gi/overrides/Gio.py                              |    4 ++
- gi/overrides/Gtk.py                              |   56
- +++++++++++++++++++--
- gi/overrides/Pango.py                            |    2 +
- gi/overrides/__init__.py                         |    5 +-
- gi/pygtkcompat.py                                |   16 ++++--
- gi/types.py                                      |    4 ++
- tests/test_everything.py                         |   30 ++++++++----
- tests/test_gdbus.py                              |    1 +
- tests/test_gi.py                                 |   30 ++++++------
- tests/test_gobject.py                            |    3 +-
- tests/test_mainloop.py                           |    1 +
- tests/test_option.py                             |    1 +
- tests/test_overrides.py                          |   55
- +++++++++++----------
- tests/test_properties.py                         |   11 ++++-
- tests/test_signal.py                             |   32 +++++++++++-
- tests/test_source.py                             |    1 +
- tests/test_subprocess.py                         |    1 +
- tests/test_thread.py                             |    1 +
- tests/test_uris.py                               |    1 +
- tests/testmodule.py                              |    1 +
+ demos/gtk-demo/demos/Entry/entry_buffer.py       |  1 +
+ demos/gtk-demo/demos/Entry/entry_completion.py   |  1 +
+ demos/gtk-demo/demos/Entry/search_entry.py       |  3 +-
+ demos/gtk-demo/demos/Icon View/iconviewbasics.py |  1 +
+ demos/gtk-demo/demos/Icon View/iconviewedit.py   |  2 +
+ demos/gtk-demo/demos/Tree View/liststore.py      |  3 ++
+ demos/gtk-demo/demos/appwindow.py                | 13 +++++-
+ demos/gtk-demo/demos/assistant.py                |  1 +
+ demos/gtk-demo/demos/builder.py                  |  1 +
+ demos/gtk-demo/demos/button_box.py               |  1 +
+ demos/gtk-demo/demos/clipboard.py                |  2 +-
+ demos/gtk-demo/demos/colorselector.py            |  1 +
+ demos/gtk-demo/demos/combobox.py                 |  4 +-
+ demos/gtk-demo/demos/dialogs.py                  |  2 +
+ demos/gtk-demo/demos/drawingarea.py              |  1 +
+ demos/gtk-demo/demos/expander.py                 |  4 +-
+ demos/gtk-demo/demos/images.py                   | 10 +++--
+ demos/gtk-demo/demos/infobars.py                 |  2 +
+ demos/gtk-demo/demos/links.py                    |  2 +
+ demos/gtk-demo/demos/menus.py                    |  2 +
+ demos/gtk-demo/demos/pickers.py                  |  2 +
+ demos/gtk-demo/demos/pixbuf.py                   |  2 +
+ demos/gtk-demo/demos/printing.py                 |  5 ++-
+ demos/gtk-demo/demos/rotatedtext.py              |  4 +-
+ demos/gtk-demo/demos/test.py                     |  1 +
+ demos/gtk-demo/gtk-demo.py                       |  9 ++--
+ examples/cairo-demo.py                           | 57
+ ++++++++++++++----------
+ examples/option.py                               |  1 -
+ examples/properties.py                           |  1 +
+ examples/signal.py                               |  4 ++
+ gi/__init__.py                                   |  2 +
+ gi/_glib/option.py                               |  4 +-
+ gi/_gobject/__init__.py                          |  1 +
+ gi/_gobject/propertyhelper.py                    |  5 ++-
+ gi/module.py                                     |  3 ++
+ gi/overrides/GIMarshallingTests.py               |  2 +
+ gi/overrides/GLib.py                             | 12 +++--
+ gi/overrides/Gdk.py                              |  9 ++++
+ gi/overrides/Gio.py                              |  4 ++
+ gi/overrides/Gtk.py                              | 56
+ ++++++++++++++++++++---
+ gi/overrides/Pango.py                            |  2 +
+ gi/overrides/__init__.py                         |  5 ++-
+ gi/pygtkcompat.py                                | 16 +++++--
+ gi/types.py                                      |  4 ++
+ tests/test_everything.py                         | 30 +++++++++----
+ tests/test_gdbus.py                              |  1 +
+ tests/test_gi.py                                 | 30 +++++++------
+ tests/test_gobject.py                            |  3 +-
+ tests/test_mainloop.py                           |  1 +
+ tests/test_option.py                             |  1 +
+ tests/test_overrides.py                          | 55
+ ++++++++++++-----------
+ tests/test_properties.py                         | 11 ++++-
+ tests/test_signal.py                             | 32 ++++++++++++-
+ tests/test_source.py                             |  1 +
+ tests/test_subprocess.py                         |  1 +
+ tests/test_thread.py                             |  1 +
+ tests/test_uris.py                               |  1 +
+ tests/testmodule.py                              |  1 +
  58 files changed, 326 insertions(+), 111 deletions(-)
 
 commit 917275d4aa81db39ccaca34fa514032fb80a3187
@@ -3782,15 +5829,15 @@ Date:   Thu Mar 22 10:33:29 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=672627
 
- demos/gtk-demo/demos/appwindow.py     |    8 ++++----
- demos/gtk-demo/demos/colorselector.py |    4 ++--
- demos/gtk-demo/gtk-demo.py            |   24 ++++++++++++------------
- examples/option.py                    |    4 ++--
- gi/_glib/option.py                    |    2 +-
- gi/overrides/Gtk.py                   |    2 +-
- tests/test_gi.py                      |   26 +++++++++++++-------------
- tests/test_option.py                  |    2 +-
- tests/test_overrides.py               |    8 ++++----
+ demos/gtk-demo/demos/appwindow.py     |  8 ++++----
+ demos/gtk-demo/demos/colorselector.py |  4 ++--
+ demos/gtk-demo/gtk-demo.py            | 24 ++++++++++++------------
+ examples/option.py                    |  4 ++--
+ gi/_glib/option.py                    |  2 +-
+ gi/overrides/Gtk.py                   |  2 +-
+ tests/test_gi.py                      | 26 +++++++++++++-------------
+ tests/test_option.py                  |  2 +-
+ tests/test_overrides.py               |  8 ++++----
  9 files changed, 40 insertions(+), 40 deletions(-)
 
 commit 0c85656f95d3cb31becff10bbee7faae7b0b875b
@@ -3801,15 +5848,15 @@ Date:   Thu Mar 22 10:28:28 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=672627
 
- demos/gtk-demo/demos/appwindow.py |    4 ++--
- demos/gtk-demo/demos/dialogs.py   |   30 +++++++++++++++---------------
- demos/gtk-demo/demos/links.py     |    2 +-
- demos/gtk-demo/demos/pixbuf.py    |    2 +-
- demos/gtk-demo/demos/printing.py  |    8 ++++----
- gi/overrides/Gtk.py               |    4 ++--
- tests/test_everything.py          |   22 +++++++++++-----------
- tests/test_gi.py                  |    2 +-
- tests/test_overrides.py           |    8 ++++----
+ demos/gtk-demo/demos/appwindow.py |  4 ++--
+ demos/gtk-demo/demos/dialogs.py   | 30 +++++++++++++++---------------
+ demos/gtk-demo/demos/links.py     |  2 +-
+ demos/gtk-demo/demos/pixbuf.py    |  2 +-
+ demos/gtk-demo/demos/printing.py  |  8 ++++----
+ gi/overrides/Gtk.py               |  4 ++--
+ tests/test_everything.py          | 22 +++++++++++-----------
+ tests/test_gi.py                  |  2 +-
+ tests/test_overrides.py           |  8 ++++----
  9 files changed, 41 insertions(+), 41 deletions(-)
 
 commit 32cc594ab6dfbd4843f3db5ec8338d31ad5df6c6
@@ -3821,38 +5868,38 @@ Date:   Thu Mar 22 10:24:40 2012 -0300
     By running the whole source tree via the indent.py script found
     in the Python distribution.
 
- demos/gtk-demo/demos/Entry/search_entry.py     |    4 +-
- demos/gtk-demo/demos/Icon View/iconviewedit.py |   41 +++----
- demos/gtk-demo/demos/Tree View/liststore.py    |    8 +-
- demos/gtk-demo/demos/appwindow.py              |   18 +--
- demos/gtk-demo/demos/dialogs.py                |   26 ++--
- demos/gtk-demo/demos/expander.py               |    6 +-
- demos/gtk-demo/demos/images.py                 |    2 +-
- demos/gtk-demo/demos/links.py                  |    2 +-
- demos/gtk-demo/demos/rotatedtext.py            |   20 ++--
- gi/_glib/option.py                             |    2 +-
- gi/_gobject/constants.py                       |    1 -
- gi/importer.py                                 |    1 -
- gi/module.py                                   |   10 +-
- gi/overrides/GLib.py                           |   11 +-
- gi/overrides/Gdk.py                            |   30 ++---
- gi/overrides/Gio.py                            |    4 +-
- gi/overrides/Gtk.py                            |  150
- ++++++++++++------------
- gi/overrides/Pango.py                          |    1 -
- gi/overrides/__init__.py                       |   10 +-
- gi/pygtkcompat.py                              |    2 +-
- tests/compathelper.py                          |    2 +-
- tests/runtests.py                              |   19 ++-
- tests/test_everything.py                       |   22 ++--
- tests/test_gdbus.py                            |   11 +-
- tests/test_gi.py                               |   38 +++---
- tests/test_gobject.py                          |    2 +-
- tests/test_interface.py                        |    1 -
- tests/test_option.py                           |    1 -
- tests/test_overrides.py                        |   78 ++++++------
- tests/test_properties.py                       |    2 +-
- tests/test_uris.py                             |    1 -
+ demos/gtk-demo/demos/Entry/search_entry.py     |   4 +-
+ demos/gtk-demo/demos/Icon View/iconviewedit.py |  41 +++----
+ demos/gtk-demo/demos/Tree View/liststore.py    |   8 +-
+ demos/gtk-demo/demos/appwindow.py              |  18 +--
+ demos/gtk-demo/demos/dialogs.py                |  26 ++---
+ demos/gtk-demo/demos/expander.py               |   6 +-
+ demos/gtk-demo/demos/images.py                 |   2 +-
+ demos/gtk-demo/demos/links.py                  |   2 +-
+ demos/gtk-demo/demos/rotatedtext.py            |  20 ++--
+ gi/_glib/option.py                             |   2 +-
+ gi/_gobject/constants.py                       |   1 -
+ gi/importer.py                                 |   1 -
+ gi/module.py                                   |  10 +-
+ gi/overrides/GLib.py                           |  11 +-
+ gi/overrides/Gdk.py                            |  30 ++---
+ gi/overrides/Gio.py                            |   4 +-
+ gi/overrides/Gtk.py                            | 150
+ ++++++++++++-------------
+ gi/overrides/Pango.py                          |   1 -
+ gi/overrides/__init__.py                       |  10 +-
+ gi/pygtkcompat.py                              |   2 +-
+ tests/compathelper.py                          |   2 +-
+ tests/runtests.py                              |  19 ++--
+ tests/test_everything.py                       |  22 ++--
+ tests/test_gdbus.py                            |  11 +-
+ tests/test_gi.py                               |  38 +++----
+ tests/test_gobject.py                          |   2 +-
+ tests/test_interface.py                        |   1 -
+ tests/test_option.py                           |   1 -
+ tests/test_overrides.py                        |  78 ++++++-------
+ tests/test_properties.py                       |   2 +-
+ tests/test_uris.py                             |   1 -
  31 files changed, 255 insertions(+), 271 deletions(-)
 
 commit c375e3136f0f48eb8a6717c0053155db088b329d
@@ -3865,12 +5912,12 @@ Date:   Thu Mar 22 10:32:43 2012 +0100
 
     Caught by the previous commit of making deprecations fatal.
 
- tests/test_option.py      |   10 +++----
- tests/test_overrides.py   |   66
- ++++++++++++++++++++++-----------------------
- tests/test_properties.py  |   14 +++++-----
- tests/test_pygtkcompat.py |   18 ++++++-------
- tests/test_signal.py      |    4 +--
+ tests/test_option.py      | 10 +++----
+ tests/test_overrides.py   | 66
+ +++++++++++++++++++++++------------------------
+ tests/test_properties.py  | 14 +++++-----
+ tests/test_pygtkcompat.py | 18 ++++++-------
+ tests/test_signal.py      |  4 +--
  5 files changed, 56 insertions(+), 56 deletions(-)
 
 commit 32525e565cc48454cdacbc44ad3fd751b81cb7e3
@@ -3879,7 +5926,7 @@ Date:   Thu Mar 22 10:31:22 2012 +0100
 
     Fail tests if they use or encounter deprecations
 
- tests/Makefile.am |    2 +-
+ tests/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 65762243a34af014950527c323a51a29d40fb3e1
@@ -3899,9 +5946,9 @@ Date:   Thu Mar 22 10:15:16 2012 +0100
     to
     tests/runtests.py.
 
- tests/Makefile.am       |   33 ++++++++++++---------------------
- tests/runtests.py       |    7 +++++++
- tests/test_overrides.py |    6 ------
+ tests/Makefile.am       | 33 ++++++++++++---------------------
+ tests/runtests.py       |  7 +++++++
+ tests/test_overrides.py |  6 ------
  3 files changed, 19 insertions(+), 27 deletions(-)
 
 commit 3b4ae83a0ece8e3aed1de5452e2acd32841e629a
@@ -3916,7 +5963,7 @@ Date:   Thu Mar 22 09:58:21 2012 +0100
     import,
     which makes this work again.
 
- tests/test_overrides.py |    9 +++++----
+ tests/test_overrides.py | 9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)
 
 commit 927f7877ffa5e16c4cabcecbc05656ee0ec6a167
@@ -3930,8 +5977,8 @@ Date:   Wed Mar 21 21:09:24 2012 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=672589
 
- gi/pygtkcompat.py         |   19 +++++++++++++++++++
- tests/test_pygtkcompat.py |   22 ++++++++++++++++++++++
+ gi/pygtkcompat.py         | 19 +++++++++++++++++++
+ tests/test_pygtkcompat.py | 22 ++++++++++++++++++++++
  2 files changed, 41 insertions(+)
 
 commit b322d6a1f6d44bace4eefb98558cfe94a73a727c
@@ -3942,8 +5989,8 @@ Date:   Wed Mar 21 16:01:35 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=672578
 
- tests/test_everything.py  |    4 ++--
- tests/test_pygtkcompat.py |   18 ++++++++++++++++++
+ tests/test_everything.py  |  4 ++--
+ tests/test_pygtkcompat.py | 18 ++++++++++++++++++
  2 files changed, 20 insertions(+), 2 deletions(-)
 
 commit c8bc6ae10cfe8b2eff4204ec2175907a6eb0585a
@@ -3956,54 +6003,54 @@ Date:   Wed Mar 21 14:45:53 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=672578
 
- demos/gtk-demo/demos/Entry/entry_buffer.py       |    2 +-
- demos/gtk-demo/demos/Entry/entry_completion.py   |    2 +-
- demos/gtk-demo/demos/Entry/search_entry.py       |   12 +-
- demos/gtk-demo/demos/Icon View/iconviewbasics.py |    2 +-
- demos/gtk-demo/demos/Icon View/iconviewedit.py   |    2 +-
- demos/gtk-demo/demos/Tree View/liststore.py      |    3 +-
- demos/gtk-demo/demos/appwindow.py                |   13 +-
- demos/gtk-demo/demos/assistant.py                |    4 +-
- demos/gtk-demo/demos/builder.py                  |    4 +-
- demos/gtk-demo/demos/button_box.py               |    2 +-
- demos/gtk-demo/demos/clipboard.py                |    2 +-
- demos/gtk-demo/demos/colorselector.py            |    2 +-
- demos/gtk-demo/demos/combobox.py                 |    4 +-
- demos/gtk-demo/demos/dialogs.py                  |    4 +-
- demos/gtk-demo/demos/drawingarea.py              |    2 +-
- demos/gtk-demo/demos/expander.py                 |    4 +-
- demos/gtk-demo/demos/images.py                   |    8 +-
- demos/gtk-demo/demos/infobars.py                 |    2 +-
- demos/gtk-demo/demos/links.py                    |    2 +-
- demos/gtk-demo/demos/menus.py                    |    5 +-
- demos/gtk-demo/demos/pickers.py                  |    2 +-
- demos/gtk-demo/demos/pixbuf.py                   |    2 +-
- demos/gtk-demo/demos/printing.py                 |    3 +-
- demos/gtk-demo/demos/rotatedtext.py              |    6 +-
- demos/gtk-demo/gtk-demo.py                       |    9 +-
- examples/cairo-demo.py                           |    2 +-
- gi/__init__.py                                   |    4 +
- gi/_glib/__init__.py                             |  101 ++++++++++-
- gi/_glib/option.py                               |    1 +
- gi/_gobject/__init__.py                          |  203
- +++++++++++++++++++---
- gi/_gobject/constants.py                         |    2 -
- gi/_gobject/propertyhelper.py                    |    4 +-
- gi/importer.py                                   |    2 +-
- gi/module.py                                     |    1 -
- gi/overrides/Gtk.py                              |    1 -
- gi/overrides/__init__.py                         |    1 -
- gi/pygtkcompat.py                                |    2 +
- gi/types.py                                      |    3 +
- tests/Makefile.am                                |    5 +
- tests/test_everything.py                         |    6 +-
- tests/test_gi.py                                 |    8 +-
- tests/test_option.py                             |   10 +-
- tests/test_overrides.py                          |   30 ++--
- tests/test_properties.py                         |   12 +-
- tests/test_pygtkcompat.py                        |    4 -
- tests/test_signal.py                             |    4 +-
- tests/test_source.py                             |    6 +-
+ demos/gtk-demo/demos/Entry/entry_buffer.py       |   2 +-
+ demos/gtk-demo/demos/Entry/entry_completion.py   |   2 +-
+ demos/gtk-demo/demos/Entry/search_entry.py       |  12 +-
+ demos/gtk-demo/demos/Icon View/iconviewbasics.py |   2 +-
+ demos/gtk-demo/demos/Icon View/iconviewedit.py   |   2 +-
+ demos/gtk-demo/demos/Tree View/liststore.py      |   3 +-
+ demos/gtk-demo/demos/appwindow.py                |  13 +-
+ demos/gtk-demo/demos/assistant.py                |   4 +-
+ demos/gtk-demo/demos/builder.py                  |   4 +-
+ demos/gtk-demo/demos/button_box.py               |   2 +-
+ demos/gtk-demo/demos/clipboard.py                |   2 +-
+ demos/gtk-demo/demos/colorselector.py            |   2 +-
+ demos/gtk-demo/demos/combobox.py                 |   4 +-
+ demos/gtk-demo/demos/dialogs.py                  |   4 +-
+ demos/gtk-demo/demos/drawingarea.py              |   2 +-
+ demos/gtk-demo/demos/expander.py                 |   4 +-
+ demos/gtk-demo/demos/images.py                   |   8 +-
+ demos/gtk-demo/demos/infobars.py                 |   2 +-
+ demos/gtk-demo/demos/links.py                    |   2 +-
+ demos/gtk-demo/demos/menus.py                    |   5 +-
+ demos/gtk-demo/demos/pickers.py                  |   2 +-
+ demos/gtk-demo/demos/pixbuf.py                   |   2 +-
+ demos/gtk-demo/demos/printing.py                 |   3 +-
+ demos/gtk-demo/demos/rotatedtext.py              |   6 +-
+ demos/gtk-demo/gtk-demo.py                       |   9 +-
+ examples/cairo-demo.py                           |   2 +-
+ gi/__init__.py                                   |   4 +
+ gi/_glib/__init__.py                             | 101 ++++++++++-
+ gi/_glib/option.py                               |   1 +
+ gi/_gobject/__init__.py                          | 203
+ ++++++++++++++++++++---
+ gi/_gobject/constants.py                         |   2 -
+ gi/_gobject/propertyhelper.py                    |   4 +-
+ gi/importer.py                                   |   2 +-
+ gi/module.py                                     |   1 -
+ gi/overrides/Gtk.py                              |   1 -
+ gi/overrides/__init__.py                         |   1 -
+ gi/pygtkcompat.py                                |   2 +
+ gi/types.py                                      |   3 +
+ tests/Makefile.am                                |   5 +
+ tests/test_everything.py                         |   6 +-
+ tests/test_gi.py                                 |   8 +-
+ tests/test_option.py                             |  10 +-
+ tests/test_overrides.py                          |  30 ++--
+ tests/test_properties.py                         |  12 +-
+ tests/test_pygtkcompat.py                        |   4 -
+ tests/test_signal.py                             |   4 +-
+ tests/test_source.py                             |   6 +-
  47 files changed, 377 insertions(+), 138 deletions(-)
 
 commit 39650906559fcc39b4be406fa7e25c4788d349a3
@@ -4022,10 +6069,10 @@ Date:   Wed Mar 21 16:59:33 2012 +0100
     values).
     For these, warnings/criticals are now explicitly permitted.
 
- tests/runtests.py        |    1 +
- tests/test_gi.py         |    7 ++++++-
- tests/test_overrides.py  |   14 +++++++-------
- tests/test_properties.py |   36 +++++++++++++++++++++---------------
+ tests/runtests.py        |  1 +
+ tests/test_gi.py         |  7 ++++++-
+ tests/test_overrides.py  | 14 +++++++-------
+ tests/test_properties.py | 36 +++++++++++++++++++++---------------
  4 files changed, 35 insertions(+), 23 deletions(-)
 
 commit efcb4b0b32c4dda06c3eeec83802fc0f302f0d27
@@ -4043,8 +6090,8 @@ Date:   Tue Mar 20 14:55:07 2012 +0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=668903
 
- gi/pygi-marshal-from-py.c |    3 ++-
- gi/pygi-marshal-to-py.c   |    3 ++-
+ gi/pygi-marshal-from-py.c | 3 ++-
+ gi/pygi-marshal-to-py.c   | 3 ++-
  2 files changed, 4 insertions(+), 2 deletions(-)
 
 commit 8d85d6639778ec6364235071d272d67e7aae49ae
@@ -4074,8 +6121,8 @@ Date:   Wed Mar 21 14:34:36 2012 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=672463
 
- gi/overrides/Gtk.py     |   26 ++++++++++++++------------
- tests/test_overrides.py |    5 +++++
+ gi/overrides/Gtk.py     | 26 ++++++++++++++------------
+ tests/test_overrides.py |  5 +++++
  2 files changed, 19 insertions(+), 12 deletions(-)
 
 commit 38aecc481741fd3a319a76a0ec8bf5329a483876
@@ -4093,7 +6140,7 @@ Date:   Wed Mar 21 15:21:02 2012 +0100
 
     Fix this by calling close().
 
- tests/test_pygtkcompat.py |    3 ++-
+ tests/test_pygtkcompat.py | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 5e0e5e72a4436badd09f0aa07f62960afcdca8c6
@@ -4104,7 +6151,7 @@ Date:   Mon Mar 19 16:58:22 2012 +0100
 
     Use 3.1.93 for now, this will most likely become 3.2.0 as it is.
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 88924e399d7ccf7af2e9a78720e0c508cd6080d8
@@ -4113,7 +6160,7 @@ Date:   Mon Mar 19 16:41:17 2012 +0100
 
     Release 3.1.92
 
- NEWS |   46 ++++++++++++++++++++++++++++++++++++++++++++++
+ NEWS | 46 ++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 46 insertions(+)
 
 commit b41e6139befb984c0b78bcefe2630ab1393b4b40
@@ -4124,8 +6171,8 @@ Date:   Mon Mar 19 16:14:54 2012 +0100
 
     Also update Martin's email address.
 
- README         |   10 ++++++----
- pygobject.doap |    2 +-
+ README         | 10 ++++++----
+ pygobject.doap |  2 +-
  2 files changed, 7 insertions(+), 5 deletions(-)
 
 commit 45e27ba7e447552057a2950fc768c63ff2e6612e
@@ -4134,7 +6181,7 @@ Date:   Mon Mar 19 16:11:22 2012 +0100
 
     Bump version to 3.1.92, in sync with GNOME
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 77d358f8c5f524259249ea686899e3a4da05562e
@@ -4143,7 +6190,7 @@ Date:   Mon Mar 19 11:54:07 2012 -0300
 
     Correct Gtk.TreePath.__iter__ to work with Python 3
 
- gi/overrides/Gtk.py |    2 +-
+ gi/overrides/Gtk.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 1f18bcb37bdc42368ad9a07c7f348f736c2f665d
@@ -4152,7 +6199,7 @@ Date:   Mon Mar 19 15:54:13 2012 +0100
 
     Fix pygtkcompat.py to work with Python 3
 
- gi/pygtkcompat.py |   20 +++++++++++++++-----
+ gi/pygtkcompat.py | 20 +++++++++++++++-----
  1 file changed, 15 insertions(+), 5 deletions(-)
 
 commit 96a9f92da801989464fbcedf6d849819f6dbea64
@@ -4167,7 +6214,7 @@ Date:   Mon Mar 19 15:32:22 2012 +0100
     is not
     exactly two at the moment.
 
- tests/test_everything.py |    4 ++--
+ tests/test_everything.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit ba00afb1e50759b2b321f16e05a15946053cdafa
@@ -4176,8 +6223,8 @@ Date:   Mon Mar 19 10:58:09 2012 -0300
 
     pygtkcompat: Remove first argument for get_origin()
 
- gi/pygtkcompat.py         |    5 +++++
- tests/test_pygtkcompat.py |    5 +++++
+ gi/pygtkcompat.py         | 5 +++++
+ tests/test_pygtkcompat.py | 5 +++++
  2 files changed, 10 insertions(+)
 
 commit 65499246a862ce6a82bc3b0cc74fe8ff82dde687
@@ -4189,8 +6236,8 @@ Date:   Fri Mar 16 16:08:44 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=672260
 
- gi/overrides/Gtk.py     |   10 ++++++++++
- tests/test_overrides.py |   11 +++++++++++
+ gi/overrides/Gtk.py     | 10 ++++++++++
+ tests/test_overrides.py | 11 +++++++++++
  2 files changed, 21 insertions(+)
 
 commit 43c761d9f35252dcb58b9cf2278016d841eea4ec
@@ -4201,8 +6248,8 @@ Date:   Fri Mar 16 16:08:23 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=672260
 
- gi/overrides/Gtk.py     |   11 +++++++++++
- tests/test_overrides.py |    6 ++++++
+ gi/overrides/Gtk.py     | 11 +++++++++++
+ tests/test_overrides.py |  6 ++++++
  2 files changed, 17 insertions(+)
 
 commit 116d3712251b1b8aa2d4f4a9e40e22f5b9fcbe4f
@@ -4213,8 +6260,8 @@ Date:   Fri Mar 16 16:07:30 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=672260
 
- gi/overrides/Pango.py   |    3 +++
- tests/test_overrides.py |    4 ++++
+ gi/overrides/Pango.py   | 3 +++
+ tests/test_overrides.py | 4 ++++
  2 files changed, 7 insertions(+)
 
 commit a3ca47b086b7fcf084282be788c5d737dde847ac
@@ -4226,8 +6273,8 @@ Date:   Fri Mar 16 16:06:37 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=672260
 
- gi/overrides/Gtk.py     |   15 +++++++++++++++
- tests/test_overrides.py |   14 ++++++++++++++
+ gi/overrides/Gtk.py     | 15 +++++++++++++++
+ tests/test_overrides.py | 14 ++++++++++++++
  2 files changed, 29 insertions(+)
 
 commit 458dab08c78cb730dd95bcd67af20a0d73a3af2f
@@ -4239,8 +6286,8 @@ Date:   Fri Mar 16 16:06:12 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=672260
 
- gi/overrides/Gtk.py     |   10 ++++++++++
- tests/test_overrides.py |    9 ++++++++-
+ gi/overrides/Gtk.py     | 10 ++++++++++
+ tests/test_overrides.py |  9 ++++++++-
  2 files changed, 18 insertions(+), 1 deletion(-)
 
 commit 2f7789a5a1f55ec38c5ff0f96bc5c9023679a333
@@ -4251,8 +6298,8 @@ Date:   Fri Mar 16 16:05:55 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=672260
 
- gi/overrides/Gtk.py     |    3 +++
- tests/test_overrides.py |   11 +++++++++++
+ gi/overrides/Gtk.py     |  3 +++
+ tests/test_overrides.py | 11 +++++++++++
  2 files changed, 14 insertions(+)
 
 commit 2dd9dadd1bd92c3324e9de209ba8205a9d4106d6
@@ -4263,8 +6310,8 @@ Date:   Thu Mar 15 15:22:46 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=672260
 
- gi/overrides/Gtk.py     |    5 +++++
- tests/test_overrides.py |    3 +++
+ gi/overrides/Gtk.py     | 5 +++++
+ tests/test_overrides.py | 3 +++
  2 files changed, 8 insertions(+)
 
 commit bf8c95836e1cc1e1629937cbc69ea3027fb82746
@@ -4294,10 +6341,9 @@ Date:   Thu Mar 15 09:48:10 2012 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=671610
 
- gi/overrides/Gtk.py     |   81
- +++++++++++++++++++++++++++++------------------
- tests/test_overrides.py |   74
- +++++++++++++++++++++++++++++++++++++++++++
+ gi/overrides/Gtk.py     | 81
+ ++++++++++++++++++++++++++++++-------------------
+ tests/test_overrides.py | 74 ++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 124 insertions(+), 31 deletions(-)
 
 commit f7db4eaf8148f2dd8bf1718152a1dcae509470c7
@@ -4312,8 +6358,8 @@ Date:   Sun Mar 18 16:07:26 2012 +0100
 
     Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
 
- gi/overrides/Gtk.py     |    4 +---
- tests/test_overrides.py |    6 ++++++
+ gi/overrides/Gtk.py     | 4 +---
+ tests/test_overrides.py | 6 ++++++
  2 files changed, 7 insertions(+), 3 deletions(-)
 
 commit 466337cf2fd091738eeab12c10d250a9d0827284
@@ -4322,7 +6368,7 @@ Date:   Fri Mar 16 16:55:47 2012 -0300
 
     Correct bad rebase, remove duplicate Window
 
- gi/overrides/Gtk.py |    7 -------
+ gi/overrides/Gtk.py | 7 -------
  1 file changed, 7 deletions(-)
 
 commit c60d5ee3c88bd8e1c68ea97f079947cf79d5bb7d
@@ -4336,11 +6382,11 @@ Date:   Thu Mar 15 15:42:28 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=653462
 
- gi/Makefile.am            |    3 +-
- gi/pygtkcompat.py         |  421
- +++++++++++++++++++++++++++++++++++++++++++++
- tests/Makefile.am         |    3 +-
- tests/test_pygtkcompat.py |   77 +++++++++
+ gi/Makefile.am            |   3 +-
+ gi/pygtkcompat.py         | 421
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ tests/Makefile.am         |   3 +-
+ tests/test_pygtkcompat.py |  77 +++++++++
  4 files changed, 502 insertions(+), 2 deletions(-)
 
 commit 680a2e04ac4f80ad16e820d3f753519477c988aa
@@ -4355,7 +6401,7 @@ Date:   Wed Mar 14 15:20:53 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=672087
 
- gi/overrides/Gtk.py |    8 +++++++-
+ gi/overrides/Gtk.py | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 commit fbd21ee7176bc1b70547ea464b512c8ffd674187
@@ -4366,8 +6412,8 @@ Date:   Wed Mar 14 17:13:04 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=672093
 
- gi/overrides/Gtk.py     |    3 +++
- tests/test_overrides.py |    2 ++
+ gi/overrides/Gtk.py     | 3 +++
+ tests/test_overrides.py | 2 ++
  2 files changed, 5 insertions(+)
 
 commit a7b08cb75541612c78d123b1d968be7874e3c481
@@ -4378,7 +6424,7 @@ Date:   Wed Mar 14 13:32:31 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=672081
 
- gi/overrides/Gtk.py |   14 ++++++++++++++
+ gi/overrides/Gtk.py | 14 ++++++++++++++
  1 file changed, 14 insertions(+)
 
 commit 02950cabb38b1b3c9378c42c069eefdbccbce17d
@@ -4391,8 +6437,8 @@ Date:   Wed Mar 14 13:31:41 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=672081
 
- gi/overrides/Gtk.py     |    4 ++++
- tests/test_overrides.py |   10 ++++++++++
+ gi/overrides/Gtk.py     |  4 ++++
+ tests/test_overrides.py | 10 ++++++++++
  2 files changed, 14 insertions(+)
 
 commit 7245bd0ae3f6243c79fa8543a0ed1e50e5015844
@@ -4403,7 +6449,7 @@ Date:   Wed Mar 14 13:31:06 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=672081
 
- gi/overrides/Pango.py |    9 +++++++++
+ gi/overrides/Pango.py | 9 +++++++++
  1 file changed, 9 insertions(+)
 
 commit bc1fd8814df6c1e85b586d0fb943c89f7e2b78b5
@@ -4423,7 +6469,7 @@ Date:   Fri Mar 16 13:27:56 2012 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=672224
 
- gi/pygi-marshal-from-py.c |    7 ++++++-
+ gi/pygi-marshal-from-py.c | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 commit a906b7d1947ba905f959d3f738eb6c29b02f96e7
@@ -4442,12 +6488,12 @@ Date:   Fri Mar 16 00:29:31 2012 -0700
 
     Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
 
- examples/properties.py        |    6 +--
- gi/_gobject/__init__.py       |    7 +--
- gi/_gobject/propertyhelper.py |   12 +++---
- tests/test_interface.py       |    4 +-
- tests/test_properties.py      |   94
- ++++++++++++++++++++---------------------
+ examples/properties.py        |  6 +--
+ gi/_gobject/__init__.py       |  7 ++--
+ gi/_gobject/propertyhelper.py | 12 +++---
+ tests/test_interface.py       |  4 +-
+ tests/test_properties.py      | 94
+ +++++++++++++++++++++----------------------
  5 files changed, 62 insertions(+), 61 deletions(-)
 
 commit d7d28d717e38c0546529b09b8b571a5cc631c5b5
@@ -4480,9 +6526,9 @@ Date:   Wed Mar 14 22:52:47 2012 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=672065
 
- gi/pygi-marshal-cleanup.c |   19 ++++++++++++++-----
- gi/pygi-marshal-from-py.c |   13 ++++++++++++-
- tests/test_gi.py          |    8 ++++++++
+ gi/pygi-marshal-cleanup.c | 19 ++++++++++++++-----
+ gi/pygi-marshal-from-py.c | 13 ++++++++++++-
+ tests/test_gi.py          |  8 ++++++++
  3 files changed, 34 insertions(+), 6 deletions(-)
 
 commit 27ac9c1de6487035b18ef4511c155d251cb6d39d
@@ -4507,9 +6553,9 @@ Date:   Fri Mar 16 09:59:57 2012 +0100
 
     Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
 
- gi/overrides/Gtk.py     |   56
- +++++++++++++++++++++++------------------------
- tests/test_overrides.py |   35 +++++++++++++++++++++++++++--
+ gi/overrides/Gtk.py     | 56
+ ++++++++++++++++++++++++-------------------------
+ tests/test_overrides.py | 35 +++++++++++++++++++++++++++++--
  2 files changed, 61 insertions(+), 30 deletions(-)
 
 commit 77ab27ab8a580d98f76730f075e083e1e870f55e
@@ -4542,10 +6588,10 @@ Date:   Tue Mar 13 01:41:53 2012 -0700
 
     Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
 
- gi/_gobject/__init__.py       |   10 +++----
- gi/_gobject/propertyhelper.py |   59
- ++++++++++++++++++++++++++++++-----------
- tests/test_properties.py      |   41 ++++++++++++++++++++++++++++
+ gi/_gobject/__init__.py       | 10 ++++----
+ gi/_gobject/propertyhelper.py | 59
+ +++++++++++++++++++++++++++++++------------
+ tests/test_properties.py      | 41 ++++++++++++++++++++++++++++++
  3 files changed, 89 insertions(+), 21 deletions(-)
 
 commit 174a61fb3149c07dab5cc35e64825922cdefcb95
@@ -4558,7 +6604,7 @@ Date:   Tue Mar 13 17:10:13 2012 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=672045
 
- gi/overrides/Gtk.py |   17 +++++++++++++++++
+ gi/overrides/Gtk.py | 17 +++++++++++++++++
  1 file changed, 17 insertions(+)
 
 commit 7746d2188ac4933c2c9011d84525d1e62fc18953
@@ -4571,9 +6617,9 @@ Date:   Fri Mar 9 12:26:53 2012 +0100
 
     Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
 
- gi/pygi-argument.c        |   25 ++++++++++++++++---------
- gi/pygi-marshal-from-py.c |   32 +++++++++++++++++++++++++-------
- gi/pygi-marshal-to-py.c   |   19 +++++++++++++++++++
+ gi/pygi-argument.c        | 25 ++++++++++++++++---------
+ gi/pygi-marshal-from-py.c | 32 +++++++++++++++++++++++++-------
+ gi/pygi-marshal-to-py.c   | 19 +++++++++++++++++++
  3 files changed, 60 insertions(+), 16 deletions(-)
 
 commit 0591cc6f160ae6e9d8c3970934ae105ef340d7d3
@@ -4591,12 +6637,12 @@ Date:   Thu Mar 8 12:21:28 2012 +0100
     Signed-off-by: Michel Dänzer <michel@daenzer.net>
     Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
 
- configure.ac                 |    3 +-
- gi/_gobject/Makefile.am      |    7 +-
- gi/_gobject/ffi-marshaller.c |  194
- ------------------------------------------
- gi/_gobject/ffi-marshaller.h |   31 -------
- gi/_gobject/gobjectmodule.c  |   12 +--
+ configure.ac                 |   3 +-
+ gi/_gobject/Makefile.am      |   7 +-
+ gi/_gobject/ffi-marshaller.c | 194
+ -------------------------------------------
+ gi/_gobject/ffi-marshaller.h |  31 -------
+ gi/_gobject/gobjectmodule.c  |  12 +--
  5 files changed, 4 insertions(+), 243 deletions(-)
 
 commit 8ca828825a2c47080055c5f986979aac8da9a93f
@@ -4609,7 +6655,7 @@ Date:   Mon Mar 5 21:10:55 2012 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=671409
 
- gi/overrides/Gtk.py |    5 +++++
+ gi/overrides/Gtk.py | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 4824ceaa77b59788325a2c1ee0f994d4e74d7a1c
@@ -4621,7 +6667,7 @@ Date:   Sun Mar 4 16:41:18 2012 +0100
     When we found the member, unref the objects before breaking out of the
     loop.
 
- gi/pygi-marshal-from-py.c |    9 +++------
+ gi/pygi-marshal-from-py.c | 9 +++------
  1 file changed, 3 insertions(+), 6 deletions(-)
 
 commit c6ae29ac157978a61b11cc2de9e8485d8a175105
@@ -4630,7 +6676,7 @@ Date:   Tue Feb 21 15:37:18 2012 +0100
 
     tests: Split TestInterfaces into separate tests
 
- tests/test_gi.py |   36 +++++++++++++++++++-----------------
+ tests/test_gi.py | 36 +++++++++++++++++++-----------------
  1 file changed, 19 insertions(+), 17 deletions(-)
 
 commit de3299818ae5fdf1c7abbe05a36bfd5cdface7b8
@@ -4639,7 +6685,7 @@ Date:   Mon Feb 20 19:37:32 2012 +0100
 
     Post release version bump to 3.1.2
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit fd020e783c0dacea3320225b4ddd57d6a0fce7ea
@@ -4648,7 +6694,7 @@ Date:   Mon Feb 20 19:33:56 2012 +0100
 
     Prepare 3.1.1 release
 
- NEWS |   18 ++++++++++++++++++
+ NEWS | 18 ++++++++++++++++++
  1 file changed, 18 insertions(+)
 
 commit 99485d96811667ef7a7a393b68b7361733157d61
@@ -4657,7 +6703,7 @@ Date:   Sat Feb 18 00:38:05 2012 +0100
 
     Don't use C99 style
 
- gi/pygi-cache.c |    3 ++-
+ gi/pygi-cache.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 0739c39f6282d95fc17ee406fa1151d074b0450d
@@ -4673,7 +6719,7 @@ Date:   Thu Feb 16 16:42:53 2012 +0100
     internally, but at least we can verify that it does not crash due to
     double-free.
 
- tests/test_everything.py |   10 +++++++++-
+ tests/test_everything.py | 10 +++++++++-
  1 file changed, 9 insertions(+), 1 deletion(-)
 
 commit 087a104f66793a981a0c02f1c7ab9cc1cf659da3
@@ -4684,7 +6730,7 @@ Date:   Wed Feb 15 13:36:39 2012 +0100
 
     Not necessary any more since glib 2.24, and we depend on 2.31.
 
- gi/_glib/pyglib.c |    3 ---
+ gi/_glib/pyglib.c | 3 ---
  1 file changed, 3 deletions(-)
 
 commit 66fb610e45912a7def29e5848577d280ef55643a
@@ -4697,7 +6743,7 @@ Date:   Wed Feb 15 13:35:33 2012 +0100
     documentation. This also
     simplifies the code.
 
- gi/_glib/pygsource.c |    4 +---
+ gi/_glib/pygsource.c | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 commit 18342edded05d3d9cccf648ed92bc1cac95c51eb
@@ -4708,9 +6754,9 @@ Date:   Wed Feb 15 13:31:23 2012 +0100
 
     Replace with _schar(). We depend on glib >= 2.31 already.
 
- gi/_gobject/ffi-marshaller.c |    2 +-
- gi/_gobject/pygtype.c        |    6 +++---
- gi/pygi-argument.c           |    2 +-
+ gi/_gobject/ffi-marshaller.c | 2 +-
+ gi/_gobject/pygtype.c        | 6 +++---
+ gi/pygi-argument.c           | 2 +-
  3 files changed, 5 insertions(+), 5 deletions(-)
 
 commit 3dfb8dcbe7cf09dc170433fc48d3273c6ea9448e
@@ -4722,7 +6768,7 @@ Date:   Thu Feb 2 19:06:01 2012 +0100
     Looking at the gir file gtk.gdk.x11_* should get converted to
     GdkX11.x11_*. Fixing pygiconvert.sh to do so.
 
- pygi-convert.sh |    2 +-
+ pygi-convert.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 3af5016978df598d5fd1c225cc49bb2c04dc4e35
@@ -4733,7 +6779,7 @@ Date:   Fri Feb 10 13:29:41 2012 +0100
 
     Commit ee62df4d2fc0cc63c2f29d3ad9b47b875dbd5f89 introduced both calls
 
- configure.ac |    6 +++---
+ configure.ac | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 50c3b1bad3ea79750649f4b48fce0adbfaba5268
@@ -4744,7 +6790,7 @@ Date:   Fri Feb 10 09:28:36 2012 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=649267
 
- gi/_gobject/pygparamspec.c |    2 +-
+ gi/_gobject/pygparamspec.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 6ab542fb3ec1031922ba65664d77bbaac0df453e
@@ -4755,8 +6801,8 @@ Date:   Mon Nov 14 14:41:08 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=664496
 
- pygi-convert.sh |   76
- +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ pygi-convert.sh | 76
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 76 insertions(+)
 
 commit 4aeb27efc43e131de5d0bc0f60dca7c1d34c3d45
@@ -4769,9 +6815,9 @@ Date:   Fri Feb 10 09:04:18 2012 +0100
 
     Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
 
- gi/pygi-argument.c       |    3 ++-
- gi/pygi-info.c           |   13 +++++++++++++
- tests/test_everything.py |   21 +++++++++++++++++++++
+ gi/pygi-argument.c       |  3 ++-
+ gi/pygi-info.c           | 13 +++++++++++++
+ tests/test_everything.py | 21 +++++++++++++++++++++
  3 files changed, 36 insertions(+), 1 deletion(-)
 
 commit 5c0b20cc1a261cb7430a5251dffe60da698033b5
@@ -4782,7 +6828,7 @@ Date:   Thu Feb 9 18:15:42 2012 +0100
 
     Use what was recently added in g-i
 
- tests/test_gi.py |   17 +++++++++++++++--
+ tests/test_gi.py | 17 +++++++++++++++--
  1 file changed, 15 insertions(+), 2 deletions(-)
 
 commit ea7778f6f37a6fc38f88d89d4b6cae8be0ed9753
@@ -4793,7 +6839,7 @@ Date:   Thu Feb 9 18:14:52 2012 +0100
 
     Also tidy up the spacing a bit
 
- tests/test_gi.py |   29 +++++++++++++++++++++++------
+ tests/test_gi.py | 29 +++++++++++++++++++++++------
  1 file changed, 23 insertions(+), 6 deletions(-)
 
 commit db7f9be319d3cf52aef300fbac60cabb7ff57276
@@ -4802,7 +6848,7 @@ Date:   Wed Feb 8 22:23:30 2012 +0100
 
     Add unit test for builder's connect_after
 
- tests/test_overrides.py |    8 ++++++++
+ tests/test_overrides.py | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 commit 671f9b0dd73ac41a84caf9d1f04cec351bc01b47
@@ -4817,7 +6863,7 @@ Date:   Wed Feb 8 16:06:22 2012 -0500
 
     https://bugzilla.gnome.org/show_bug.cgi?id=669705
 
- gi/overrides/Gtk.py |    2 +-
+ gi/overrides/Gtk.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 1d23d8006be98b77a0134fddd23b76df05e489fa
@@ -4828,7 +6874,7 @@ Date:   Tue Feb 7 11:49:58 2012 +0000
 
     https://bugzilla.gnome.org/show_bug.cgi?id=669598
 
- m4/python.m4 |    6 +++---
+ m4/python.m4 | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 945fd18e531c2131440af93dcd89f6c63abbfd7c
@@ -4851,7 +6897,7 @@ Date:   Tue Feb 7 13:42:19 2012 -0500
 
     https://bugzilla.gnome.org/show_bug.cgi?id=669594
 
- gi/_glib/pygspawn.c |    4 ++--
+ gi/_glib/pygspawn.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 8fc969c45d6d720400dc6c9ef391d0ca93f14b5a
@@ -4860,7 +6906,7 @@ Date:   Mon Feb 6 19:15:53 2012 +0100
 
     Post release version bump to 3.1.1
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f76b2fe6d37be76bf129ee2adee90b2cc0eee56e
@@ -4869,7 +6915,7 @@ Date:   Mon Feb 6 19:11:52 2012 +0100
 
     Prepare 3.1.0 release
 
- NEWS |   34 ++++++++++++++++++++++++++++++++++
+ NEWS | 34 ++++++++++++++++++++++++++++++++++
  1 file changed, 34 insertions(+)
 
 commit c09d0dffc5a570d5ae4df1ae07b2e5594c3ca1bf
@@ -4881,8 +6927,8 @@ Date:   Mon Feb 6 19:04:41 2012 +0100
 
     Removed obsolete MAINTAINERS file
 
- MAINTAINERS    |   19 -------------------
- pygobject.doap |   44 +++++++++++++++-----------------------------
+ MAINTAINERS    | 19 -------------------
+ pygobject.doap | 44 +++++++++++++++-----------------------------
  2 files changed, 15 insertions(+), 48 deletions(-)
 
 commit 0285e107be581c4d594127dc06cd05df1f02fb3f
@@ -4897,9 +6943,9 @@ Date:   Mon Feb 6 18:57:01 2012 +0100
     Due to this commit breaking backwards compatability, we decided to
     revert this change
 
- gi/overrides/Gtk.py     |   15 ---------------
- tests/compathelper.py   |    2 --
- tests/test_overrides.py |   31 +------------------------------
+ gi/overrides/Gtk.py     | 15 ---------------
+ tests/compathelper.py   |  2 --
+ tests/test_overrides.py | 31 +------------------------------
  3 files changed, 1 insertion(+), 47 deletions(-)
 
 commit 0e921cd26ed5a6e3bc6ef5f553e8b22b862d72a6
@@ -4908,7 +6954,7 @@ Date:   Sun Feb 5 13:47:10 2012 +0100
 
     tests: Fixed issues with python3
 
- tests/test_gi.py |    9 ++++++---
+ tests/test_gi.py | 9 ++++++---
  1 file changed, 6 insertions(+), 3 deletions(-)
 
 commit ee62df4d2fc0cc63c2f29d3ad9b47b875dbd5f89
@@ -4919,9 +6965,9 @@ Date:   Sun Feb 5 11:59:51 2012 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=664150
 
- gi/pygi-property.c |   48 ++++++++++++++++++++++++++++++++++++----
- tests/test_gi.py   |   62
- ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ gi/pygi-property.c | 48 ++++++++++++++++++++++++++++++++++++++----
+ tests/test_gi.py   | 62
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 106 insertions(+), 4 deletions(-)
 
 commit c329bf2aee8d75ce452638db75e09197ff2b9b65
@@ -4935,7 +6981,7 @@ Date:   Sun Feb 5 11:46:21 2012 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=669393
 
- gi/pygi-marshal-cleanup.c |   32 +++++++++++++++++++++++---------
+ gi/pygi-marshal-cleanup.c | 32 +++++++++++++++++++++++---------
  1 file changed, 23 insertions(+), 9 deletions(-)
 
 commit 4ea37c606f67df843788261b2c8acd6bac4c1e0c
@@ -4949,7 +6995,7 @@ Date:   Sun Feb 5 18:51:53 2012 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=669415
 
- tests/test_everything.py |    9 +++++++++
+ tests/test_everything.py | 9 +++++++++
  1 file changed, 9 insertions(+)
 
 commit a41984780ee49dcf02c718ca1be87bba747472e5
@@ -4968,7 +7014,7 @@ Date:   Mon Feb 6 09:34:28 2012 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=669415
 
- gi/_glib/pyglib.c |    2 ++
+ gi/_glib/pyglib.c | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 2c797c17913999379e277788d5e4cce8d68cebb0
@@ -4979,7 +7025,7 @@ Date:   Sat Feb 4 16:11:34 2012 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=663288
 
- tests/Makefile.am |    1 +
+ tests/Makefile.am | 1 +
  1 file changed, 1 insertion(+)
 
 commit d6a899cdf70e978534326155e3fad75a705f4b20
@@ -4991,7 +7037,7 @@ Date:   Sat Feb 4 15:55:55 2012 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=665553
 
- gi/overrides/Gtk.py |    6 ++----
+ gi/overrides/Gtk.py | 6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)
 
 commit 534ec71c575a279ff1c05da20a8858bb1145b4d0
@@ -5006,8 +7052,8 @@ Date:   Sat Feb 4 15:42:36 2012 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=647723
 
- gi/overrides/GLib.py    |   18 ++++++++++++++++++
- tests/test_overrides.py |   45
+ gi/overrides/GLib.py    | 18 ++++++++++++++++++
+ tests/test_overrides.py | 45
  +++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 63 insertions(+)
 
@@ -5024,9 +7070,9 @@ Date:   Sat Feb 4 15:41:08 2012 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=647725
 
- gi/overrides/GLib.py    |   23 +++++++++++++++++++
- tests/test_overrides.py |   56
- +++++++++++++++++++++++++++++++++++++++++++++++
+ gi/overrides/GLib.py    | 23 ++++++++++++++++++++
+ tests/test_overrides.py | 56
+ +++++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 79 insertions(+)
 
 commit f82404034be042bf2026bbb7f1e33b11d6e17a6f
@@ -5041,7 +7087,7 @@ Date:   Wed Jan 25 07:01:06 2012 +0100
     other test
     case names.
 
- tests/test_everything.py |   30 +++++++++++++++---------------
+ tests/test_everything.py | 30 +++++++++++++++---------------
  1 file changed, 15 insertions(+), 15 deletions(-)
 
 commit e37ee78fbf0aa72159a40da4165a26bea065faf1
@@ -5054,7 +7100,7 @@ Date:   Mon Jan 23 13:10:30 2012 +0000
 
     https://bugzilla.gnome.org/show_bug.cgi?id=668497
 
- gi/pygi-foreign-cairo.c |    2 +-
+ gi/pygi-foreign-cairo.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit db24865d6b60351d72f5b8f47103d6d0a6c63b2e
@@ -5067,7 +7113,7 @@ Date:   Mon Jan 23 13:06:41 2012 +0000
 
     https://bugzilla.gnome.org/show_bug.cgi?id=668497
 
- gi/_gobject/gobjectmodule.c |    2 +-
+ gi/_gobject/gobjectmodule.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a8408cfd68cd5e7cdb0b8a83e107d9a0d828e4bd
@@ -5087,10 +7133,10 @@ Date:   Mon Jan 23 13:01:27 2012 +0000
 
     https://bugzilla.gnome.org/show_bug.cgi?id=668497
 
- gi/_glib/pygiochannel.c   |    2 +-
- gi/_glib/pygmainloop.c    |    3 +--
- gi/_gobject/pygobject.c   |    2 +-
- gi/pygi-marshal-cleanup.c |    2 --
+ gi/_glib/pygiochannel.c   | 2 +-
+ gi/_glib/pygmainloop.c    | 3 +--
+ gi/_gobject/pygobject.c   | 2 +-
+ gi/pygi-marshal-cleanup.c | 2 --
  4 files changed, 3 insertions(+), 6 deletions(-)
 
 commit 29a30490ed51e347e8f57d2bf9af69400734eee8
@@ -5105,7 +7151,7 @@ Date:   Thu Jan 19 18:09:07 2012 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=668288
 
- gi/_glib/pygmainloop.c |    4 ++--
+ gi/_glib/pygmainloop.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 557a61c12c01137a0d7c679c4b053973df09d445
@@ -5118,7 +7164,7 @@ Date:   Mon Dec 26 00:44:56 2011 -0500
 
     https://bugzilla.gnome.org/show_bug.cgi?id=666852
 
- tests/test_gi.py |    4 ++--
+ tests/test_gi.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit d69e5b3c7bdb9113382fd125c256b12bff4c24d2
@@ -5135,7 +7181,7 @@ Date:   Mon Jan 23 12:37:26 2012 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=666270
 
- gi/pygi-argument.c |   12 +++++++++++-
+ gi/pygi-argument.c | 12 +++++++++++-
  1 file changed, 11 insertions(+), 1 deletion(-)
 
 commit 77f32d9110bfeb6dad8457f565b4c70b5998fef6
@@ -5154,8 +7200,8 @@ Date:   Thu Dec 15 16:12:01 2011 +0200
 
     Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
 
- gi/pygi-closure.c        |    2 ++
- tests/test_everything.py |   35 +++++++++++++++++++++++++++++++++++
+ gi/pygi-closure.c        |  2 ++
+ tests/test_everything.py | 35 +++++++++++++++++++++++++++++++++++
  2 files changed, 37 insertions(+)
 
 commit 4b9dc03d0e49e9a1f4bf0f2df503bdff00d13a2b
@@ -5173,7 +7219,7 @@ Date:   Mon Jan 23 13:56:02 2012 +0000
 
     https://bugzilla.gnome.org/show_bug.cgi?id=666098
 
- gi/_glib/pyglib.c |    3 +++
+ gi/_glib/pyglib.c | 3 +++
  1 file changed, 3 insertions(+)
 
 commit adcfe96d49b09bcc550653d73de196610fd5144d
@@ -5198,11 +7244,11 @@ Date:   Fri Jan 20 16:20:10 2012 +0000
 
     https://bugzilla.gnome.org/show_bug.cgi?id=666098
 
- gi/_glib/pyglib.c       |   46
+ gi/_glib/pyglib.c       | 46
  +++++++++++++++++++++++++++++++++++-----------
- gi/_glib/pyglib.h       |    1 +
- gi/pygi-marshal-to-py.c |   16 +++++++++++++---
- tests/test_gi.py        |   32 ++++++++++++++++++++++++++++++++
+ gi/_glib/pyglib.h       |  1 +
+ gi/pygi-marshal-to-py.c | 16 +++++++++++++---
+ tests/test_gi.py        | 32 ++++++++++++++++++++++++++++++++
  4 files changed, 81 insertions(+), 14 deletions(-)
 
 commit 09f003729eac9d553a208c343c2a14d253b77d9a
@@ -5215,7 +7261,7 @@ Date:   Mon Jan 23 12:42:21 2012 +0200
 
     Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
 
- gi/pygi-argument.c |   26 +++++++++++++-------------
+ gi/pygi-argument.c | 26 +++++++++++++-------------
  1 file changed, 13 insertions(+), 13 deletions(-)
 
 commit c71c010be01d706f90bc200194325fd82f4071b2
@@ -5224,7 +7270,7 @@ Date:   Sat Jan 14 14:24:23 2012 +0100
 
     Avoid C99 syntax.
 
- gi/gimodule.c |   10 ++++++----
+ gi/gimodule.c | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)
 
 commit c299d058c22385ececaec64c872d1dd1bc1ae17a
@@ -5233,7 +7279,7 @@ Date:   Fri Jan 6 13:39:31 2012 +0100
 
     Connect to first action of a radio group.
 
- gi/overrides/Gtk.py |    4 ++--
+ gi/overrides/Gtk.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit dee2f179037902a3883bd0e61ff1c350e1fd8a4f
@@ -5242,7 +7288,7 @@ Date:   Wed Jan 4 16:40:51 2012 +0100
 
     Use g_slist_free_full in pygi-closure.
 
- gi/pygi-closure.c |    3 +--
+ gi/pygi-closure.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit 2bee4207ab6f07dc9c0952affe72f0e304cfb624
@@ -5257,7 +7303,7 @@ Date:   Wed Jan 4 15:24:13 2012 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=667261
 
- gi/pygi-marshal-from-py.c |    8 ++++----
+ gi/pygi-marshal-from-py.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit d68455e99b1a9ebba31209b17a11317b1958678b
@@ -5268,8 +7314,8 @@ Date:   Tue Jan 3 16:57:40 2012 +0100
 
     Treat NULL as an empty array and add the corresponding testcase
 
- gi/pygi-marshal-to-py.c |    9 +++++----
- tests/test_gi.py        |    3 +++
+ gi/pygi-marshal-to-py.c | 9 +++++----
+ tests/test_gi.py        | 3 +++
  2 files changed, 8 insertions(+), 4 deletions(-)
 
 commit e3451b8e6018bb76e9992fb6af24a71725de5cfd
@@ -5278,7 +7324,7 @@ Date:   Fri Dec 23 12:01:43 2011 +0100
 
     Branching, bump version to 3.1.0
 
- configure.ac |    4 ++--
+ configure.ac | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 8d1a36cc73f5f4df091ecb289c8a7b38ec2ab605
@@ -5287,7 +7333,7 @@ Date:   Mon Dec 12 18:35:30 2011 +0100
 
     Add notes about branching to HACKING
 
- HACKING |   10 ++++++++++
+ HACKING | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
 commit 00030bc6f0fb961c716ed692144cd8e4bb9be7d0
@@ -5299,8 +7345,8 @@ Date:   Sat Dec 10 12:51:45 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=664864
 
- gi/_gobject/propertyhelper.py |    2 +-
- tests/test_properties.py      |   31 +++++++++++++++++++++++++++++++
+ gi/_gobject/propertyhelper.py |  2 +-
+ tests/test_properties.py      | 31 +++++++++++++++++++++++++++++++
  2 files changed, 32 insertions(+), 1 deletion(-)
 
 commit 7b78abc6c399abd0daa4c11c644d107e1bb7b452
@@ -5309,7 +7355,7 @@ Date:   Mon Dec 12 17:00:24 2011 +0100
 
     Remove mention of removed option --enable-docs
 
- HACKING |    2 +-
+ HACKING | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 4cba52f5b5e79b7b6212cb0795e8976a9da9f21d
@@ -5318,7 +7364,7 @@ Date:   Mon Dec 12 17:00:03 2011 +0100
 
     Fix sebp's name in NEWS
 
- NEWS |    2 +-
+ NEWS | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 8c95981d0ba224a577f87998030c384b3dae3d80
@@ -5327,7 +7373,7 @@ Date:   Mon Dec 12 16:20:09 2011 +0100
 
     Release 3.0.3
 
- NEWS |   15 +++++++++++++++
+ NEWS | 15 +++++++++++++++
  1 file changed, 15 insertions(+)
 
 commit 58e47fd28c5d75bb78042c8f9eb5aae84de9c64d
@@ -5336,7 +7382,7 @@ Date:   Mon Dec 12 16:16:44 2011 +0100
 
     Pre-release version bump
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 884468d4816fc976c0c0c72651e7f81d13f3f78b
@@ -5347,7 +7393,7 @@ Date:   Thu Dec 1 11:50:38 2011 -0300
 
     Signed-off-by: Manuel Quiñones <manuq@laptop.org>
 
- pygi-convert.sh |   14 ++++++++++++++
+ pygi-convert.sh | 14 ++++++++++++++
  1 file changed, 14 insertions(+)
 
 commit 654711d0f940d7480d0f1cdb25a3dc9996f7a706
@@ -5358,9 +7404,9 @@ Date:   Tue Nov 8 12:38:12 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=663610
 
- gi/overrides/Gtk.py     |   15 +++++++++++++++
- tests/compathelper.py   |    2 ++
- tests/test_overrides.py |   31 ++++++++++++++++++++++++++++++-
+ gi/overrides/Gtk.py     | 15 +++++++++++++++
+ tests/compathelper.py   |  2 ++
+ tests/test_overrides.py | 31 ++++++++++++++++++++++++++++++-
  3 files changed, 47 insertions(+), 1 deletion(-)
 
 commit 4f637212f13b197a95c824967a58496b9e3b877c
@@ -5369,7 +7415,7 @@ Date:   Wed Nov 2 14:51:24 2011 -0400
 
     add test for bytearray variants
 
- tests/test_gi.py |    4 ++++
+ tests/test_gi.py | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 20ca3f129d6cc662285cce8c732b55596016aefa
@@ -5378,7 +7424,7 @@ Date:   Wed Nov 2 14:50:42 2011 -0400
 
     handle NULL arrays correctly for each array type
 
- gi/pygi-marshal-to-py.c |   11 ++++++-----
+ gi/pygi-marshal-to-py.c | 11 ++++++-----
  1 file changed, 6 insertions(+), 5 deletions(-)
 
 commit ce2f780bffe44b1d4de617dcbce4b90c58b03c18
@@ -5389,8 +7435,8 @@ Date:   Wed Nov 2 14:17:21 2011 -0400
 
     This reverts commit cfda820e8d9604c5ef2ad1161c22b20080d5daf4.
 
- gi/pygi-marshal-from-py.c |    6 +++++-
- gi/pygi-marshal-to-py.c   |    8 +++++++-
+ gi/pygi-marshal-from-py.c | 6 +++++-
+ gi/pygi-marshal-to-py.c   | 8 +++++++-
  2 files changed, 12 insertions(+), 2 deletions(-)
 
 commit 832f16f96815adc22cc3acbeb3fa969631795a29
@@ -5406,7 +7452,7 @@ Date:   Sun Oct 30 18:08:57 2011 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=663068
 
- gi/_glib/pygmainloop.c |    5 ++++-
+ gi/_glib/pygmainloop.c | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit 2fd3aa9d4ca0906a5e609845ee500ba72e358f94
@@ -5417,8 +7463,8 @@ Date:   Sat Oct 29 15:08:03 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=662994
 
- gi/types.py      |   22 +++++++++++++---------
- tests/test_gi.py |   20 ++++++++++----------
+ gi/types.py      | 22 +++++++++++++---------
+ tests/test_gi.py | 20 ++++++++++----------
  2 files changed, 23 insertions(+), 19 deletions(-)
 
 commit cfda820e8d9604c5ef2ad1161c22b20080d5daf4
@@ -5429,8 +7475,8 @@ Date:   Wed Nov 2 14:54:21 2011 +0100
 
     This reverts commit eef35b2df8023ffff2d195ee16c084f5cfcb6ba3.
 
- gi/pygi-marshal-from-py.c |    6 +-----
- gi/pygi-marshal-to-py.c   |    8 +-------
+ gi/pygi-marshal-from-py.c | 6 +-----
+ gi/pygi-marshal-to-py.c   | 8 +-------
  2 files changed, 2 insertions(+), 12 deletions(-)
 
 commit eef35b2df8023ffff2d195ee16c084f5cfcb6ba3
@@ -5448,8 +7494,8 @@ Date:   Sun Oct 30 16:36:32 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=662550
 
- gi/pygi-marshal-from-py.c |    6 +++++-
- gi/pygi-marshal-to-py.c   |    8 +++++++-
+ gi/pygi-marshal-from-py.c | 6 +++++-
+ gi/pygi-marshal-to-py.c   | 8 +++++++-
  2 files changed, 12 insertions(+), 2 deletions(-)
 
 commit 4c1d9f01b8fa6702f73b290180f934250e179caa
@@ -5458,7 +7504,7 @@ Date:   Sun Oct 30 09:20:45 2011 +0000
 
     pygi-convert: fix for Pango.Alignment
 
- pygi-convert.sh |    1 +
+ pygi-convert.sh | 1 +
  1 file changed, 1 insertion(+)
 
 commit e3abd76096cc9f335681c7225f452c286b9c59e2
@@ -5467,7 +7513,7 @@ Date:   Sun Oct 30 07:06:57 2011 +0000
 
     pygi-convert: fix for Gtk.Orientation
 
- pygi-convert.sh |    1 +
+ pygi-convert.sh | 1 +
  1 file changed, 1 insertion(+)
 
 commit 52b82c5f78ef3755388457fa9440c36ccd2dfbbf
@@ -5483,7 +7529,7 @@ Date:   Thu Oct 27 07:16:24 2011 +0200
     this as EXFAIL
     for now. (See https://bugzilla.gnome.org/show_bug.cgi?id=656554)
 
- tests/test_everything.py |   24 ++++++++++++++++++++++++
+ tests/test_everything.py | 24 ++++++++++++++++++++++++
  1 file changed, 24 insertions(+)
 
 commit c7aa0e79dfb4c1092c51ae1464b8414083b4f3fc
@@ -5506,12 +7552,12 @@ Date:   Tue Oct 4 12:28:26 2011 +0200
 
     Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
 
- gi/pygi-cache.c           |    2 +-
- gi/pygi-marshal-cleanup.c |   81
- +++++++++++++++++++++++++++++----------------
- gi/pygi-marshal-from-py.c |   10 ++++--
- gi/pygi-marshal-to-py.c   |   13 ++++++--
- tests/test_gi.py          |   14 +++++++-
+ gi/pygi-cache.c           |  2 +-
+ gi/pygi-marshal-cleanup.c | 81
+ ++++++++++++++++++++++++++++++-----------------
+ gi/pygi-marshal-from-py.c | 10 ++++--
+ gi/pygi-marshal-to-py.c   | 13 ++++++--
+ tests/test_gi.py          | 14 +++++++-
  5 files changed, 85 insertions(+), 35 deletions(-)
 
 commit c2ec4d8eb46ae2e6ee4372b2a4f9d5df0e5d82f3
@@ -5520,7 +7566,7 @@ Date:   Sat Oct 22 00:20:57 2011 +0200
 
     Release 3.0.2
 
- NEWS |    8 ++++++++
+ NEWS | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 commit 5c24760b797e985721f7fe51d52252e4dd54a417
@@ -5537,8 +7583,8 @@ Date:   Fri Oct 21 17:31:41 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=662383
 
- gi/pygi-invoke.c         |   10 ++++++++++
- tests/test_everything.py |    8 ++++++++
+ gi/pygi-invoke.c         | 10 ++++++++++
+ tests/test_everything.py |  8 ++++++++
  2 files changed, 18 insertions(+)
 
 commit 585222915dc98b0e375de3db4771466278a32e81
@@ -5551,8 +7597,8 @@ Date:   Tue Oct 18 00:39:16 2011 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=661673
 
- gi/pygi-marshal-from-py.c |  121
- +++++++++++++++++++++++++--------------------
+ gi/pygi-marshal-from-py.c | 121
+ ++++++++++++++++++++++++++--------------------
  1 file changed, 68 insertions(+), 53 deletions(-)
 
 commit 8deaec6b9abd87f02060c9feec773d4693e89028
@@ -5567,8 +7613,8 @@ Date:   Wed Oct 19 14:35:11 2011 +0200
 
     https://launchpad.net/bugs/875399
 
- gi/overrides/Gdk.py |   95
- ++++++++++++++++++++++++++-------------------------
+ gi/overrides/Gdk.py | 95
+ +++++++++++++++++++++++++++--------------------------
  1 file changed, 48 insertions(+), 47 deletions(-)
 
 commit f395fb131caf7ca550acd17138d8061926ef4f92
@@ -5579,7 +7625,7 @@ Date:   Fri Oct 14 17:19:45 2011 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=661359
 
- tests/test_everything.py |   11 +++++++++++
+ tests/test_everything.py | 11 +++++++++++
  1 file changed, 11 insertions(+)
 
 commit 611f58b99851328653af4930f188c33eccaa9f6f
@@ -5591,7 +7637,7 @@ Date:   Fri Oct 14 16:42:32 2011 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=661359
 
- gi/pygi-argument.c |   10 ++++++++++
+ gi/pygi-argument.c | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
 commit 0f1eb9fa0e7aa5e7c22dabc709c0dfb469e404f1
@@ -5603,7 +7649,7 @@ Date:   Tue Oct 4 11:13:43 2011 +0200
     Add the GBoxed type as valid type to the gobject property helper
     https://bugzilla.gnome.org/show_bug.cgi?id=660798
 
- gi/_gobject/propertyhelper.py |    5 +++--
+ gi/_gobject/propertyhelper.py | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit bef8d385117dd0295c9ba7567710d76fc2bb729a
@@ -5612,7 +7658,7 @@ Date:   Mon Oct 10 11:24:42 2011 +0200
 
     Add tests for boxed properties.
 
- tests/test_properties.py |   20 ++++++++++++++++++--
+ tests/test_properties.py | 20 ++++++++++++++++++--
  1 file changed, 18 insertions(+), 2 deletions(-)
 
 commit 77123ffeb1585837033848f4d5a90cfa63fdaee0
@@ -5621,7 +7667,7 @@ Date:   Fri Sep 30 20:21:07 2011 +0200
 
     Post release bump version
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f5ccfec0a1bc4c999bfa49d75383ea06d3a068c4
@@ -5630,8 +7676,8 @@ Date:   Fri Sep 30 20:19:46 2011 +0200
 
     Release 3.0.1
 
- NEWS         |    5 +++++
- configure.ac |    2 +-
+ NEWS         | 5 +++++
+ configure.ac | 2 +-
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit 56ac9339eb1d6950623dc4d8c3b9972874e7fa86
@@ -5647,8 +7693,8 @@ Date:   Thu Sep 22 19:03:20 2011 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=659879
 
- gi/pygi-marshal-from-py.c |   60
- ++++++++++++++++++++++++++++++++++++++++++---
+ gi/pygi-marshal-from-py.c | 60
+ +++++++++++++++++++++++++++++++++++++++++++----
  1 file changed, 56 insertions(+), 4 deletions(-)
 
 commit 311a4f8035a95b41bc3c0a836c32b7a5bf2d9959
@@ -5661,10 +7707,10 @@ Date:   Wed Sep 21 21:50:48 2011 -0400
     instantiated
       via g_object_new
 
- gi/_gobject/gobjectmodule.c     |    5 +++++
- gi/_gobject/pygobject-private.h |    3 +++
- gi/_gobject/pygobject.c         |   27 ++++++++++++++++++++++++++-
- gi/_gobject/pygobject.h         |    3 ++-
+ gi/_gobject/gobjectmodule.c     |  5 +++++
+ gi/_gobject/pygobject-private.h |  3 +++
+ gi/_gobject/pygobject.c         | 27 ++++++++++++++++++++++++++-
+ gi/_gobject/pygobject.h         |  3 ++-
  4 files changed, 36 insertions(+), 2 deletions(-)
 
 commit d2d29ae5845217254b9336fd8629f369cb119b25
@@ -5676,7 +7722,7 @@ Date:   Wed Sep 21 21:13:22 2011 -0400
 
     This reverts commit f6fa5dd8f39af1b8a52d7600d257400b0983e8c5.
 
- gi/_gobject/gobjectmodule.c |   32 +++++++++++++++++---------------
+ gi/_gobject/gobjectmodule.c | 32 +++++++++++++++++---------------
  1 file changed, 17 insertions(+), 15 deletions(-)
 
 commit a24c10b779f2a1b0425d56d03d59c393389cad98
@@ -5685,7 +7731,7 @@ Date:   Wed Sep 21 21:10:00 2011 -0400
 
     make sure to commit the NEWS file
 
- NEWS |    4 ++++
+ NEWS | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 2eed2940c9be099fb6305288d895265e6b35d3d2
@@ -5694,7 +7740,7 @@ Date:   Mon Sep 19 13:19:57 2011 -0400
 
     prep for 3.0 release
 
- configure.ac |    6 +++---
+ configure.ac | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit fbd58b70c2c3c1128f95a87eb4cc8313b6a401b8
@@ -5703,7 +7749,7 @@ Date:   Fri Sep 16 14:19:15 2011 -0400
 
     up version required of gobject-introspection to 1.29.0
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 225f21117b6b3546989abe22538c784291e86b2a
@@ -5717,12 +7763,12 @@ Date:   Fri Sep 16 12:26:10 2011 -0400
     * handle deprecated enums in switch statments by using default:
     * unused wanrings still remain in some places
 
- gi/pygi-argument.c        |    2 +-
- gi/pygi-cache.c           |    7 ++-----
- gi/pygi-info.c            |    6 ++++++
- gi/pygi-invoke.c          |    2 +-
- gi/pygi-marshal-from-py.c |   17 +++++++++--------
- gi/pygi-marshal-to-py.c   |    3 +--
+ gi/pygi-argument.c        |  2 +-
+ gi/pygi-cache.c           |  7 ++-----
+ gi/pygi-info.c            |  6 ++++++
+ gi/pygi-invoke.c          |  2 +-
+ gi/pygi-marshal-from-py.c | 17 +++++++++--------
+ gi/pygi-marshal-to-py.c   |  3 +--
  6 files changed, 20 insertions(+), 17 deletions(-)
 
 commit 9a70f01288e1b049206d25d67938907f1b38a490
@@ -5731,7 +7777,7 @@ Date:   Fri Sep 16 12:24:38 2011 -0400
 
     post release bump
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 3ec4020205e909ee4400650434f9ae7b89c2bde8
@@ -5740,7 +7786,7 @@ Date:   Thu Sep 15 18:12:01 2011 -0400
 
     edit HACKING file to show correct tag format
 
- HACKING |    2 +-
+ HACKING | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2e864fd05bc0adf48df9f65ab72785ebb1d0d3f0
@@ -5749,7 +7795,7 @@ Date:   Thu Sep 15 18:10:33 2011 -0400
 
     update NEWS file to prep for release
 
- NEWS |   35 +++++++++++++++++++++++++++++++++++
+ NEWS | 35 +++++++++++++++++++++++++++++++++++
  1 file changed, 35 insertions(+)
 
 commit 0da687fa699aba4f42c42a924d6754e2bd47df50
@@ -5758,7 +7804,7 @@ Date:   Thu Sep 15 17:59:31 2011 -0400
 
     fix typo s/lenth/length
 
- gi/overrides/Gtk.py |    2 +-
+ gi/overrides/Gtk.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 0e4861abaff64d8e7e8d1aeedf9dd1e80de8aab2
@@ -5767,7 +7813,7 @@ Date:   Thu Sep 15 17:48:58 2011 -0400
 
     fix typo in docstring
 
- gi/_gobject/propertyhelper.py |    2 +-
+ gi/_gobject/propertyhelper.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e7fcc326d64def610e5a1003cf6c7ca97023814d
@@ -5785,7 +7831,7 @@ Date:   Thu Sep 15 17:46:46 2011 -0400
       just
       set length to that.
 
- gi/overrides/Gtk.py |    6 ++----
+ gi/overrides/Gtk.py | 6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)
 
 commit 6f380153afb3390f7da9f4b8befb1c4ee224da17
@@ -5800,7 +7846,7 @@ Date:   Mon Sep 12 21:07:20 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=659140
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 11c45ac6dcb6ffad766d03bfc77f45a6d703a90d
@@ -5815,8 +7861,8 @@ Date:   Thu Sep 15 14:18:57 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=659142
 
- gi/_gobject/gobjectmodule.c |    4 ----
- gi/_gobject/pygobject.h     |    2 --
+ gi/_gobject/gobjectmodule.c | 4 ----
+ gi/_gobject/pygobject.h     | 2 --
  2 files changed, 6 deletions(-)
 
 commit 7e48fd6dfd86b7082c3fd35d25d9693c56c9665a
@@ -5834,8 +7880,8 @@ Date:   Thu Sep 15 15:52:18 2011 -0400
         import gi
         installdir = gi._overridesdir
 
- gi/__init__.py      |    2 ++
- pygobject-3.0.pc.in |   10 +++++++++-
+ gi/__init__.py      |  2 ++
+ pygobject-3.0.pc.in | 10 +++++++++-
  2 files changed, 11 insertions(+), 1 deletion(-)
 
 commit beea7072a5a989be47a755ac46647380d4dbd6b4
@@ -5858,7 +7904,7 @@ Date:   Thu Sep 15 00:11:09 2011 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=627236
 
- tests/test_overrides.py |    4 ++--
+ tests/test_overrides.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 46ba7f04ef3df08e07ddda5c10f0c98bec5fa183
@@ -5878,8 +7924,8 @@ Date:   Thu Sep 15 00:08:31 2011 -0400
       for arrays
     https://bugzilla.gnome.org/show_bug.cgi?id=627236
 
- gi/pygi-marshal-from-py.c |   35 ++++++++++++++++++++++++++++++++---
- tests/test_gi.py          |   29 +++++++++++++++++++++++++++++
+ gi/pygi-marshal-from-py.c | 35 ++++++++++++++++++++++++++++++++---
+ tests/test_gi.py          | 29 +++++++++++++++++++++++++++++
  2 files changed, 61 insertions(+), 3 deletions(-)
 
 commit e30a41592baa942188574e5c9f99572963e2e387
@@ -5904,8 +7950,8 @@ Date:   Thu Sep 15 00:02:34 2011 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=627236
 
- gi/pygi-cache.c |   30 ++++++++++++++++++++----------
- gi/pygi-cache.h |    9 +++++++--
+ gi/pygi-cache.c | 30 ++++++++++++++++++++----------
+ gi/pygi-cache.h |  9 +++++++--
  2 files changed, 27 insertions(+), 12 deletions(-)
 
 commit f6fa5dd8f39af1b8a52d7600d257400b0983e8c5
@@ -5933,7 +7979,7 @@ Date:   Wed Sep 14 20:26:15 2011 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=657403
 
- gi/_gobject/gobjectmodule.c |   32 +++++++++++++++-----------------
+ gi/_gobject/gobjectmodule.c | 32 +++++++++++++++-----------------
  1 file changed, 15 insertions(+), 17 deletions(-)
 
 commit 61b64a65beee9011f8e4ed20f0a83e6630ba154f
@@ -5945,7 +7991,7 @@ Date:   Tue Sep 13 18:08:04 2011 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=657403
 
- gi/_gobject/gobjectmodule.c |    2 +-
+ gi/_gobject/gobjectmodule.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 93e12cc2eb7e7f2c18971da86e9c9452d3f566b7
@@ -5956,7 +8002,7 @@ Date:   Fri Aug 26 11:22:09 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=657416
 
- gi/_gobject/pygobject.h |   19 +------------------
+ gi/_gobject/pygobject.h | 19 +------------------
  1 file changed, 1 insertion(+), 18 deletions(-)
 
 commit e1c71092af6e2cffa36248519adfceac1874051d
@@ -5967,7 +8013,7 @@ Date:   Wed Aug 31 09:43:28 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=657785
 
- pygi-convert.sh |    2 ++
+ pygi-convert.sh | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 3ace5c2e2268285a5dcb39889fcb2a71bc1063bd
@@ -5982,8 +8028,8 @@ Date:   Fri Sep 2 08:37:15 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=658032
 
- examples/signal.py      |    2 --
- gi/_gobject/pygobject.c |   11 -----------
+ examples/signal.py      |  2 --
+ gi/_gobject/pygobject.c | 11 -----------
  2 files changed, 13 deletions(-)
 
 commit fcd457d1d1d8a813acb2ebfe5ee0e9aab2c9c88c
@@ -5997,10 +8043,10 @@ Date:   Tue Sep 13 12:05:30 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=658856
 
- configure.ac            |    4 +++-
- gi/Makefile.am          |    9 ++++++---
- gi/_glib/Makefile.am    |   10 ++++++++--
- gi/_gobject/Makefile.am |    8 +++++++-
+ configure.ac            |  4 +++-
+ gi/Makefile.am          |  9 ++++++---
+ gi/_glib/Makefile.am    | 10 ++++++++--
+ gi/_gobject/Makefile.am |  8 +++++++-
  4 files changed, 24 insertions(+), 7 deletions(-)
 
 commit 863c087911203a8f3ebaa8e77622a3437a7cd320
@@ -6011,7 +8057,7 @@ Date:   Mon Sep 12 23:03:05 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=658856
 
- Makefile.am |    6 ------
+ Makefile.am | 6 ------
  1 file changed, 6 deletions(-)
 
 commit 24b920f9922e367bdb8b3e56c2f61e0c8f5cdb66
@@ -6020,7 +8066,7 @@ Date:   Tue Sep 13 16:20:48 2011 -0400
 
     cast params for PyObject_IsInstance to suppress warnings
 
- gi/_gobject/pygobject-private.h |    4 ++--
+ gi/_gobject/pygobject-private.h | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 861369ec59b17f67151813dc2e87c6e86126b954
@@ -6037,7 +8083,7 @@ Date:   Tue Sep 13 16:04:31 2011 -0400
        could at best give you a false positive and at worse read
        memory beyond the bounds of the actual structure passed in
 
- gi/_gobject/pygobject-private.h |    4 ++--
+ gi/_gobject/pygobject-private.h | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit eea93e89fb064253bd8903c8b453daf4b3c87c2c
@@ -6047,7 +8093,7 @@ Date:   Tue Sep 13 16:03:02 2011 -0400
     fix regression - add instance type checks since Py3 no longer does
     this for us
 
- gi/pygi-marshal-from-py.c |   21 +++++++++++++++++++--
+ gi/pygi-marshal-from-py.c | 21 +++++++++++++++++++--
  1 file changed, 19 insertions(+), 2 deletions(-)
 
 commit a4e4318b50a24a688e32579273fbcfa51d1b422a
@@ -6092,7 +8138,7 @@ Date:   Fri Sep 9 16:50:25 2011 +0200
 
     Examples: fix cairo-demo.py imports
 
- examples/cairo-demo.py |    6 +++---
+ examples/cairo-demo.py | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 3ca19fc13e6024fd04851e6f269020a92b09fa17
@@ -6104,7 +8150,7 @@ Date:   Fri Sep 9 15:08:27 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=658654
 
- pygobject-3.0-uninstalled.pc.in |   14 +++++++-------
+ pygobject-3.0-uninstalled.pc.in | 14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)
 
 commit 6e773175b9d2f46b3df5075ec952a8c5aff3c607
@@ -6115,8 +8161,8 @@ Date:   Fri Sep 9 15:08:04 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=658654
 
- pygobject-3.0-uninstalled.pc.in |    6 ------
- pygobject-3.0.pc.in             |    5 +----
+ pygobject-3.0-uninstalled.pc.in | 6 ------
+ pygobject-3.0.pc.in             | 5 +----
  2 files changed, 1 insertion(+), 10 deletions(-)
 
 commit 81d388780311311d8dc4a027a59d114edf9a00fc
@@ -6127,8 +8173,8 @@ Date:   Fri Sep 9 14:57:58 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=658652
 
- docs/Makefile.am |    2 +-
- m4/python.m4     |    2 +-
+ docs/Makefile.am | 2 +-
+ m4/python.m4     | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 7e692ee061406e48e4862b98a0829650b1d6d585
@@ -6139,13 +8185,13 @@ Date:   Fri Sep 9 14:57:46 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=658652
 
- Makefile.am               |    2 -
- gi/Makefile.am            |   81 ++++++++++++++++++++++--------------
- gi/_glib/Makefile.am      |  100
- +++++++++++++++++++++++++++++----------------
- gi/_gobject/Makefile.am   |   85 ++++++++++++++++++++------------------
- gi/overrides/Makefile.am  |    4 +-
- gi/repository/Makefile.am |    4 +-
+ Makefile.am               |   2 -
+ gi/Makefile.am            |  81 +++++++++++++++++++++++--------------
+ gi/_glib/Makefile.am      | 100
+ ++++++++++++++++++++++++++++++----------------
+ gi/_gobject/Makefile.am   |  85 ++++++++++++++++++++-------------------
+ gi/overrides/Makefile.am  |   4 +-
+ gi/repository/Makefile.am |   4 +-
  6 files changed, 162 insertions(+), 114 deletions(-)
 
 commit 3dd59b07d1f4a93ee1f65d6a64e1afb6f5e84232
@@ -6156,9 +8202,9 @@ Date:   Fri Sep 9 14:57:36 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=658652
 
- gi/Makefile.am            |    2 --
- gi/overrides/Makefile.am  |    1 -
- gi/repository/Makefile.am |    1 -
+ gi/Makefile.am            | 2 --
+ gi/overrides/Makefile.am  | 1 -
+ gi/repository/Makefile.am | 1 -
  3 files changed, 4 deletions(-)
 
 commit db1e484bfa157967de55ee2e0e18a82b8e388b61
@@ -6169,8 +8215,8 @@ Date:   Fri Sep 9 14:57:25 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=658652
 
- gi/tests/Makefile.am |   24 ------------------------
- gi/tests/runtests.py |   21 ---------------------
+ gi/tests/Makefile.am | 24 ------------------------
+ gi/tests/runtests.py | 21 ---------------------
  2 files changed, 45 deletions(-)
 
 commit b0ecbf00138ef1147e478ebf3c66f0e9b3f85dfc
@@ -6182,9 +8228,9 @@ Date:   Fri Sep 9 14:55:25 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=658652
 
- Makefile.am |    2 +-
- autogen.sh  |   95
- +++++++----------------------------------------------------
+ Makefile.am |  2 +-
+ autogen.sh  | 95
+ +++++++------------------------------------------------------
  2 files changed, 12 insertions(+), 85 deletions(-)
 
 commit 4671f5397003f376f00830e3fd1c214de594619f
@@ -6195,8 +8241,8 @@ Date:   Fri Sep 9 14:55:01 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=658652
 
- configure.ac |    3 ++-
- m4/python.m4 |   47 +++++++++++++++++++++++++++++++++++++----------
+ configure.ac |  3 ++-
+ m4/python.m4 | 47 +++++++++++++++++++++++++++++++++++++----------
  2 files changed, 39 insertions(+), 11 deletions(-)
 
 commit 2c9fd09da196d35db968bff4ae63fcce2d891e69
@@ -6208,7 +8254,7 @@ Date:   Fri Sep 9 15:38:22 2011 +0100
     See
     http://blogs.gnome.org/desrt/2011/09/08/am_maintainer_mode-is-not-cool/
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit b24dcb415406668931e02a1f669ef9861bb3a660
@@ -6219,8 +8265,8 @@ Date:   Wed Aug 24 09:58:10 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=657054
 
- Makefile.am  |    2 +-
- configure.ac |   25 -------------------------
+ Makefile.am  |  2 +-
+ configure.ac | 25 -------------------------
  2 files changed, 1 insertion(+), 26 deletions(-)
 
 commit ecea2358a379c8ff44dff2f8f9c30a9092af1681
@@ -6231,7 +8277,7 @@ Date:   Wed Sep 7 10:38:28 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=657054
 
- docs/Makefile.am |    5 +++--
+ docs/Makefile.am | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit 8d3125c8ce9890c70400dd8a3ac273b590fe6a31
@@ -6247,13 +8293,13 @@ Date:   Tue Sep 6 22:22:11 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=657054
 
- MANIFEST.in              |    7 -
- Makefile.am              |   25 +--
- README.win32             |   21 --
- dsextras.py              |  509
- ----------------------------------------------
- pygobject_postinstall.py |    9 -
- setup.py                 |  351 --------------------------------
+ MANIFEST.in              |   7 -
+ Makefile.am              |  25 +--
+ README.win32             |  21 --
+ dsextras.py              | 509
+ -----------------------------------------------
+ pygobject_postinstall.py |   9 -
+ setup.py                 | 351 --------------------------------
  6 files changed, 7 insertions(+), 915 deletions(-)
 
 commit b82d916635aa0b732840548088a3fcfcb2e41bc4
@@ -6273,7 +8319,7 @@ Date:   Wed Sep 7 10:40:36 2011 +0200
     selecting
     the rotated text demo in the treeview.
 
- demos/gtk-demo/gtk-demo.py |    3 +++
+ demos/gtk-demo/gtk-demo.py | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 31db3ed3d233bd495c3a2f99b3fa51031bfa30c6
@@ -6282,7 +8328,7 @@ Date:   Tue Sep 6 22:13:54 2011 +0200
 
     overrides: add constants for atoms
 
- gi/overrides/Gdk.py |   49
+ gi/overrides/Gdk.py | 49
  +++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 49 insertions(+)
 
@@ -6305,10 +8351,10 @@ Date:   Wed Aug 31 14:18:56 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=657814
 
- gi/_gobject/gobjectmodule.c     |  118
- +++++++++------------------------------
- gi/_gobject/pygobject-private.h |    3 -
- gi/_gobject/pygobject.h         |    8 ---
+ gi/_gobject/gobjectmodule.c     | 118
+ +++++++++-------------------------------
+ gi/_gobject/pygobject-private.h |   3 -
+ gi/_gobject/pygobject.h         |   8 ---
  3 files changed, 26 insertions(+), 103 deletions(-)
 
 commit c4c55a98ccf9e39ed0d10ed49b66a76dc7d7c509
@@ -6317,7 +8363,7 @@ Date:   Wed Aug 31 18:00:44 2011 +0200
 
     post release version bump
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit ac5a0f46242abdd3cd98ec5f9f2bf8e5b05f3845
@@ -6326,7 +8372,7 @@ Date:   Wed Aug 31 17:58:37 2011 +0200
 
     Release 2.90.3
 
- NEWS |   12 ++++++++++++
+ NEWS | 12 ++++++++++++
  1 file changed, 12 insertions(+)
 
 commit 429569abddada5a3bad554de707ddf35b349936e
@@ -6342,11 +8388,11 @@ Date:   Thu Aug 25 13:57:53 2011 -0400
       full
     https://bugzilla.gnome.org/show_bug.cgi?id=650135
 
- gi/pygi-cache.c          |    1 +
- gi/pygi-cache.h          |    1 +
- gi/pygi-invoke.c         |   48
- +++++++++++++++++++++++++++++-----------------
- tests/test_everything.py |    8 ++++++++
+ gi/pygi-cache.c          |  1 +
+ gi/pygi-cache.h          |  1 +
+ gi/pygi-invoke.c         | 48
+ ++++++++++++++++++++++++++++++------------------
+ tests/test_everything.py |  8 ++++++++
  4 files changed, 40 insertions(+), 18 deletions(-)
 
 commit 7a234b185b131f3eb6a6e8a8c717ddf4d508b15e
@@ -6355,7 +8401,7 @@ Date:   Tue Aug 2 12:05:12 2011 +0200
 
     Test GPtrArray regression
 
- tests/test_everything.py |    3 +++
+ tests/test_everything.py | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 42fc9fa437102c882844a0e70a081ab08de92658
@@ -6370,13 +8416,13 @@ Date:   Fri Aug 26 10:53:43 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=657413
 
- gi/_gobject/gobjectmodule.c     |   20 --------------------
- gi/_gobject/pygobject-private.h |    1 -
- gi/_gobject/pygobject.c         |    1 -
- gi/_gobject/pygobject.h         |    2 --
- gi/gimodule.c                   |   28 ----------------------------
- gi/types.py                     |    2 --
- tests/testhelpermodule.c        |    5 -----
+ gi/_gobject/gobjectmodule.c     | 20 --------------------
+ gi/_gobject/pygobject-private.h |  1 -
+ gi/_gobject/pygobject.c         |  1 -
+ gi/_gobject/pygobject.h         |  2 --
+ gi/gimodule.c                   | 28 ----------------------------
+ gi/types.py                     |  2 --
+ tests/testhelpermodule.c        |  5 -----
  7 files changed, 59 deletions(-)
 
 commit 3961a405e1bddef22e1a5a0c7aa3ae55e4ec09ad
@@ -6390,14 +8436,14 @@ Date:   Fri Aug 26 10:45:59 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=642233
 
- gi/_gobject/gobjectmodule.c |    1 -
- gi/_gobject/pygobject.c     |   53 --------------------------------------
- gi/_gobject/pygobject.h     |    4 ---
- tests/test-floating.c       |   59
- +++++++------------------------------------
- tests/test-floating.h       |   42 ++++++++----------------------
- tests/test_gobject.py       |   13 +++-------
- tests/testhelpermodule.c    |   32 +++++++----------------
+ gi/_gobject/gobjectmodule.c |  1 -
+ gi/_gobject/pygobject.c     | 53 ----------------------------------------
+ gi/_gobject/pygobject.h     |  4 ---
+ tests/test-floating.c       | 59
+ +++++++--------------------------------------
+ tests/test-floating.h       | 42 +++++++++-----------------------
+ tests/test_gobject.py       | 13 +++-------
+ tests/testhelpermodule.c    | 32 +++++++-----------------
  7 files changed, 32 insertions(+), 172 deletions(-)
 
 commit 631d8ef879a13492945a3e30b3df9863a4ba2f44
@@ -6413,7 +8459,7 @@ Date:   Wed Aug 24 17:30:09 2011 -0500
 
     https://bugzilla.gnome.org/show_bug.cgi?id=657120
 
- gi/pygi-marshal-out.c |    8 +++++++-
+ gi/pygi-marshal-out.c | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 commit f38511f251602e18551c04617cc2e2d42e812e1e
@@ -6430,8 +8476,8 @@ Date:   Tue Aug 23 14:18:43 2011 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=657120
 
- gi/pygi-marshal-out.c |   23 +++++++++--------------
- tests/test_gi.py      |    8 ++++++++
+ gi/pygi-marshal-out.c | 23 +++++++++--------------
+ tests/test_gi.py      |  8 ++++++++
  2 files changed, 17 insertions(+), 14 deletions(-)
 
 commit d92846a5446b0dd2e69c813f56224a1966ab1a33
@@ -6440,7 +8486,7 @@ Date:   Tue Aug 23 11:30:41 2011 +0200
 
     [gtk-demo] printing.py: set print and error dialog transient parent
 
- demos/gtk-demo/demos/printing.py |    8 ++++----
+ demos/gtk-demo/demos/printing.py | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 1aebc1565752840075027b9452fe2a67217bf53b
@@ -6450,7 +8496,7 @@ Date:   Tue Aug 23 11:28:05 2011 +0200
     [gtk-demo] printing.py: exit Gtk mainloop when done and correctly
     handle printing errors
 
- demos/gtk-demo/demos/printing.py |   14 ++++++++++----
+ demos/gtk-demo/demos/printing.py | 14 ++++++++++----
  1 file changed, 10 insertions(+), 4 deletions(-)
 
 commit 1f9e4486c5b84209ce0038887738fc16a4ef7da3
@@ -6459,7 +8505,7 @@ Date:   Tue Aug 23 08:05:43 2011 +0200
 
     [gtk-demo] show "activated" demo's in italic font in the TreeView
 
- demos/gtk-demo/gtk-demo.py |    7 +++++--
+ demos/gtk-demo/gtk-demo.py | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 commit 971d063f7a36e13ef6621db7002b00af52f6292a
@@ -6469,7 +8515,7 @@ Date:   Mon Aug 22 14:52:28 2011 +0200
     [gtk-demo] source colorizer: Python3 does not have the BACKQUOTE
     token, so simply remove it
 
- demos/gtk-demo/gtk-demo.py |    5 +----
+ demos/gtk-demo/gtk-demo.py | 5 +----
  1 file changed, 1 insertion(+), 4 deletions(-)
 
 commit c2979a37d6d505095b6e55789150a6498d95819d
@@ -6484,7 +8530,7 @@ Date:   Mon Aug 22 14:22:18 2011 +0200
     section "If pre-2.6 compatibility is needed" (because configure.ac
     is still happy with Python 2.5.2).
 
- demos/gtk-demo/gtk-demo.py |    6 +++++-
+ demos/gtk-demo/gtk-demo.py | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit 9ea56535f35abbea4cd977dea4c89247e4b01694
@@ -6493,7 +8539,7 @@ Date:   Mon Aug 22 12:30:24 2011 +0200
 
     [gtk-demo] images.py: fix 'Insensitive 'button mnenomic
 
- demos/gtk-demo/demos/images.py |    2 +-
+ demos/gtk-demo/demos/images.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 7829dae1cdb8697a19c2b5e158ef0e08f6c2558b
@@ -6503,7 +8549,7 @@ Date:   Mon Aug 22 10:38:04 2011 +0200
     [gtk-demo] printing.py: fix Pango.EllipsizeType > Pango.EllipsizeMode
     & get_pixel_size
 
- demos/gtk-demo/demos/printing.py |    4 ++--
+ demos/gtk-demo/demos/printing.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 07f0274301d77d9bf62b49a14b059d9a52afb445
@@ -6512,7 +8558,7 @@ Date:   Mon Aug 22 10:37:08 2011 +0200
 
     [gtk-demo] printing.py: fix text file loading
 
- demos/gtk-demo/demos/printing.py |   32 ++++++++++++++++----------------
+ demos/gtk-demo/demos/printing.py | 32 ++++++++++++++++----------------
  1 file changed, 16 insertions(+), 16 deletions(-)
 
 commit 135148a4c35aac1d132b0b8fa3adbf1fdcdb3a24
@@ -6521,7 +8567,7 @@ Date:   Mon Aug 22 10:20:35 2011 +0200
 
     [gtk-demo] pixbuf.py: fix image loading
 
- demos/gtk-demo/demos/pixbuf.py |   25 +++++++++++--------------
+ demos/gtk-demo/demos/pixbuf.py | 25 +++++++++++--------------
  1 file changed, 11 insertions(+), 14 deletions(-)
 
 commit a93cae2c80e30a408f86e7e6c4d15a538011a189
@@ -6530,8 +8576,8 @@ Date:   Mon Aug 22 10:10:02 2011 +0200
 
     [gtk-demo] images.py: fix logo loading
 
- demos/gtk-demo/demos/images.py |   70
- +++++++++++++++++-----------------------
+ demos/gtk-demo/demos/images.py | 70
+ +++++++++++++++++-------------------------
  1 file changed, 29 insertions(+), 41 deletions(-)
 
 commit eddc0824e0e4c156fca5de05bdeb600c534d4b24
@@ -6540,7 +8586,7 @@ Date:   Wed Aug 24 12:19:21 2011 +0200
 
     [gtk-demo] appwindow.py: set AboutDialog parent
 
- demos/gtk-demo/demos/appwindow.py |    7 +++----
+ demos/gtk-demo/demos/appwindow.py | 7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
 
 commit 7fe10a5b33148b1f029f3d34f76b7f880c1c2e7a
@@ -6549,7 +8595,7 @@ Date:   Mon Aug 22 07:58:25 2011 +0200
 
     [gtk-demo] appwindow.py: fix logo loading
 
- demos/gtk-demo/demos/appwindow.py |   10 +++-------
+ demos/gtk-demo/demos/appwindow.py | 10 +++-------
  1 file changed, 3 insertions(+), 7 deletions(-)
 
 commit 62fda288c1c37167c589e8e9d49ed625f770a98a
@@ -6558,7 +8604,7 @@ Date:   Mon Aug 22 07:57:31 2011 +0200
 
     [gtk-demo] appwindow.py: fix callback signatures
 
- demos/gtk-demo/demos/appwindow.py |    6 +++---
+ demos/gtk-demo/demos/appwindow.py | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 87e9ab4d3a0aac4f4710aa0f8af0a1736f781ad9
@@ -6567,8 +8613,8 @@ Date:   Mon Aug 22 07:48:28 2011 +0200
 
     [gtk-demo] fix glib vs GLib usage
 
- demos/gtk-demo/demos/Icon View/iconviewbasics.py |    2 +-
- demos/gtk-demo/demos/appwindow.py                |    2 +-
+ demos/gtk-demo/demos/Icon View/iconviewbasics.py | 2 +-
+ demos/gtk-demo/demos/appwindow.py                | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit d29cad6976a80862e1fc590d3e7d190e8a234866
@@ -6578,7 +8624,7 @@ Date:   Wed Aug 24 12:19:02 2011 +0200
     [gtk-demo] iconviewedit.py: fix for Gdk.color_parse API breakage
     caused by improved GDK overrides
 
- demos/gtk-demo/demos/Icon View/iconviewedit.py |    6 +++---
+ demos/gtk-demo/demos/Icon View/iconviewedit.py | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit f29d3a85a275a39e8481484779264b0dea1160ab
@@ -6588,7 +8634,7 @@ Date:   Mon Aug 22 07:25:32 2011 +0200
     [gtk-demo] optimize source colorizer by only preparing iters for
     known colorized tokens
 
- demos/gtk-demo/gtk-demo.py |   20 +++++++++++++++-----
+ demos/gtk-demo/gtk-demo.py | 20 +++++++++++++++-----
  1 file changed, 15 insertions(+), 5 deletions(-)
 
 commit ecd1eb00b19733da3f2e3d7935792378f34cab19
@@ -6597,17 +8643,17 @@ Date:   Fri Aug 19 18:31:20 2011 +0200
 
     [gtk-demo] small formatting fixes
 
- demos/gtk-demo/demos/Entry/entry_buffer.py       |    1 +
- demos/gtk-demo/demos/Entry/entry_completion.py   |    1 +
- demos/gtk-demo/demos/Icon View/iconviewbasics.py |    8 ++++----
- demos/gtk-demo/demos/assistant.py                |    1 +
- demos/gtk-demo/demos/builder.py                  |    4 +++-
- demos/gtk-demo/demos/button_box.py               |    1 +
- demos/gtk-demo/demos/clipboard.py                |    1 +
- demos/gtk-demo/demos/colorselector.py            |    1 +
- demos/gtk-demo/demos/combobox.py                 |    1 +
- demos/gtk-demo/demos/drawingarea.py              |    4 +++-
- demos/gtk-demo/demos/test.py                     |    2 ++
+ demos/gtk-demo/demos/Entry/entry_buffer.py       | 1 +
+ demos/gtk-demo/demos/Entry/entry_completion.py   | 1 +
+ demos/gtk-demo/demos/Icon View/iconviewbasics.py | 8 ++++----
+ demos/gtk-demo/demos/assistant.py                | 1 +
+ demos/gtk-demo/demos/builder.py                  | 4 +++-
+ demos/gtk-demo/demos/button_box.py               | 1 +
+ demos/gtk-demo/demos/clipboard.py                | 1 +
+ demos/gtk-demo/demos/colorselector.py            | 1 +
+ demos/gtk-demo/demos/combobox.py                 | 1 +
+ demos/gtk-demo/demos/drawingarea.py              | 4 +++-
+ demos/gtk-demo/demos/test.py                     | 2 ++
  11 files changed, 19 insertions(+), 6 deletions(-)
 
 commit c42cb4da399ff5732f4ca732b85134de796a60fa
@@ -6616,17 +8662,17 @@ Date:   Fri Aug 19 18:30:50 2011 +0200
 
     [gtk-demo] remove "is_fully_bound" from demos
 
- demos/gtk-demo/demos/Entry/entry_buffer.py     |    2 --
- demos/gtk-demo/demos/Entry/entry_completion.py |    2 --
- demos/gtk-demo/demos/appwindow.py              |    3 ---
- demos/gtk-demo/demos/assistant.py              |    2 --
- demos/gtk-demo/demos/builder.py                |    2 --
- demos/gtk-demo/demos/button_box.py             |    2 --
- demos/gtk-demo/demos/clipboard.py              |    2 --
- demos/gtk-demo/demos/colorselector.py          |    2 --
- demos/gtk-demo/demos/combobox.py               |    2 --
- demos/gtk-demo/demos/drawingarea.py            |    2 --
- demos/gtk-demo/demos/test.py                   |    1 -
+ demos/gtk-demo/demos/Entry/entry_buffer.py     | 2 --
+ demos/gtk-demo/demos/Entry/entry_completion.py | 2 --
+ demos/gtk-demo/demos/appwindow.py              | 3 ---
+ demos/gtk-demo/demos/assistant.py              | 2 --
+ demos/gtk-demo/demos/builder.py                | 2 --
+ demos/gtk-demo/demos/button_box.py             | 2 --
+ demos/gtk-demo/demos/clipboard.py              | 2 --
+ demos/gtk-demo/demos/colorselector.py          | 2 --
+ demos/gtk-demo/demos/combobox.py               | 2 --
+ demos/gtk-demo/demos/drawingarea.py            | 2 --
+ demos/gtk-demo/demos/test.py                   | 1 -
  11 files changed, 22 deletions(-)
 
 commit cad6a62c63f455f0b1315465a9cd71c0f02b12a5
@@ -6636,8 +8682,8 @@ Date:   Fri Aug 19 18:26:31 2011 +0200
     [gtk-demo] add source colorizer loosely based on PyGTK's pygtk-demo
     and GTK+'s gtk-demo code
 
- demos/gtk-demo/gtk-demo.py |  116
- ++++++++++++++++++++++++++++++++++++++------
+ demos/gtk-demo/gtk-demo.py | 116
+ +++++++++++++++++++++++++++++++++++++++------
  1 file changed, 101 insertions(+), 15 deletions(-)
 
 commit 250c36f4a8352ff1b31c1c85b156d3e803d4b8ef
@@ -6646,7 +8692,7 @@ Date:   Fri Aug 19 15:08:15 2011 +0200
 
     [gtk-demo] remove C-isms
 
- demos/gtk-demo/gtk-demo.py |   28 ++++++++++++++--------------
+ demos/gtk-demo/gtk-demo.py | 28 ++++++++++++++--------------
  1 file changed, 14 insertions(+), 14 deletions(-)
 
 commit cf35fe8e259e786d0fa21b08b1f5c64c9bb0a84e
@@ -6655,7 +8701,7 @@ Date:   Fri Aug 19 14:54:39 2011 +0200
 
     [gtk-demo] fix text on info tab to be more like GTK+'s gtk-demo
 
- demos/gtk-demo/gtk-demo.py |    4 ++--
+ demos/gtk-demo/gtk-demo.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 241827208e25c72a990d8edd95a3b879470d6409
@@ -6668,8 +8714,8 @@ Date:   Fri Aug 19 14:40:56 2011 +0200
     This also moves demos loading code into the TreeStore subclass and
     demo loading code into the Demo class
 
- demos/gtk-demo/gtk-demo.py |  151
- ++++++++++++++++++++------------------------
+ demos/gtk-demo/gtk-demo.py | 151
+ +++++++++++++++++++++------------------------
  1 file changed, 70 insertions(+), 81 deletions(-)
 
 commit 58797c355a08a35375988881a17958bb42ad54bb
@@ -6679,7 +8725,7 @@ Date:   Fri Aug 19 14:40:00 2011 +0200
     [gtk-demo] make GtkDemoApp a Gtk.Window subclass and adapt main()
     to demonstrate the GLib.MainLoop
 
- demos/gtk-demo/gtk-demo.py |   43
+ demos/gtk-demo/gtk-demo.py | 43
  ++++++++++++++++++++++++++-----------------
  1 file changed, 26 insertions(+), 17 deletions(-)
 
@@ -6689,7 +8735,7 @@ Date:   Fri Aug 19 11:46:17 2011 +0200
 
     [gtk-demo] correctly load demo code when cwd != demos/gtk-demo/
 
- demos/gtk-demo/gtk-demo.py |   39 +++++++++++++++++++++++----------------
+ demos/gtk-demo/gtk-demo.py | 39 +++++++++++++++++++++++----------------
  1 file changed, 23 insertions(+), 16 deletions(-)
 
 commit 6ffc999fbd4c9990fb5bde53ddd46d139b53245e
@@ -6698,7 +8744,7 @@ Date:   Fri Aug 19 11:02:35 2011 +0200
 
     [gtk-demo] drawingarea: fix labels
 
- demos/gtk-demo/demos/drawingarea.py |    4 ++--
+ demos/gtk-demo/demos/drawingarea.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 9fd3986affe11cbc5a816adcccdc56d0592f3618
@@ -6707,9 +8753,9 @@ Date:   Fri Aug 19 09:57:31 2011 +0200
 
     [gtk-demo] fix imports
 
- demos/gtk-demo/demos/Icon View/iconviewbasics.py |    6 ++++--
- demos/gtk-demo/demos/appwindow.py                |    9 ++++++---
- demos/gtk-demo/gtk-demo.py                       |    8 ++++----
+ demos/gtk-demo/demos/Icon View/iconviewbasics.py | 6 ++++--
+ demos/gtk-demo/demos/appwindow.py                | 9 ++++++---
+ demos/gtk-demo/gtk-demo.py                       | 8 ++++----
  3 files changed, 14 insertions(+), 9 deletions(-)
 
 commit 9f314babfdee3b82799e00ea003972b0bbe6a8d5
@@ -6718,7 +8764,7 @@ Date:   Fri Aug 19 10:07:14 2011 +0200
 
     [gtk-demo] fix shebang
 
- demos/gtk-demo/gtk-demo.py |    2 +-
+ demos/gtk-demo/gtk-demo.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 01142060ae7d71a8a1f7d3e9bbc6f52e65f01c8d
@@ -6730,9 +8776,9 @@ Date:   Fri Aug 19 12:27:04 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=656891
 
- gi/overrides/Gtk.py     |   26 +++++++++++++++++++--
- tests/test_overrides.py |   57
- +++++++++++++++++++++++++++++++++++++++++++++++
+ gi/overrides/Gtk.py     | 26 ++++++++++++++++++++--
+ tests/test_overrides.py | 57
+ +++++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 81 insertions(+), 2 deletions(-)
 
 commit d6da96c65b2ed3cda238886990a624fbc31f6987
@@ -6741,7 +8787,7 @@ Date:   Wed Aug 24 16:31:12 2011 +0200
 
     Convert ACCEL_* constants into Gtk.AccelFlags.
 
- pygi-convert.sh |    1 +
+ pygi-convert.sh | 1 +
  1 file changed, 1 insertion(+)
 
 commit 0841d41698302abb5d987849a5874252564ed428
@@ -6750,7 +8796,7 @@ Date:   Wed Aug 24 16:22:17 2011 +0200
 
     Convert TREE_VIEW_DROP_* constants into Gtk.TreeViewDropPosition
 
- pygi-convert.sh |    1 +
+ pygi-convert.sh | 1 +
  1 file changed, 1 insertion(+)
 
 commit 37b0d0f9dc3d485829cae6e50da369fdea91a2d1
@@ -6759,7 +8805,7 @@ Date:   Thu Aug 18 14:06:32 2011 -0400
 
     post commit version bump
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e51efc50835a14e0418cc27cc928c52d1aa6a3cf
@@ -6768,7 +8814,7 @@ Date:   Thu Aug 18 14:02:30 2011 -0400
 
     release 2.90.2
 
- NEWS |   10 ++++++++++
+ NEWS | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
 commit 74c727b53fcf64f465ee77b5a1ea04a69ca90968
@@ -6777,7 +8823,7 @@ Date:   Thu Aug 18 13:50:51 2011 -0400
 
     remove tests that were removed from gi
 
- tests/test_gi.py |   11 -----------
+ tests/test_gi.py | 11 -----------
  1 file changed, 11 deletions(-)
 
 commit 11ea24dd30d8eeca11c8433c6bd75b06e52ae1ef
@@ -6790,7 +8836,7 @@ Date:   Thu Aug 18 13:48:57 2011 -0400
        arrays causes a crash in the tests because of this
      * disregaurd is_pointer when cacluating item sizes
 
- gi/pygi-info.c |    8 ++------
+ gi/pygi-info.c | 8 ++------
  1 file changed, 2 insertions(+), 6 deletions(-)
 
 commit 493b4a21dd162d78cf572b548b58ba6a9ff22971
@@ -6801,7 +8847,7 @@ Date:   Wed Jul 6 01:50:31 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=654162
 
- examples/signal.py |    9 ++++-----
+ examples/signal.py | 9 ++++-----
  1 file changed, 4 insertions(+), 5 deletions(-)
 
 commit 0332010e704e253380e993874eab9dd122e59a7e
@@ -6812,7 +8858,7 @@ Date:   Wed Jul 6 01:54:50 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=654162
 
- examples/properties.py |   14 +++++++-------
+ examples/properties.py | 14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)
 
 commit c39f4555ebd703651eca6f978ed9870655b737f0
@@ -6827,9 +8873,9 @@ Date:   Fri Aug 12 22:55:02 2011 +0200
     generating
     introspection XML for exported DBus server objects.
 
- gi/overrides/GLib.py    |   50
- +++++++++++++++++++++++++++++++++++++++++++++++
- tests/test_overrides.py |   22 +++++++++++++++++++++
+ gi/overrides/GLib.py    | 50
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ tests/test_overrides.py | 22 ++++++++++++++++++++++
  2 files changed, 72 insertions(+)
 
 commit 735f98d83c1c19df7457aa32a378e8c80cf2831f
@@ -6840,7 +8886,7 @@ Date:   Mon Aug 15 18:58:31 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=654001
 
- pygi-convert.sh |    2 ++
+ pygi-convert.sh | 2 ++
  1 file changed, 2 insertions(+)
 
 commit d0a96a0a75f2bc969522abce2d326ef440cf143a
@@ -6851,9 +8897,9 @@ Date:   Mon Aug 15 13:12:49 2011 +0200
 
     This is needed by libpeas.
 
- gi/_gobject/Makefile.am         |    5 ++++-
- pygobject-3.0-uninstalled.pc.in |    4 ++--
- pygobject-3.0.pc.in             |    6 +++---
+ gi/_gobject/Makefile.am         | 5 ++++-
+ pygobject-3.0-uninstalled.pc.in | 4 ++--
+ pygobject-3.0.pc.in             | 6 +++---
  3 files changed, 9 insertions(+), 6 deletions(-)
 
 commit 081dc2eb03b677eac9f08d3ad05deecc7c51554c
@@ -6862,7 +8908,7 @@ Date:   Sun Aug 14 11:20:15 2011 -0400
 
     update the doap file
 
- pygobject.doap |   26 ++++++++++++++------------
+ pygobject.doap | 26 ++++++++++++++------------
  1 file changed, 14 insertions(+), 12 deletions(-)
 
 commit 762a36d2343bc39a502507d600fd1b9db9649dae
@@ -6871,7 +8917,7 @@ Date:   Sun Aug 14 11:13:25 2011 -0400
 
     prerelease bump
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d3f85a61ec4b1a1d04838f73dc8d862258150048
@@ -6880,8 +8926,8 @@ Date:   Sun Aug 14 10:13:37 2011 -0400
 
     get things ready for release
 
- NEWS |  194
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ NEWS | 194
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 194 insertions(+)
 
 commit ffd057649380d4249c1c52e1225e3646f3994bc6
@@ -6890,7 +8936,7 @@ Date:   Sun Aug 14 05:26:18 2011 -0400
 
     pass exta keywords to the Box constructor
 
- gi/overrides/Gtk.py |    4 ++--
+ gi/overrides/Gtk.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit cadbd4142bd0045368b5123d4b0a1876bdd5d798
@@ -6899,9 +8945,9 @@ Date:   Sat Aug 13 11:03:07 2011 -0400
 
     add (Tree|List)Store set method override
 
- gi/overrides/Gtk.py     |   50 +++++++++++++++++++++++
- tests/test_overrides.py |  102
- +++++++++++++++++++++++++++++++++++++++++++++--
+ gi/overrides/Gtk.py     |  50 ++++++++++++++++++++++++
+ tests/test_overrides.py | 102
+ ++++++++++++++++++++++++++++++++++++++++++++++--
  2 files changed, 149 insertions(+), 3 deletions(-)
 
 commit 9ee9b22bd95e44bd2eca26e7bf3b0a9a988700c5
@@ -6910,7 +8956,7 @@ Date:   Sat Aug 13 09:19:29 2011 -0400
 
     add test for object arrays
 
- tests/test_everything.py |    6 ++++++
+ tests/test_everything.py | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit c9d9ffd0380878792cbdb13dec4e53be897e5fbc
@@ -6925,8 +8971,8 @@ Date:   Sat Aug 13 08:46:18 2011 -0400
       prevelant
       it has been decided to only support those arrays
 
- gi/pygi-marshal-out.c |    2 +-
- tests/test_gi.py      |    8 --------
+ gi/pygi-marshal-out.c | 2 +-
+ tests/test_gi.py      | 8 --------
  2 files changed, 1 insertion(+), 9 deletions(-)
 
 commit b12379de1790b72d51883bf7b63c892639a892e7
@@ -6935,7 +8981,7 @@ Date:   Sat Aug 13 06:31:52 2011 -0400
 
     revert Gtk.Window override because it causes issues with subclasses
 
- gi/overrides/Gtk.py |    9 ---------
+ gi/overrides/Gtk.py | 9 ---------
  1 file changed, 9 deletions(-)
 
 commit 3e64a62d6d7f9e9d2820aad54187ef9c34710a1f
@@ -6944,7 +8990,7 @@ Date:   Thu Apr 7 21:05:32 2011 +1000
 
     take GIL in _pygi_invoke_closure_free (bug #647016)
 
- gi/pygi-closure.c |    3 +++
+ gi/pygi-closure.c | 3 +++
  1 file changed, 3 insertions(+)
 
 commit f8de9b8615f5dc30f492781d792aef5fc1e9ab73
@@ -6955,7 +9001,7 @@ Date:   Mon Jun 27 00:41:24 2011 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=653462
 
- gi/overrides/Gtk.py |    3 +++
+ gi/overrides/Gtk.py | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 583d0b3c6b53712128d7c2d5f075000a2a76ae5f
@@ -6970,7 +9016,7 @@ Date:   Mon Jun 27 00:40:12 2011 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=653462
 
- gi/overrides/Gtk.py |    3 +++
+ gi/overrides/Gtk.py | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 017fdfc1dd06259006719e02ffa48883cee01ffd
@@ -6984,7 +9030,7 @@ Date:   Mon Jun 27 00:39:41 2011 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=653462
 
- gi/overrides/Gtk.py |   40 ++++++++++++++++++++++++++++++++++++++++
+ gi/overrides/Gtk.py | 40 ++++++++++++++++++++++++++++++++++++++++
  1 file changed, 40 insertions(+)
 
 commit af8bc9d5cdba48a7ee728ccb7ea9039df3ecceba
@@ -6998,7 +9044,7 @@ Date:   Mon Jun 27 00:38:30 2011 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=653462
 
- gi/overrides/Gtk.py |   15 ++++++++++++---
+ gi/overrides/Gtk.py | 15 ++++++++++++---
  1 file changed, 12 insertions(+), 3 deletions(-)
 
 commit 7914d814350af1a18bdeda64f049c8e9a68d1d18
@@ -7009,7 +9055,7 @@ Date:   Mon Jun 27 00:38:20 2011 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=653462
 
- gi/overrides/Gtk.py |    3 +++
+ gi/overrides/Gtk.py | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 5b1c875269b7979caae97e84919a690a34d92f29
@@ -7026,7 +9072,7 @@ Date:   Mon Jun 27 00:36:20 2011 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=653462
 
- gi/overrides/Gdk.py |    8 ++++++++
+ gi/overrides/Gdk.py | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 commit 187a2932bbf1e724f759ff3ed3392fc7341c6aa8
@@ -7037,13 +9083,13 @@ Date:   Mon Aug 8 12:06:18 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=625596
 
- gi/pygi-cache.c          |   39 +++++++++++
- gi/pygi-cache.h          |    4 ++
- gi/pygi-invoke.c         |  162
- ++++++++++++++++++++++++++++++++++++++++++++--
- gi/types.py              |   12 ++--
- tests/test_everything.py |    2 +-
- tests/test_gi.py         |   58 +++++++++++++++++
+ gi/pygi-cache.c          |  39 ++++++++++++
+ gi/pygi-cache.h          |   4 ++
+ gi/pygi-invoke.c         | 162
+ +++++++++++++++++++++++++++++++++++++++++++++--
+ gi/types.py              |  12 ++--
+ tests/test_everything.py |   2 +-
+ tests/test_gi.py         |  58 +++++++++++++++++
  6 files changed, 265 insertions(+), 12 deletions(-)
 
 commit e5df32ffbf37481dbb6a70c4d4e7b7b9778c5549
@@ -7052,7 +9098,7 @@ Date:   Sat Aug 13 04:13:28 2011 -0400
 
     remove references to deprecated GI_INFO_TYPE_ERROR_DOMAIN
 
- gi/pygi-info.c |    5 -----
+ gi/pygi-info.c | 5 -----
  1 file changed, 5 deletions(-)
 
 commit 745001178fc72be5626c7211366d694f41162987
@@ -7065,7 +9111,7 @@ Date:   Thu Aug 11 15:11:42 2011 +0200
     works. Also
     update the warning to explain how to fix the problem.
 
- gi/_gobject/__init__.py |    8 ++++----
+ gi/_gobject/__init__.py | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 25d2d05cba05414cd4551e0e06f6286a9b97a509
@@ -7078,9 +9124,9 @@ Date:   Fri Jul 22 15:46:31 2011 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=642048
 
- gi/importer.py |   11 +++---
- gi/module.py   |  118
- ++++++++++++++++++++++++++++----------------------------
+ gi/importer.py |  11 +++---
+ gi/module.py   | 118
+ ++++++++++++++++++++++++++++-----------------------------
  2 files changed, 64 insertions(+), 65 deletions(-)
 
 commit 698b2284e29c0f699198cf6a22eeb0e399daba6e
@@ -7091,7 +9137,7 @@ Date:   Fri Jul 22 15:45:09 2011 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=642048
 
- gi/__init__.py |    2 +-
+ gi/__init__.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 7b068ebe59884ebd9aeb4425dc80cdff73a66fb1
@@ -7102,12 +9148,12 @@ Date:   Fri Jul 22 14:13:02 2011 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=642048
 
- tests/test_mainloop.py   |    7 +++----
- tests/test_option.py     |    3 ++-
- tests/test_source.py     |   24 +++++++++++-------------
- tests/test_subprocess.py |   12 +++++-------
- tests/test_thread.py     |   10 ++++------
- tests/test_uris.py       |    4 ++--
+ tests/test_mainloop.py   |  7 +++----
+ tests/test_option.py     |  3 ++-
+ tests/test_source.py     | 24 +++++++++++-------------
+ tests/test_subprocess.py | 12 +++++-------
+ tests/test_thread.py     | 10 ++++------
+ tests/test_uris.py       |  4 ++--
  6 files changed, 27 insertions(+), 33 deletions(-)
 
 commit 191ef79315f8a5641699536fde58da18e23ef904
@@ -7118,8 +9164,8 @@ Date:   Fri Jul 22 14:11:53 2011 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=642048
 
- gi/importer.py |    7 +++++--
- gi/module.py   |   32 +++++++++++++++++++++++++++++---
+ gi/importer.py |  7 +++++--
+ gi/module.py   | 32 +++++++++++++++++++++++++++++---
  2 files changed, 34 insertions(+), 5 deletions(-)
 
 commit fbd4a8263260c187211799454c08b1e55e2cb998
@@ -7130,13 +9176,13 @@ Date:   Fri Jul 22 12:27:41 2011 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=642048
 
- gi/_glib/pygiochannel.c     |   38 +++++++++++++++++++-------------------
- gi/_glib/pygmaincontext.c   |    2 +-
- gi/_glib/pygmainloop.c      |    4 ++--
- gi/_glib/pygoptioncontext.c |    4 ++--
- gi/_glib/pygoptiongroup.c   |    4 ++--
- gi/_glib/pygsource.c        |   14 +++++++-------
- gi/_glib/pygspawn.c         |   14 +++++++-------
+ gi/_glib/pygiochannel.c     | 38 +++++++++++++++++++-------------------
+ gi/_glib/pygmaincontext.c   |  2 +-
+ gi/_glib/pygmainloop.c      |  4 ++--
+ gi/_glib/pygoptioncontext.c |  4 ++--
+ gi/_glib/pygoptiongroup.c   |  4 ++--
+ gi/_glib/pygsource.c        | 14 +++++++-------
+ gi/_glib/pygspawn.c         | 14 +++++++-------
  7 files changed, 40 insertions(+), 40 deletions(-)
 
 commit 7431b49a161df9178c55b814d3adff992ac2d722
@@ -7147,9 +9193,9 @@ Date:   Fri Jul 22 12:26:32 2011 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=642048
 
- gi/Makefile.am          |    2 +-
- gi/_glib/Makefile.am    |   10 +++++-----
- gi/_gobject/Makefile.am |    2 +-
+ gi/Makefile.am          |  2 +-
+ gi/_glib/Makefile.am    | 10 +++++-----
+ gi/_gobject/Makefile.am |  2 +-
  3 files changed, 7 insertions(+), 7 deletions(-)
 
 commit b8700451acd4a19b59b64fc8641fca748d2189e2
@@ -7167,22 +9213,22 @@ Date:   Fri Jul 22 11:20:09 2011 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=642048
 
- tests/runtests-windows.py |    4 +-
- tests/test_gdbus.py       |   12 ++---
- tests/test_gi.py          |    4 +-
- tests/test_gobject.py     |   31 ++++++------
- tests/test_interface.py   |   16 +++---
- tests/test_mainloop.py    |    3 +-
- tests/test_overrides.py   |    8 +--
- tests/test_properties.py  |  124
- ++++++++++++++++++++++-----------------------
- tests/test_signal.py      |   98 +++++++++++++++++------------------
- tests/test_source.py      |    5 +-
- tests/test_subprocess.py  |    3 +-
- tests/test_thread.py      |    5 +-
- tests/test_unknown.py     |    8 +--
- tests/testhelpermodule.c  |    2 +-
- tests/testmodule.py       |   10 ++--
+ tests/runtests-windows.py |   4 +-
+ tests/test_gdbus.py       |  12 ++---
+ tests/test_gi.py          |   4 +-
+ tests/test_gobject.py     |  31 ++++++------
+ tests/test_interface.py   |  16 +++---
+ tests/test_mainloop.py    |   3 +-
+ tests/test_overrides.py   |   8 +--
+ tests/test_properties.py  | 124
+ +++++++++++++++++++++++-----------------------
+ tests/test_signal.py      |  98 ++++++++++++++++++------------------
+ tests/test_source.py      |   5 +-
+ tests/test_subprocess.py  |   3 +-
+ tests/test_thread.py      |   5 +-
+ tests/test_unknown.py     |   8 +--
+ tests/testhelpermodule.c  |   2 +-
+ tests/testmodule.py       |  10 ++--
  15 files changed, 169 insertions(+), 164 deletions(-)
 
 commit c980dae21468fe073cc8782608148c346bb90ad7
@@ -7193,10 +9239,10 @@ Date:   Fri Jul 22 11:16:00 2011 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=642048
 
- gi/_glib/__init__.py  |    3 ++-
- gi/_glib/glibmodule.c |   10 +++++-----
- gi/_glib/option.py    |    4 ++--
- gi/_glib/pyglib.c     |   18 +++++++++---------
+ gi/_glib/__init__.py  |  3 ++-
+ gi/_glib/glibmodule.c | 10 +++++-----
+ gi/_glib/option.py    |  4 ++--
+ gi/_glib/pyglib.c     | 18 +++++++++---------
  4 files changed, 18 insertions(+), 17 deletions(-)
 
 commit 65ac35cca8d24f4c133991e1c6ac02f49416a9a4
@@ -7212,12 +9258,12 @@ Date:   Fri Jul 22 11:10:46 2011 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=642048
 
- gi/_gobject/__init__.py       |   20 +++++++++++++-------
- gi/_gobject/constants.py      |    3 +--
- gi/_gobject/gobjectmodule.c   |    2 +-
- gi/_gobject/propertyhelper.py |   11 +++++------
- gi/_gobject/pygobject.c       |   16 ++++++++--------
- gi/_gobject/pygobject.h       |    2 +-
+ gi/_gobject/__init__.py       | 20 +++++++++++++-------
+ gi/_gobject/constants.py      |  3 +--
+ gi/_gobject/gobjectmodule.c   |  2 +-
+ gi/_gobject/propertyhelper.py | 11 +++++------
+ gi/_gobject/pygobject.c       | 16 ++++++++--------
+ gi/_gobject/pygobject.h       |  2 +-
  6 files changed, 29 insertions(+), 25 deletions(-)
 
 commit 59ed1289f76bc287443b3974710ea0da3e2cc8cc
@@ -7228,12 +9274,12 @@ Date:   Fri Jul 22 11:07:10 2011 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=642048
 
- gi/importer.py           |    2 --
- gi/module.py             |   31 ++++++++++++++++---------------
- gi/overrides/Gtk.py      |    2 +-
- gi/overrides/__init__.py |    6 +++---
- gi/pygobject-external.h  |    2 +-
- gi/types.py              |   12 ++++++------
+ gi/importer.py           |  2 --
+ gi/module.py             | 31 ++++++++++++++++---------------
+ gi/overrides/Gtk.py      |  2 +-
+ gi/overrides/__init__.py |  6 +++---
+ gi/pygobject-external.h  |  2 +-
+ gi/types.py              | 12 ++++++------
  6 files changed, 27 insertions(+), 28 deletions(-)
 
 commit 6b9d738d78c6ac45d49f00402c89356887555069
@@ -7358,9 +9404,9 @@ Date:   Mon Jul 18 18:46:31 2011 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=642048
 
- Makefile.am |    5 ----
- pygtk.py    |   95
- -----------------------------------------------------------
+ Makefile.am |  5 ----
+ pygtk.py    | 95
+ -------------------------------------------------------------
  2 files changed, 100 deletions(-)
 
 commit 75e9f7d80d9224c05e6063b88479f1baee48c489
@@ -7371,11 +9417,11 @@ Date:   Mon Jul 18 18:41:41 2011 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=642048
 
- Makefile.am         |    8 +-------
- configure.ac        |   43 +++++++++++++++++--------------------------
- gi/pygi.h           |   37 -------------------------------------
- gobject/Makefile.am |    5 +----
- tests/Makefile.am   |    7 +------
+ Makefile.am         |  8 +-------
+ configure.ac        | 43 +++++++++++++++++--------------------------
+ gi/pygi.h           | 37 -------------------------------------
+ gobject/Makefile.am |  5 +----
+ tests/Makefile.am   |  7 +------
  5 files changed, 20 insertions(+), 80 deletions(-)
 
 commit d862168d6a82edd59547d39f5b0ab8279b1e511c
@@ -7386,12 +9432,12 @@ Date:   Mon Jul 18 18:28:50 2011 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=642048
 
- Makefile.am                     |    2 +-
- configure.ac                    |    4 ++--
- pygobject-2.0-uninstalled.pc.in |   18 ------------------
- pygobject-2.0.pc.in             |   22 ----------------------
- pygobject-3.0-uninstalled.pc.in |   18 ++++++++++++++++++
- pygobject-3.0.pc.in             |   22 ++++++++++++++++++++++
+ Makefile.am                     |  2 +-
+ configure.ac                    |  4 ++--
+ pygobject-2.0-uninstalled.pc.in | 18 ------------------
+ pygobject-2.0.pc.in             | 22 ----------------------
+ pygobject-3.0-uninstalled.pc.in | 18 ++++++++++++++++++
+ pygobject-3.0.pc.in             | 22 ++++++++++++++++++++++
  6 files changed, 43 insertions(+), 43 deletions(-)
 
 commit 5189b360ccddbbaee267ce857968fbf1aafdd07a
@@ -7403,7 +9449,7 @@ Date:   Thu Aug 11 09:53:15 2011 +0200
     Callbacks still use GIArgument, add missing GVariant support for
     return types.
 
- gi/pygi-argument.c |    6 ++++--
+ gi/pygi-argument.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit 18a240cc492d2e5ebe2709a0d7155e27c8ff9e63
@@ -7416,7 +9462,7 @@ Date:   Wed Aug 10 14:11:10 2011 +0200
     is the
     equivalent of what commit 9d5604220bd56 did for pygi_marshall_*().
 
- gi/pygi-argument.c |    7 +++++++
+ gi/pygi-argument.c | 7 +++++++
  1 file changed, 7 insertions(+)
 
 commit aa820d6ce2fee83e61e3e9de7c6b7d2452e2847d
@@ -7426,7 +9472,7 @@ Date:   Mon Aug 8 01:58:10 2011 +0200
     [gi] Fix crash: check return value of
     _invoke_state_init_from_callable_cache() before continuing.
 
- gi/pygi-invoke.c |    4 +++-
+ gi/pygi-invoke.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit eaad9f3c71cedfe28ff2d2bb05ea6c64e323715f
@@ -7436,8 +9482,8 @@ Date:   Fri Aug 5 21:03:33 2011 +0200
     [gi] Pass gtype as first parameter to vfuncs (instead of using
     kwargs).
 
- gi/pygi-invoke.c |   32 ++++++++++++++++++--------------
- gi/types.py      |    2 +-
+ gi/pygi-invoke.c | 32 ++++++++++++++++++--------------
+ gi/types.py      |  2 +-
  2 files changed, 19 insertions(+), 15 deletions(-)
 
 commit 76edfd0d5776f61c92c84fd9fb8dcc246c580e93
@@ -7483,10 +9529,10 @@ Date:   Mon Jul 18 11:04:58 2011 -0400
     remove some left over ifdefs to complete merge of the invoke-rewrite
     branch
 
- gi/pygi-cache.h   |    2 --
- gi/pygi-info.c    |    2 --
- gi/pygi-private.h |    5 +----
- gi/pygi.h         |    2 --
+ gi/pygi-cache.h   | 2 --
+ gi/pygi-info.c    | 2 --
+ gi/pygi-private.h | 5 +----
+ gi/pygi.h         | 2 --
  4 files changed, 1 insertion(+), 10 deletions(-)
 
 commit 8c653ec3033fab47c4bb4071b5732a349357141f
@@ -7495,11 +9541,11 @@ Date:   Mon Jul 18 10:59:45 2011 -0400
 
     rename pygi-invoke-ng to pygi-invoke
 
- gi/Makefile.am      |    3 +-
- gi/pygi-invoke-ng.c |  464
- ---------------------------------------------------
- gi/pygi-invoke.c    |  464
- +++++++++++++++++++++++++++++++++++++++++++++++++++
+ gi/Makefile.am      |   3 +-
+ gi/pygi-invoke-ng.c | 464
+ ----------------------------------------------------
+ gi/pygi-invoke.c    | 464
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 466 insertions(+), 465 deletions(-)
 
 commit 62d59fa2c2b31d7a3cac8996d58234d4b13bb19f
@@ -7553,7 +9599,7 @@ Date:   Thu Jul 14 11:21:10 2011 +0200
 
     Ship tests/te_ST@nouppera in release tarballs for tests to succeed
 
- tests/Makefile.am |    1 +
+ tests/Makefile.am | 1 +
  1 file changed, 1 insertion(+)
 
 commit e024e832ab9c82d3e299cc6e1cb427de44f2d16e
@@ -7562,8 +9608,8 @@ Date:   Wed Jul 13 15:43:02 2011 -0400
 
     [invoke] break out caller_allocates allocating into its own function
 
- gi/pygi-invoke-ng.c |   78
- ++++++++++++++++++++++++++++++++-------------------
+ gi/pygi-invoke-ng.c | 78
+ +++++++++++++++++++++++++++++++++--------------------
  1 file changed, 49 insertions(+), 29 deletions(-)
 
 commit fc8b8ce768ac780f7ed9edc63b70dd35194153c0
@@ -7572,7 +9618,7 @@ Date:   Wed Jul 13 15:42:26 2011 -0400
 
     [invoke] missed a bit when removing constructor_class usage
 
- gi/pygi-invoke-ng.c |    2 +-
+ gi/pygi-invoke-ng.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit c94bcf4ae7e36f90c356c89712b00609f9f849bd
@@ -7581,8 +9627,8 @@ Date:   Wed Jul 13 15:16:17 2011 -0400
 
     [invoke] don't hold on to the constructor class, just add a TODO
 
- gi/pygi-invoke-ng.c           |   11 +++++------
- gi/pygi-invoke-state-struct.h |    1 -
+ gi/pygi-invoke-ng.c           | 11 +++++------
+ gi/pygi-invoke-state-struct.h |  1 -
  2 files changed, 5 insertions(+), 7 deletions(-)
 
 commit c11d3195f324ea41e86e3da7ff99b55425c2faec
@@ -7597,7 +9643,7 @@ Date:   Wed Jul 13 10:40:25 2011 +0200
     completely with
     Python 3. Rewrite it to use gi.repository.Gio.
 
- tests/test_properties.py |   38 +++++++++++++++++++-------------------
+ tests/test_properties.py | 38 +++++++++++++++++++-------------------
  1 file changed, 19 insertions(+), 19 deletions(-)
 
 commit 8f89ff24fcac627ce15ca93038711fded1a7c5ed
@@ -7610,7 +9656,7 @@ Date:   Wed Jul 13 08:42:22 2011 +0200
     str method.
     This unbreaks gi/module.py for Python 3 again.
 
- gi/module.py |    8 ++++++--
+ gi/module.py | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 commit 20aea4b052126fa0bface3e6e0dccfd77f9505b1
@@ -7619,8 +9665,8 @@ Date:   Fri Jul 8 14:39:22 2011 -0400
 
     [caching] remove all inline compiler flags
 
- gi/pygi-cache.c |   96
- +++++++++++++++++++++++++++----------------------------
+ gi/pygi-cache.c | 96
+ ++++++++++++++++++++++++++++-----------------------------
  1 file changed, 48 insertions(+), 48 deletions(-)
 
 commit bf7bb79b66ad406063fb443e7452d830c55986ef
@@ -7629,8 +9675,8 @@ Date:   Fri Jul 8 14:35:20 2011 -0400
 
     [caching] refactor function names to be less confusing
 
- gi/pygi-cache.c |  307
- +++++++++++++++++++++++++++----------------------------
+ gi/pygi-cache.c | 307
+ +++++++++++++++++++++++++++-----------------------------
  1 file changed, 150 insertions(+), 157 deletions(-)
 
 commit c167a9345b01c070bd5a84b4a4b3a53baf9e217d
@@ -7651,7 +9697,7 @@ Date:   Fri Jul 8 11:24:09 2011 -0400
     NO_SEPARATOR
       flag
 
- gi/overrides/Gtk.py |   13 ++++++++-----
+ gi/overrides/Gtk.py | 13 ++++++++-----
  1 file changed, 8 insertions(+), 5 deletions(-)
 
 commit 367e4ededd4a45125157050bcc9e4e685fd4a82d
@@ -7664,7 +9710,7 @@ Date:   Fri Jul 8 10:15:53 2011 +0200
     loop was
     never quit when the call failed.
 
- tests/test_gdbus.py |    6 ++++--
+ tests/test_gdbus.py | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit 11b578400cbf9f7c270b662a5e8953ccd466e5ef
@@ -7673,10 +9719,10 @@ Date:   Thu Jul 7 19:30:11 2011 -0400
 
     use an enum instead of booleans to denote function type
 
- gi/pygi-cache.c     |   85
- +++++++++++++++++++++++++++++----------------------
- gi/pygi-cache.h     |   18 ++++++++---
- gi/pygi-invoke-ng.c |    8 ++---
+ gi/pygi-cache.c     | 85
+ ++++++++++++++++++++++++++++++-----------------------
+ gi/pygi-cache.h     | 18 +++++++++---
+ gi/pygi-invoke-ng.c |  8 ++---
  3 files changed, 67 insertions(+), 44 deletions(-)
 
 commit 10e31005baec26f61c0f8fca2b5c0337b0be6c70
@@ -7685,11 +9731,11 @@ Date:   Thu Jul 7 15:18:03 2011 -0400
 
     rename aux arguments to child arguments to make their purpose clearer
 
- gi/pygi-cache.c     |   64
- +++++++++++++++++++++++++--------------------------
- gi/pygi-cache.h     |   29 +++++++++++++++--------
- gi/pygi-invoke-ng.c |   10 ++++----
- gi/pygi-marshal.c   |   12 +++++-----
+ gi/pygi-cache.c     | 64
+ ++++++++++++++++++++++++++---------------------------
+ gi/pygi-cache.h     | 29 ++++++++++++++++--------
+ gi/pygi-invoke-ng.c | 10 ++++-----
+ gi/pygi-marshal.c   | 12 +++++-----
  4 files changed, 63 insertions(+), 52 deletions(-)
 
 commit b4ad91c40f713ebdc278ce40b011e4adf9ddbbd7
@@ -7700,7 +9746,7 @@ Date:   Thu Jul 7 10:59:08 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=653844
 
- examples/cairo-demo.py |    6 ++----
+ examples/cairo-demo.py | 6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)
 
 commit a606bab1ddc605167f2e9dc7c46c8f929fdce23b
@@ -7711,8 +9757,8 @@ Date:   Tue Jul 5 14:28:20 2011 -0700
 
     https://bugzilla.gnome.org/show_bug.cgi?id=654056
 
- gi/overrides/Gtk.py     |    8 ++++++++
- tests/test_overrides.py |   13 ++++++++++++-
+ gi/overrides/Gtk.py     |  8 ++++++++
+ tests/test_overrides.py | 13 ++++++++++++-
  2 files changed, 20 insertions(+), 1 deletion(-)
 
 commit fc5c869486c7f6929e285ea7a86623ec41ecd9bd
@@ -7755,7 +9801,7 @@ Date:   Thu Jul 7 13:39:19 2011 +0200
     Gtk.main()
     -------------- 8< -----------------
 
- gi/overrides/Gtk.py |	 10 ++++++++--
+ gi/overrides/Gtk.py | 10 ++++++++--
  1 file changed, 8 insertions(+), 2 deletions(-)
 
 commit 5c04fc5b2ca7e262c052426d5863d69d0c4a24da
@@ -7764,10 +9810,10 @@ Date:	Tue Jul 5 15:57:23 2011 -0400
 
     use gssize instead of int for arg indexes
 
- gi/pygi-cache.c	   |   24 ++++++++++++------------
- gi/pygi-cache.h	   |	6 +++---
- gi/pygi-invoke-ng.c	   |	6 +++---
- gi/pygi-marshal-cleanup.c |	6 +++---
+ gi/pygi-cache.c	   | 24 ++++++++++++------------
+ gi/pygi-cache.h	   |  6 +++---
+ gi/pygi-invoke-ng.c	   |  6 +++---
+ gi/pygi-marshal-cleanup.c |  6 +++---
  4 files changed, 21 insertions(+), 21 deletions(-)
 
 commit ecc09749c34cd4eabf47cc722d768b042dc0be9f
@@ -7776,7 +9822,7 @@ Date:	Tue Jul 5 14:17:30 2011 -0400
 
     [cache] remove refrence to default value as it is not implemented yet
 
- gi/pygi-cache.h |    1 -
+ gi/pygi-cache.h | 1 -
  1 file changed, 1 deletion(-)
 
 commit 433e0fb259047d8c81e5949a31abb5e0feefd27b
@@ -7787,7 +9833,7 @@ Date:	Thu May 12 18:53:06 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=647581
 
- gi/pygi-argument.c |	 2 ++
+ gi/pygi-argument.c | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 38cca3c14e79fbc383e3fc65a120bee03714b99f
@@ -7796,7 +9842,7 @@ Date:	Fri Jul 1 05:19:15 2011 -0400
 
     correctly initialize the _gi_cairo_functions array to be zero filled
 
- gi/pygi-foreign-cairo.c |    2 +-
+ gi/pygi-foreign-cairo.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 9ae43fdbcc547eb1e3c61bf9545da40555b2e2c6
@@ -7805,7 +9851,7 @@ Date:	Fri Jul 1 05:19:15 2011 -0400
 
     correctly initialize the _gi_cairo_functions array to be zero filled
 
- gi/pygi-foreign-cairo.c |    2 +-
+ gi/pygi-foreign-cairo.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d3ee40b36b1718e6fb4544dbe07e291138ea1eb9
@@ -7814,7 +9860,7 @@ Date:	Wed Jun 29 18:14:40 2011 -0400
 
     pass in the address of the gerror, not the gerror itself
 
- gi/pygi-argument.c |	 2 +-
+ gi/pygi-argument.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 49dc98eb9339ea64355cd752ca000c79da56f3a2
@@ -7823,7 +9869,7 @@ Date:	Wed Jun 29 18:01:44 2011 -0400
 
     [gi] handle marshalling gerrors arguments for signals
 
- gi/pygi-argument.c |	18 ++++++++++++++++--
+ gi/pygi-argument.c | 18 ++++++++++++++++--
  1 file changed, 16 insertions(+), 2 deletions(-)
 
 commit db9419fcef628e9ffee10591156007ea9c0bc1f0
@@ -7833,7 +9879,7 @@ Date:	Wed Jun 29 12:12:29 2011 -0400
     [gi-invoke-ng] fix NULL check to check before we access the cache
     struct
 
- gi/pygi-cache.c |    6 +++---
+ gi/pygi-cache.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 9027e1a20fd06df5c26edcec1893ef0814ec938a
@@ -7845,7 +9891,7 @@ Date:	Tue Jun 28 18:21:55 2011 -0400
       * make sure we can store a custom GObject as a PyObject inside of
       a TreeModel
 
- tests/test_overrides.py |   26 +++++++++++++++-----------
+ tests/test_overrides.py | 26 +++++++++++++++-----------
  1 file changed, 15 insertions(+), 11 deletions(-)
 
 commit b6842e4b2a28733e143d4022864041ca82e91f7a
@@ -7857,8 +9903,8 @@ Date:	Tue Jun 28 18:13:38 2011 -0400
      * box the PYGOBJECT in a GValue so we can store PyGObjects in a
      TreeModel row
 
- gi/overrides/Gtk.py |	  7 ++++---
- gobject/pygtype.c   |	  7 ++++---
+ gi/overrides/Gtk.py | 7 ++++---
+ gobject/pygtype.c   | 7 ++++---
  2 files changed, 8 insertions(+), 6 deletions(-)
 
 commit 7fc9d45860210fd9d333fd3769c6cf93a6a20eb6
@@ -7867,7 +9913,7 @@ Date:	Tue Jun 28 17:32:29 2011 -0400
 
     [gi-invoke-ng] copy structs when transfer is full for array
 
- gi/pygi-marshal.c |   21 ++++++++++++++++++---
+ gi/pygi-marshal.c | 21 ++++++++++++++++++---
  1 file changed, 18 insertions(+), 3 deletions(-)
 
 commit 8d60c0bc7b327aa757a8727f1146f02cc0b78af8
@@ -7880,7 +9926,7 @@ Date:	Tue Jun 28 13:54:48 2011 -0400
      importing 2.0
        which is not supported
 
- gi/overrides/Gtk.py |	 12 ++++++++++++
+ gi/overrides/Gtk.py | 12 ++++++++++++
  1 file changed, 12 insertions(+)
 
 commit 7c589c0c1de1a786e00685afd5292b6fb1f93ed3
@@ -7906,7 +9952,7 @@ Date:	Tue Jun 28 13:08:49 2011 -0400
        dict
        to avoid name clashing
 
- gi/overrides/Gtk.py |	  5 +++++
+ gi/overrides/Gtk.py | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 2aa12267bee91aa696633a0cea2a0accae09250a
@@ -7917,8 +9963,8 @@ Date:	Mon Jun 27 10:56:20 2011 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=653488
 
- gobject/propertyhelper.py |   23 ++++++++++++++++-------
- tests/test_properties.py  |   40 ++++++++++++++++++++++++++++++++++++----
+ gobject/propertyhelper.py | 23 ++++++++++++++++-------
+ tests/test_properties.py  | 40 ++++++++++++++++++++++++++++++++++++----
  2 files changed, 52 insertions(+), 11 deletions(-)
 
 commit dc62e67b447ef526a6f2d1aa8648ad101d95024b
@@ -7929,8 +9975,8 @@ Date:	Mon Jun 27 10:56:20 2011 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=653488
 
- gobject/propertyhelper.py |   23 ++++++++++++++++-------
- tests/test_properties.py  |   40 ++++++++++++++++++++++++++++++++++++----
+ gobject/propertyhelper.py | 23 ++++++++++++++++-------
+ tests/test_properties.py  | 40 ++++++++++++++++++++++++++++++++++++----
  2 files changed, 52 insertions(+), 11 deletions(-)
 
 commit 50cfccb5801c1b9a0a42ffe2826cd245f21fd88d
@@ -7940,8 +9986,8 @@ Date:	Fri Jun 24 14:17:24 2011 -0400
     [gi-invoke-ng] use g_slice for allocating GValues that are caller
     allocated
 
- gi/pygi-invoke-ng.c	   |	2 ++
- gi/pygi-marshal-cleanup.c |	2 ++
+ gi/pygi-invoke-ng.c	   | 2 ++
+ gi/pygi-marshal-cleanup.c | 2 ++
  2 files changed, 4 insertions(+)
 
 commit eff65cd2ce490296865441c3c78b7846f380459c
@@ -7951,8 +9997,8 @@ Date:	Fri Jun 24 11:49:05 2011 -0400
     [gi-invoke-ng] Convert Overflow errors to ValueErrors when marshalling
     integers
 
- gi/pygi-marshal.c |   56
- +++++++++++++++++++++++++++++++++++++++++------------
+ gi/pygi-marshal.c | 56
+ +++++++++++++++++++++++++++++++++++++++++++------------
  1 file changed, 44 insertions(+), 12 deletions(-)
 
 commit 05ed688d54e3ff04e961b60d0b5d3ed0b97c771d
@@ -7962,7 +10008,7 @@ Date:	Wed Jun 22 12:26:39 2011 -0400
     [gi-invoke-ng] only cache caller allocates for interfaces as some
     API are broken
 
- gi/pygi-cache.c |    6 ++++--
+ gi/pygi-cache.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit 4fd957a5de364c0588168dee15e1e61d4f12e173
@@ -7971,7 +10017,7 @@ Date:	Fri Jun 17 17:07:56 2011 -0400
 
     [gi-invoke-ng] handle in pointer array marshalling
 
- gi/pygi-marshal.c |   28 ++++++++++++++++++++++------
+ gi/pygi-marshal.c | 28 ++++++++++++++++++++++------
  1 file changed, 22 insertions(+), 6 deletions(-)
 
 commit df3911ad2ce83af9bf9679ed1b221847b23ba2de
@@ -7980,7 +10026,7 @@ Date:	Fri Jun 10 08:44:04 2011 +0300
 
     Adding GPtrArray tests
 
- tests/test_gi.py |   43 ++++++++++++++++++++++++++++++++++++++++++-
+ tests/test_gi.py | 43 ++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 42 insertions(+), 1 deletion(-)
 
 commit e32c2be53175014399d89e1e85c9afc6e53c94be
@@ -7993,7 +10039,7 @@ Date:	Fri Jun 17 11:32:28 2011 -0400
       relying on the size of GIArgument
     * special case GPtrArrays
 
- gi/pygi-marshal.c |   27 +++++++++------------------
+ gi/pygi-marshal.c | 27 +++++++++------------------
  1 file changed, 9 insertions(+), 18 deletions(-)
 
 commit 6e8dc28cb261cafbfed40fc0797a0dd5f91f497b
@@ -8003,7 +10049,7 @@ Date:	Wed Jun 15 12:46:03 2011 -0400
     [gi] don't clean up arguments that weren't yet processed during in
     arg failure
 
- gi/pygi-marshal-cleanup.c |	2 +-
+ gi/pygi-marshal-cleanup.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit af7c93ea98b7f492eef265e58c8b3c878805524f
@@ -8015,8 +10061,8 @@ Date:	Wed Jun 15 12:06:47 2011 -0400
 
     * init is now skipped in the gir
 
- gi/overrides/GLib.py	 |   18 ++++++++----------
- tests/test_overrides.py |    6 ++----
+ gi/overrides/GLib.py	 | 18 ++++++++----------
+ tests/test_overrides.py |  6 ++----
  2 files changed, 10 insertions(+), 14 deletions(-)
 
 commit c6112307f29f9a850e6e9efa5f55d5d4a363c6b0
@@ -8025,7 +10071,7 @@ Date:	Wed Jun 15 11:42:45 2011 -0400
 
     [gi-invoke-ng] actual code to import overrides
 
- gi/pygi-cache.c |    7 +------
+ gi/pygi-cache.c | 7 +------
  1 file changed, 1 insertion(+), 6 deletions(-)
 
 commit 902575d857beffb14e56821ea8a52f705385f6bb
@@ -8034,7 +10080,7 @@ Date:	Wed Jun 15 11:25:10 2011 -0400
 
     [gi-invoke-ng] import pytypes so we get overrides
 
- gi/pygi-marshal.c |	4 +++-
+ gi/pygi-marshal.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit 9d5604220bd56ae2708e9b74122c14208e0a30b4
@@ -8043,7 +10089,7 @@ Date:	Tue Jun 14 16:13:37 2011 -0400
 
     [gi-invoke-ng] handle gvariants now that they are not foreign
 
- gi/pygi-marshal.c |	7 ++++++-
+ gi/pygi-marshal.c | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 commit c1f5651062687e800a52b5d8d16c88c0acde2934
@@ -8052,7 +10098,7 @@ Date:	Tue Jun 14 16:12:43 2011 -0400
 
     [gi-invoke-ng] do not try to clean up NULL arguments
 
- gi/pygi-marshal-cleanup.c |   24 ++++++++++++++++--------
+ gi/pygi-marshal-cleanup.c | 24 ++++++++++++++++--------
  1 file changed, 16 insertions(+), 8 deletions(-)
 
 commit fbf5382fbc1aed49ed491d2255d616a1643a45fc
@@ -8075,7 +10121,7 @@ Date:	Fri Jun 10 14:01:32 2011 +0200
 
     closure: avoid double free crash
 
- gi/pygi-closure.c |   12 ++++--------
+ gi/pygi-closure.c | 12 ++++--------
  1 file changed, 4 insertions(+), 8 deletions(-)
 
 commit 929f4236f2b8601e7960a4a7b0a860d976ad83c6
@@ -8087,8 +10133,8 @@ Date:	Fri Jun 3 23:11:17 2011 -0700
     Call Gdk.Color.equal and Gdk.RGBA.equal when
     == equality testing is used.
 
- gi/overrides/Gdk.py	 |    6 ++++++
- tests/test_overrides.py |    4 ++++
+ gi/overrides/Gdk.py	 | 6 ++++++
+ tests/test_overrides.py | 4 ++++
  2 files changed, 10 insertions(+)
 
 commit dff5961ba229c7c34bd7b0a18a446b56bbe39e3a
@@ -8097,7 +10143,7 @@ Date:	Wed Jun 8 19:13:48 2011 +0200
 
     closure: Check the out arg is not null. Fixes bug #651812
 
- gi/pygi-closure.c |	3 +++
+ gi/pygi-closure.c | 3 +++
  1 file changed, 3 insertions(+)
 
 commit d7d178206bfbb0858556fcfd6c9ca8eefda3fdf5
@@ -8106,7 +10152,7 @@ Date:	Wed Jun 8 09:47:20 2011 +0200
 
     Use constants instead of literals
 
- tests/test_overrides.py |    8 ++++----
+ tests/test_overrides.py | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit fe386a0ad548a23e30e9cb947bfa2198fb48ef29
@@ -8117,8 +10163,8 @@ Date:	Mon Jun 6 19:07:22 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=647509
 
- gi/pygi-argument.c |	 8 ++++----
- gi/pygi-invoke.c   |	20 +++++++++++++-------
+ gi/pygi-argument.c |  8 ++++----
+ gi/pygi-invoke.c   | 20 +++++++++++++-------
  2 files changed, 17 insertions(+), 11 deletions(-)
 
 commit bd7b8d96a7420522c1fdc127ef8cfb7d6e8a1b31
@@ -8129,7 +10175,7 @@ Date:	Mon Jun 6 19:05:07 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=647509
 
- gi/gimodule.c |    2 +-
+ gi/gimodule.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2d73012e5dbcc45a5782a6c119dfb272c14b5a61
@@ -8140,7 +10186,7 @@ Date:	Mon Jun 6 17:38:21 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=647509
 
- gi/module.py |    4 +++-
+ gi/module.py | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit d82e6c8d1d9f2fc48fdcc15b7d2a97e4f24cf3bf
@@ -8149,8 +10195,8 @@ Date:	Mon Jun 6 17:24:28 2011 +0200
 
     Merge gi/HACKING into /HACKING
 
- HACKING    |	16 ++++++++++++++++
- gi/HACKING |	26 --------------------------
+ HACKING    | 16 ++++++++++++++++
+ gi/HACKING | 26 --------------------------
  2 files changed, 16 insertions(+), 26 deletions(-)
 
 commit 92aca4416a7930e5870b8d1a4016bae8140462ee
@@ -8199,8 +10245,8 @@ Date:	Fri Jun 3 16:59:15 2011 +0100
 
     Thanks to Bernie Innocenti for initial diagnosis.
 
- glib/pygsource.c    |	  6 ++++--
- gobject/pygobject.c |	  8 +++++++-
+ glib/pygsource.c    | 6 ++++--
+ gobject/pygobject.c | 8 +++++++-
  2 files changed, 11 insertions(+), 3 deletions(-)
 
 commit 4c9bcedb4e11ad66a4b86174e2425c7afcafc473
@@ -8209,7 +10255,7 @@ Date:	Tue May 31 16:59:41 2011 -0400
 
     [gi-invoke-ng] enable invoke-ng by default
 
- configure.ac |    8 ++++----
+ configure.ac | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 2e4cfb85a55ff205e263591d573ee5ecf0ffff3e
@@ -8218,7 +10264,7 @@ Date:	Tue May 31 16:37:21 2011 -0400
 
     [gi-invoke-ng] add code to clean up when input values fail to marshal
 
- gi/pygi-marshal-cleanup.c |   30 +++++++++++++++++++++++++-----
+ gi/pygi-marshal-cleanup.c | 30 +++++++++++++++++++++++++-----
  1 file changed, 25 insertions(+), 5 deletions(-)
 
 commit 508b1b6ca1b143f1e123a3ddb83e8ce146758dfc
@@ -8227,10 +10273,10 @@ Date:	Tue May 31 16:01:03 2011 -0400
 
     [gi-invoke-ng] add hash cleanup routines
 
- gi/pygi-cache.c	   |	2 ++
- gi/pygi-marshal-cleanup.c |   64
- +++++++++++++++++++++++++++++++++++++++++++++
- gi/pygi-marshal-cleanup.h |   10 +++++--
+ gi/pygi-cache.c	   |  2 ++
+ gi/pygi-marshal-cleanup.c | 64
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ gi/pygi-marshal-cleanup.h | 10 ++++++--
  3 files changed, 74 insertions(+), 2 deletions(-)
 
 commit 1954c75b94a74259b4e5d28f5ff8d76aa4610832
@@ -8239,7 +10285,7 @@ Date:	Tue May 31 14:47:30 2011 -0400
 
     [gi-invoke-ng] handle arrays with transfers of GI_TRANSFER_CONTAINER
 
- gi/pygi-marshal-cleanup.c |	3 ++-
+ gi/pygi-marshal-cleanup.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit b626c46b4a95602c7bf1278c2a39aacb7f5027d9
@@ -8248,10 +10294,10 @@ Date:	Tue May 31 14:40:49 2011 -0400
 
     [gi-invoke-ng] add list cleanup routines
 
- gi/pygi-cache.c	   |	8 ++---
- gi/pygi-marshal-cleanup.c |   84
- +++++++++++++++++++++++++++++++++++++++++++++
- gi/pygi-marshal-cleanup.h |	8 +++++
+ gi/pygi-cache.c	   |  8 ++---
+ gi/pygi-marshal-cleanup.c | 84
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ gi/pygi-marshal-cleanup.h |  8 +++++
  3 files changed, 96 insertions(+), 4 deletions(-)
 
 commit 2e542c327cd52c1f77af28905557dd25c64175d8
@@ -8260,7 +10306,7 @@ Date:	Thu May 26 16:10:13 2011 -0400
 
     indentation fix
 
- gi/pygi-marshal.c |	8 ++++----
+ gi/pygi-marshal.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 601aec11c49e821fe97dd30a2187fe3c75844712
@@ -8269,9 +10315,9 @@ Date:	Thu May 26 16:09:38 2011 -0400
 
     [gi-invoke-ng] add out array cleanup
 
- gi/pygi-cache.c	   |	2 +-
- gi/pygi-marshal-cleanup.c |   24 ++++++++++++++++++++++++
- gi/pygi-marshal.c	   |   37 +++++++++++++++++++++++++++++++------
+ gi/pygi-cache.c	   |  2 +-
+ gi/pygi-marshal-cleanup.c | 24 ++++++++++++++++++++++++
+ gi/pygi-marshal.c	   | 37 +++++++++++++++++++++++++++++++------
  3 files changed, 56 insertions(+), 7 deletions(-)
 
 commit e9ad4428b769f8c9ace1cdc973c684de84fb1a5e
@@ -8283,7 +10329,7 @@ Date:	Thu May 26 13:22:38 2011 -0400
     * We are simply setting our own array so we don't want any allocate
     null byte
 
- gi/pygi-marshal.c |	2 +-
+ gi/pygi-marshal.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a986b2b8e5ee37f2a330f5aabc85c73ebb0de508
@@ -8292,11 +10338,11 @@ Date:	Thu May 26 13:21:55 2011 -0400
 
     [gi-invoke-ng] add array cleanup for in arrays
 
- gi/pygi-cache.c	   |	2 +-
- gi/pygi-marshal-cleanup.c |   72
- ++++++++++++++++++++++++++++++++++++++++++++-
- gi/pygi-marshal-cleanup.h |	9 ++++++
- gi/pygi-marshal.c	   |   13 ++++++--
+ gi/pygi-cache.c	   |  2 +-
+ gi/pygi-marshal-cleanup.c | 72
+ ++++++++++++++++++++++++++++++++++++++++++++++-
+ gi/pygi-marshal-cleanup.h |  9 ++++++
+ gi/pygi-marshal.c	   | 13 +++++++--
  4 files changed, 91 insertions(+), 5 deletions(-)
 
 commit 990c60805c8ef718eb29e2e1b24f057552c6159e
@@ -8305,8 +10351,8 @@ Date:	Mon May 23 17:06:30 2011 -0400
 
     [gi-invoke-ng] remove remaining bits of the invoke stage state machine
 
- gi/pygi-invoke-ng.c	       |    7 +------
- gi/pygi-invoke-state-struct.h |   14 --------------
+ gi/pygi-invoke-ng.c	       |  7 +------
+ gi/pygi-invoke-state-struct.h | 14 --------------
  2 files changed, 1 insertion(+), 20 deletions(-)
 
 commit dbbcf4a0e76fb572d85843ee31c3798df5cd5cc5
@@ -8325,14 +10371,14 @@ Date:	Mon May 23 16:59:57 2011 -0400
       happens at
       each stage
 
- gi/pygi-cache.c	       |   19 ++-
- gi/pygi-cache.h	       |    7 +-
- gi/pygi-invoke-ng.c	       |   10 +-
- gi/pygi-invoke-state-struct.h |    2 +
- gi/pygi-marshal-cleanup.c     |  301
- ++++++++++++++++-------------------------
- gi/pygi-marshal-cleanup.h     |   45 +++---
- gi/pygi-marshal.c	       |   15 +-
+ gi/pygi-cache.c	       |  19 ++-
+ gi/pygi-cache.h	       |   7 +-
+ gi/pygi-invoke-ng.c	       |  10 +-
+ gi/pygi-invoke-state-struct.h |   2 +
+ gi/pygi-marshal-cleanup.c     | 301
+ +++++++++++++++++-------------------------
+ gi/pygi-marshal-cleanup.h     |  45 ++++---
+ gi/pygi-marshal.c	       |  15 +--
  7 files changed, 174 insertions(+), 225 deletions(-)
 
 commit 198714dc4585f7463f38929f1ca4e4b60a27dadb
@@ -8346,10 +10392,10 @@ Date:	Thu May 12 17:29:20 2011 -0400
     * Now we call specific cleanup functions at the point of failure (or
       successful completion of a marshalling stage)
 
- gi/pygi-invoke-ng.c	   |   59 ++++++++++++++++++++++++++++++-------
- gi/pygi-marshal-cleanup.c |   72
- +++++++++++++++++++++++++++++++++++++++++++++
- gi/pygi-marshal-cleanup.h |   14 +++++++++
+ gi/pygi-invoke-ng.c	   | 59 +++++++++++++++++++++++++++++++-------
+ gi/pygi-marshal-cleanup.c | 72
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ gi/pygi-marshal-cleanup.h | 14 +++++++++
  3 files changed, 135 insertions(+), 10 deletions(-)
 
 commit c1389dadbf35afee3f28d90ef637efd8c1f071a5
@@ -8367,7 +10413,7 @@ Date:	Thu May 12 11:53:40 2011 -0400
 	flow of
 	processing.
 
- codegen/docextract.py |    4 ++--
+ codegen/docextract.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 303d8e8ab9e60cb554de7fc0e8592cd9b2c50843
@@ -8386,8 +10432,8 @@ Date:	Mon May 9 17:32:09 2011 -0400
 	as long
 	as the C API is still unstable.
 
- codegen/docextract.py	      |   15 ++++++++++++++-
- codegen/docextract_to_xml.py |    9 ++++++---
+ codegen/docextract.py	      | 15 ++++++++++++++-
+ codegen/docextract_to_xml.py |  9 ++++++---
  2 files changed, 20 insertions(+), 4 deletions(-)
 
 commit 4f615c6e300d6f2d7551b640efa301060206ab58
@@ -8396,11 +10442,11 @@ Date:	Thu May 5 14:04:34 2011 -0400
 
     [gi-invoke-ng] tweek cleanup routines
 
- gi/pygi-cache.c	   |	5 +++
- gi/pygi-marshal-cleanup.c |   87
- ++++++++++++++++++++++++++++++++++-----------
- gi/pygi-marshal-cleanup.h |	6 ++--
- gi/pygi-marshal.c	   |   11 ++----
+ gi/pygi-cache.c	   |  5 +++
+ gi/pygi-marshal-cleanup.c | 87
+ +++++++++++++++++++++++++++++++++++------------
+ gi/pygi-marshal-cleanup.h |  6 ++--
+ gi/pygi-marshal.c	   | 11 ++----
  4 files changed, 76 insertions(+), 33 deletions(-)
 
 commit 63c7f17c224821cb7136d06e8ef87eab7291848d
@@ -8426,10 +10472,10 @@ Date:	Mon May 2 15:49:52 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=649165
 
- gi/module.py	      |    9 ++++++++-
- tests/te_ST@nouppera |   50
+ gi/module.py	      |  9 ++++++++-
+ tests/te_ST@nouppera | 50
  ++++++++++++++++++++++++++++++++++++++++++++++++++
- tests/test_gi.py     |   30 ++++++++++++++++++++++++++++++
+ tests/test_gi.py     | 30 ++++++++++++++++++++++++++++++
  3 files changed, 88 insertions(+), 1 deletion(-)
 
 commit b5e150da76c3d4de1a75f58d03c3a761e9005a63
@@ -8438,7 +10484,7 @@ Date:	Wed May 4 08:35:27 2011 +0200
 
     [gi] pygi-convert.sh: Convert gtk.gdk.CROSSHAIR
 
- pygi-convert.sh |    1 +
+ pygi-convert.sh | 1 +
  1 file changed, 1 insertion(+)
 
 commit fcc5ea201ab25da6db94ea8a37364a1d3c4d7c65
@@ -8447,7 +10493,7 @@ Date:	Fri Apr 29 17:41:08 2011 -0400
 
     [gi-invoke-ng] handle filename cleanup with the utf8 cleanup function
 
- gi/pygi-cache.c |    2 ++
+ gi/pygi-cache.c | 2 ++
  1 file changed, 2 insertions(+)
 
 commit dbe8c4fabc8ac19415a3be0e854d3a54c2317e0b
@@ -8456,10 +10502,10 @@ Date:	Fri Apr 29 17:40:13 2011 -0400
 
     [gi-invoke-ng] handle caller allocates cleanup
 
- gi/pygi-invoke-ng.c	   |	5 ++-
- gi/pygi-marshal-cleanup.c |  104
- ++++++++++++++++++++++++++++++++++++---------
- gi/pygi-marshal-cleanup.h |	7 +--
+ gi/pygi-invoke-ng.c	   |   5 ++-
+ gi/pygi-marshal-cleanup.c | 104
+ ++++++++++++++++++++++++++++++++++++----------
+ gi/pygi-marshal-cleanup.h |   7 ++--
  3 files changed, 90 insertions(+), 26 deletions(-)
 
 commit cdbf57f3b1f041a06cf545a5557424f701ed1ec7
@@ -8469,12 +10515,12 @@ Date:	Thu Apr 28 19:16:02 2011 -0400
     [gi-invoke-ng] refactor the cleanup code and add utf8 cleanup as
     initial test
 
- gi/pygi-cache.c	       |   15 ++----------
- gi/pygi-invoke-ng.c	       |    8 +++----
- gi/pygi-invoke-state-struct.h |    2 ++
- gi/pygi-marshal-cleanup.c     |   51
- ++++++++++++++++++++++++++++++++++++++++-
- gi/pygi-marshal-cleanup.h     |    3 +++
+ gi/pygi-cache.c	       | 15 ++-----------
+ gi/pygi-invoke-ng.c	       |  8 +++----
+ gi/pygi-invoke-state-struct.h |  2 ++
+ gi/pygi-marshal-cleanup.c     | 51
+ ++++++++++++++++++++++++++++++++++++++++++-
+ gi/pygi-marshal-cleanup.h     |  3 +++
  5 files changed, 60 insertions(+), 19 deletions(-)
 
 commit d1f1f4ccc55f9ecab73b7c0ee78762c4039b2c79
@@ -8487,8 +10533,8 @@ Date:	Wed Apr 27 15:47:19 2011 -0400
     * PyCObject is deprecated and pycairo 1.10.0 is first release to
     fix this issue
 
- configure.ac		 |   15 +++++++++++----
- gi/pygi-foreign-cairo.c |    2 +-
+ configure.ac		 | 15 +++++++++++----
+ gi/pygi-foreign-cairo.c |  2 +-
  2 files changed, 12 insertions(+), 5 deletions(-)
 
 commit 83b7823a510b0b391560c6deaf9d15d8303c7b14
@@ -8497,7 +10543,7 @@ Date:	Thu Apr 21 16:52:20 2011 +0200
 
     [python3] fix build. PYcairo_IMPORT doesn't exists anymore
 
- gi/pygi-foreign-cairo.c |    7 ++++++-
+ gi/pygi-foreign-cairo.c | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 commit 3e933784df423757e591d703614cb700adb0bbe0
@@ -8506,7 +10552,7 @@ Date:	Mon Apr 18 18:36:25 2011 +0200
 
     Updated DOAP file
 
- pygobject.doap |   15 +++++++++++++++
+ pygobject.doap | 15 +++++++++++++++
  1 file changed, 15 insertions(+)
 
 commit 399d06b4b20685eb38acfd7e43226e06737ab7d2
@@ -8515,7 +10561,7 @@ Date:	Sat Apr 16 16:02:05 2011 +0200
 
     [gi] Don't create variant twice
 
- gi/overrides/GLib.py |    2 +-
+ gi/overrides/GLib.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 8d8a84ea23d28d25851c5870f261c020d762cef4
@@ -8527,7 +10573,7 @@ Date:	Fri Apr 15 16:14:43 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=647736
 
- pygi-convert.sh |    1 +
+ pygi-convert.sh | 1 +
  1 file changed, 1 insertion(+)
 
 commit 3b51d6426d0f59b2dd7e0dcdcded4bed43d6b9d8
@@ -8540,7 +10586,7 @@ Date:	Fri Apr 15 15:58:53 2011 +0200
     https://bugzilla.gnome.org/show_bug.cgi?id=639952
     https://bugzilla.gnome.org/show_bug.cgi?id=647796
 
- gi/overrides/GLib.py |   14 +-------------
+ gi/overrides/GLib.py | 14 +-------------
  1 file changed, 1 insertion(+), 13 deletions(-)
 
 commit bb4dce14ba666969815d4e56adbc38f0ac4f7ff7
@@ -8549,7 +10595,7 @@ Date:	Fri Apr 15 15:58:31 2011 +0200
 
     [gi] Added additional test case for GVariant handling
 
- tests/test_overrides.py |   15 +++++++++++++++
+ tests/test_overrides.py | 15 +++++++++++++++
  1 file changed, 15 insertions(+)
 
 commit 138df2778543409752e229a09828a805f68a420d
@@ -8564,7 +10610,7 @@ Date:	Mon Apr 11 18:34:31 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=647477
 
- gi/pygi-argument.c |	 2 ++
+ gi/pygi-argument.c | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 985f239d891c7697d76ccecb797b189669ae6ee1
@@ -8580,8 +10626,8 @@ Date:	Tue Mar 22 18:46:28 2011 -0400
      * this restores that code while still keeping unicode and python 3
        compatability
 
- gobject/pygtype.c	  |   28 +++++++++++++++++++---------
- tests/test_properties.py |    8 ++++++++
+ gobject/pygtype.c	  | 28 +++++++++++++++++++---------
+ tests/test_properties.py |  8 ++++++++
  2 files changed, 27 insertions(+), 9 deletions(-)
 
 commit 58cfc3cd1152b4448b56a6ff597f954d8450b83e
@@ -8591,7 +10637,7 @@ Date:	Tue Mar 22 20:47:51 2011 +0100
     dsextras.py: ensure eol characters are preserved when writing template
     files (so \n does not become \r\n)
 
- dsextras.py |	  2 +-
+ dsextras.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 629d267478982c426ba61a639d5c9603fed856e6
@@ -8600,7 +10646,7 @@ Date:	Tue Mar 22 11:35:44 2011 +0100
 
     dsextras.py: remove \r as wel as \n character
 
- dsextras.py |	  2 +-
+ dsextras.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 426c7109d4c0dbf0d56cc075f97f33b3451f79a8
@@ -8613,8 +10659,8 @@ Date:	Wed Apr 27 15:47:19 2011 -0400
     * PyCObject is deprecated and pycairo 1.10.0 is first release to
     fix this issue
 
- configure.ac		 |   15 +++++++++++----
- gi/pygi-foreign-cairo.c |    2 +-
+ configure.ac		 | 15 +++++++++++----
+ gi/pygi-foreign-cairo.c |  2 +-
  2 files changed, 12 insertions(+), 5 deletions(-)
 
 commit 4e5833d0c2fe548617e5ea510f05920fd0caf73b
@@ -8623,7 +10669,7 @@ Date:	Thu Apr 21 16:52:20 2011 +0200
 
     [python3] fix build. PYcairo_IMPORT doesn't exists anymore
 
- gi/pygi-foreign-cairo.c |    7 ++++++-
+ gi/pygi-foreign-cairo.c | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 commit 91ec337359720839862d3f5a8a0ea98f760a0752
@@ -8632,7 +10678,7 @@ Date:	Mon Apr 18 18:36:25 2011 +0200
 
     Updated DOAP file
 
- pygobject.doap |   15 +++++++++++++++
+ pygobject.doap | 15 +++++++++++++++
  1 file changed, 15 insertions(+)
 
 commit 05c766044c83340c44564d0097514bfc1d1d9df7
@@ -8641,7 +10687,7 @@ Date:	Sat Apr 16 16:02:05 2011 +0200
 
     [gi] Don't create variant twice
 
- gi/overrides/GLib.py |    2 +-
+ gi/overrides/GLib.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit eb8f212e3687af30407cf01fcdfbf530257bcddb
@@ -8653,7 +10699,7 @@ Date:	Fri Apr 15 16:14:43 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=647736
 
- pygi-convert.sh |    1 +
+ pygi-convert.sh | 1 +
  1 file changed, 1 insertion(+)
 
 commit af31729573de24161ee90563e5738187c749783c
@@ -8666,7 +10712,7 @@ Date:	Fri Apr 15 15:58:53 2011 +0200
     https://bugzilla.gnome.org/show_bug.cgi?id=639952
     https://bugzilla.gnome.org/show_bug.cgi?id=647796
 
- gi/overrides/GLib.py |   14 +-------------
+ gi/overrides/GLib.py | 14 +-------------
  1 file changed, 1 insertion(+), 13 deletions(-)
 
 commit 070f6688be4afb926656038dcceac4c8b8ed97c7
@@ -8675,7 +10721,7 @@ Date:	Fri Apr 15 15:58:31 2011 +0200
 
     [gi] Added additional test case for GVariant handling
 
- tests/test_overrides.py |   15 +++++++++++++++
+ tests/test_overrides.py | 15 +++++++++++++++
  1 file changed, 15 insertions(+)
 
 commit 65aa040e86d94ee6bb227a2bce09668b60208027
@@ -8684,7 +10730,7 @@ Date:	Tue Apr 12 14:51:35 2011 -0400
 
     [gi-invoke-ng] fix prototype
 
- gi/pygi-cache.h |    2 +-
+ gi/pygi-cache.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 12aa4e6376366ca9d758434f6544c9c70a1e5df8
@@ -8700,15 +10746,15 @@ Date:	Tue Apr 12 14:48:16 2011 -0400
     marshalling
       the out parameters and at any time an error occures
 
- gi/Makefile.am		       |    4 +-
- gi/pygi-cache.c	       |   25 +++++++------
- gi/pygi-cache.h	       |    5 ++-
- gi/pygi-invoke-ng.c	       |   34 ++++++++++++++---
- gi/pygi-invoke-state-struct.h |   13 +++++++
- gi/pygi-marshal-cleanup.c     |   81
- +++++++++++++++++++++++++++++++++++++++++
- gi/pygi-marshal-cleanup.h     |   43 ++++++++++++++++++++++
- gi/pygi-marshal.c	       |    1 +
+ gi/Makefile.am		       |  4 ++-
+ gi/pygi-cache.c	       | 25 +++++++------
+ gi/pygi-cache.h	       |  5 ++-
+ gi/pygi-invoke-ng.c	       | 34 ++++++++++++++----
+ gi/pygi-invoke-state-struct.h | 13 +++++++
+ gi/pygi-marshal-cleanup.c     | 81
+ +++++++++++++++++++++++++++++++++++++++++++
+ gi/pygi-marshal-cleanup.h     | 43 +++++++++++++++++++++++
+ gi/pygi-marshal.c	       |  1 +
  8 files changed, 187 insertions(+), 19 deletions(-)
 
 commit 0463295cd046bd6382ad9dc71ea1518858d63c5f
@@ -8723,7 +10769,7 @@ Date:	Mon Apr 11 18:34:31 2011 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=647477
 
- gi/pygi-argument.c |	 2 ++
+ gi/pygi-argument.c | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 1d64c3d3db2ec17b9a48df55271f712db6c07060
@@ -8733,7 +10779,7 @@ Date:	Wed Mar 30 16:40:31 2011 -0400
     [gi-invoke-ng] fix marshal header that is no longer part of
     pygi-arguments.h
 
- gi/pygi-marshal.h |	8 ++++----
+ gi/pygi-marshal.h | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 3580cd1c7222022ebeef3476f9e609c8045f12a3
@@ -8742,10 +10788,10 @@ Date:	Wed Mar 30 15:53:13 2011 -0400
 
     [gi-invoke-ng] code style space fixes
 
- gi/pygi-cache.c     |	420 +++++++++++++++++++-------------------
- gi/pygi-invoke-ng.c |	145 +++++++------
- gi/pygi-marshal.c   |	565
- ++++++++++++++++++++++++++-------------------------
+ gi/pygi-cache.c     | 420 +++++++++++++++++++-------------------
+ gi/pygi-invoke-ng.c | 145 +++++++-------
+ gi/pygi-marshal.c   | 565
+ ++++++++++++++++++++++++++--------------------------
  3 files changed, 566 insertions(+), 564 deletions(-)
 
 commit 81662fcd09f112bfffcdc5b7f01a5537b84cd9d4
@@ -8754,7 +10800,7 @@ Date:	Tue Mar 29 16:54:44 2011 -0400
 
     [gi-invoke-ng] don't decref value taken from a dict as it is borrowed
 
- gi/pygi-invoke-ng.c |	  1 -
+ gi/pygi-invoke-ng.c | 1 -
  1 file changed, 1 deletion(-)
 
 commit a456fc0adc1f8a0754bf59cde8924f905bfc7dc1
@@ -8763,7 +10809,7 @@ Date:	Tue Mar 29 15:23:06 2011 -0400
 
     [gi-invoke-ng] return None when appropriate so we don't crash
 
- gi/pygi-marshal.c |   18 +++++++++++++++++-
+ gi/pygi-marshal.c | 18 +++++++++++++++++-
  1 file changed, 17 insertions(+), 1 deletion(-)
 
 commit e8c8c37e5587dc7ff62519df336988a12e6f5d0a
@@ -8772,7 +10818,7 @@ Date:	Tue Mar 29 15:21:41 2011 -0400
 
     [gi-invoke-ng] fix aux value caching
 
- gi/pygi-cache.c |   15 ++++++++++-----
+ gi/pygi-cache.c | 15 ++++++++++-----
  1 file changed, 10 insertions(+), 5 deletions(-)
 
 commit 4e4c1847c713a4eb4ab34d04488e94dac24d9167
@@ -8781,7 +10827,7 @@ Date:	Mon Mar 28 20:25:46 2011 -0400
 
     [gi-invoke-ng] backport handling flags with no gtype
 
- gi/pygi-marshal.c |   25 ++++++++++++++++++++++++-
+ gi/pygi-marshal.c | 25 ++++++++++++++++++++++++-
  1 file changed, 24 insertions(+), 1 deletion(-)
 
 commit fd76423e655b3711e1ffbf9b61ea4e2c94040234
@@ -8790,7 +10836,7 @@ Date:	Mon Mar 28 18:32:00 2011 -0400
 
     [gi-invoke-ng] backport raw gvalue handling
 
- gi/pygi-marshal.c |   23 ++++++++++++++++++-----
+ gi/pygi-marshal.c | 23 ++++++++++++++++++-----
  1 file changed, 18 insertions(+), 5 deletions(-)
 
 commit 507b5051c83f70ceae79e0fa693c86e5cbb9f442
@@ -8800,8 +10846,8 @@ Date:	Mon Mar 28 18:30:31 2011 -0400
     [gi-invoke-ng] marshal instances seperately since they differ slightly
     from other args
 
- gi/pygi-cache.c   |	2 +-
- gi/pygi-marshal.c |   38 ++++++++++++++++++++++++++++++++++++++
+ gi/pygi-cache.c   |  2 +-
+ gi/pygi-marshal.c | 38 ++++++++++++++++++++++++++++++++++++++
  2 files changed, 39 insertions(+), 1 deletion(-)
 
 commit 726a27c0e74ace3ff23d9cc4d393ae53e57f1fac
@@ -8810,14 +10856,14 @@ Date:	Mon Mar 28 18:26:09 2011 -0400
 
     [gi-invoke-ng] refactor FunctionCache to be more generic CallableCache
 
- gi/pygi-cache.c     |	392
- ++++++++++++++++++++++++++-------------------------
- gi/pygi-cache.h     |	 12 +-
- gi/pygi-info.c      |	  2 +-
- gi/pygi-invoke-ng.c |	 40 +++---
- gi/pygi-marshal.c   |	140 +++++++++---------
- gi/pygi-marshal.h   |	159 +++++++++------------
- gi/pygi.h	     |	  2 +-
+ gi/pygi-cache.c     | 392
+ +++++++++++++++++++++++++++-------------------------
+ gi/pygi-cache.h     |	12 +-
+ gi/pygi-info.c      |	 2 +-
+ gi/pygi-invoke-ng.c |	40 +++---
+ gi/pygi-marshal.c   | 140 +++++++++----------
+ gi/pygi-marshal.h   | 159 +++++++++------------
+ gi/pygi.h	     |	 2 +-
  7 files changed, 362 insertions(+), 385 deletions(-)
 
 commit 3d5d9ff5c18a850650992bdd52e8e4c722b23396
@@ -8826,7 +10872,7 @@ Date:	Mon Mar 28 15:01:12 2011 -0400
 
     [gi-invoke-rewrite] backport glib error handling
 
- gi/pygi-invoke-ng.c |	 14 ++++++--------
+ gi/pygi-invoke-ng.c | 14 ++++++--------
  1 file changed, 6 insertions(+), 8 deletions(-)
 
 commit 37b14b28a5f2aec16ac7f321efbf07e1403e9531
@@ -8835,7 +10881,7 @@ Date:	Fri Mar 25 18:48:42 2011 -0400
 
     [gi-invoke-ng] backport closure passing from invoke
 
- gi/pygi-marshal.c |   13 ++++++++++---
+ gi/pygi-marshal.c | 13 ++++++++++---
  1 file changed, 10 insertions(+), 3 deletions(-)
 
 commit cf7f97eabc9c49773c2916929b8c43ef453d0652
@@ -8844,11 +10890,11 @@ Date:	Fri Mar 25 18:47:36 2011 -0400
 
     [gi-invoke-ng] handle vfuncs and fix cosntrutors
 
- gi/pygi-cache.c	       |    9 +++++++
- gi/pygi-cache.h	       |    2 ++
- gi/pygi-invoke-ng.c	       |   56
- ++++++++++++++++++++++++++++++-----------
- gi/pygi-invoke-state-struct.h |    2 ++
+ gi/pygi-cache.c	       |  9 +++++++
+ gi/pygi-cache.h	       |  2 ++
+ gi/pygi-invoke-ng.c	       | 56
+ ++++++++++++++++++++++++++++++++-----------
+ gi/pygi-invoke-state-struct.h |  2 ++
  4 files changed, 55 insertions(+), 14 deletions(-)
 
 commit af2ce400fcf771ee6c9bc01aecfb59467be5a0ce
@@ -8857,8 +10903,8 @@ Date:	Fri Mar 25 18:39:06 2011 -0400
 
     [gi-invoke-ng] handle foreign types correctly
 
- gi/pygi-cache.c   |   22 ++++++----------------
- gi/pygi-marshal.c |	3 +++
+ gi/pygi-cache.c   | 22 ++++++----------------
+ gi/pygi-marshal.c |  3 +++
  2 files changed, 9 insertions(+), 16 deletions(-)
 
 commit 482553ae5d863ca523be3bd1eededa5d02a4f87e
@@ -8872,9 +10918,9 @@ Date:	Fri Mar 25 13:14:01 2011 -0400
        and g_object_new to do the construction we ignore this for now but
        keep it around in the state for future use.
 
- gi/pygi-invoke-ng.c	       |   46
- +++++++++++++++++++++++++++++++++++------
- gi/pygi-invoke-state-struct.h |    1 +
+ gi/pygi-invoke-ng.c	       | 46
+ +++++++++++++++++++++++++++++++++++++------
+ gi/pygi-invoke-state-struct.h |  1 +
  2 files changed, 41 insertions(+), 6 deletions(-)
 
 commit 0534eb0e843cdf09611143da184052f7e549e4dc
@@ -8890,8 +10936,8 @@ Date:	Tue Mar 22 18:46:28 2011 -0400
      * this restores that code while still keeping unicode and python 3
        compatability
 
- gobject/pygtype.c	  |   28 +++++++++++++++++++---------
- tests/test_properties.py |    8 ++++++++
+ gobject/pygtype.c	  | 28 +++++++++++++++++++---------
+ tests/test_properties.py |  8 ++++++++
  2 files changed, 27 insertions(+), 9 deletions(-)
 
 commit 5f0e130026a663a57ed1317e0fa0e1f78f9e6e0a
@@ -8901,7 +10947,7 @@ Date:	Tue Mar 22 20:47:51 2011 +0100
     dsextras.py: ensure eol characters are preserved when writing template
     files (so \n does not become \r\n)
 
- dsextras.py |	  2 +-
+ dsextras.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 62a6274105003ef386ddfe9ef38e8afa8c43d124
@@ -8910,7 +10956,7 @@ Date:	Tue Mar 22 11:35:44 2011 +0100
 
     dsextras.py: remove \r as wel as \n character
 
- dsextras.py |	  2 +-
+ dsextras.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 86c436978c933f6ebe17627abe98325ce66f6baa
@@ -8934,12 +10980,12 @@ Date:	Tue Mar 22 15:40:02 2011 -0400
 
     [gi] conditionalize invoke code paths
 
- configure.ac	   |	7 +++++++
- gi/Makefile.am    |   20 +++++++++++++++-----
- gi/pygi-cache.h   |	2 ++
- gi/pygi-info.c    |	4 +++-
- gi/pygi-private.h |	9 +++++++--
- gi/pygi.h	   |	4 +++-
+ configure.ac	   |  7 +++++++
+ gi/Makefile.am    | 20 +++++++++++++++-----
+ gi/pygi-cache.h   |  2 ++
+ gi/pygi-info.c    |  4 +++-
+ gi/pygi-private.h |  9 +++++++--
+ gi/pygi.h	   |  4 +++-
  6 files changed, 37 insertions(+), 9 deletions(-)
 
 commit 83c51bd2bb6ca24ce610c04cff1527bcd2689d90
@@ -8948,7 +10994,7 @@ Date:	Tue Mar 22 15:37:24 2011 -0400
 
     [gi] revert back to the type.py from master
 
- gi/types.py |	 21 +++++++++++++++------
+ gi/types.py | 21 +++++++++++++++------
  1 file changed, 15 insertions(+), 6 deletions(-)
 
 commit cb30d00d1c92e73d9bfb08cc7b600a5aa70f2fc0
@@ -8958,9 +11004,9 @@ Date:	Tue Mar 22 14:46:29 2011 -0400
     [gi] revert pygi-argument.h and move the invoke-ng code to
     pygi-marshal.h
 
- gi/pygi-argument.h |  268 +----------------------------------------
- gi/pygi-marshal.h  |  336
- ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ gi/pygi-argument.h | 268 +-----------------------------------------
+ gi/pygi-marshal.h  | 336
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 337 insertions(+), 267 deletions(-)
 
 commit 17cb714cfdaf45b6d7dd627b0189bd24e6578f74
@@ -8995,13 +11041,13 @@ Date:	Tue Mar 22 13:20:54 2011 -0400
        refcounting to keep track of
      * also fixes a bug where we were leaking PyNone ref counts
 
- gi/pygi-argument.c	    |	 4 ++--
- gi/pygi-foreign-cairo.c    |	16 ++++++++--------
- gi/pygi-foreign-gvariant.c |	12 ++++++------
- gi/pygi-foreign.c	    |	32 +++++++++++++-------------------
- gi/pygi-foreign.h	    |	 8 ++++----
- gi/pygi-invoke.c	    |	 6 +++---
- gi/pygi.h		    |	12 ++++++------
+ gi/pygi-argument.c	    |  4 ++--
+ gi/pygi-foreign-cairo.c    | 16 ++++++++--------
+ gi/pygi-foreign-gvariant.c | 12 ++++++------
+ gi/pygi-foreign.c	    | 32 +++++++++++++-------------------
+ gi/pygi-foreign.h	    |  8 ++++----
+ gi/pygi-invoke.c	    |  6 +++---
+ gi/pygi.h		    | 12 ++++++------
  7 files changed, 42 insertions(+), 48 deletions(-)
 
 commit fbabc1fdafa1dcbd1f6aaea7b821bd1c64a546ab
@@ -9018,8 +11064,8 @@ Date:	Tue Mar 22 15:04:01 2011 +0100
     prefer it
     over test_overrides.py's directory.
 
- tests/Makefile.am	 |    3 ++-
- tests/test_overrides.py |    4 +++-
+ tests/Makefile.am	 | 3 ++-
+ tests/test_overrides.py | 4 +++-
  2 files changed, 5 insertions(+), 2 deletions(-)
 
 commit 7332a1b99775519fdc5500cab6628b713e946a8c
@@ -9053,8 +11099,8 @@ Date:	Wed Mar 16 17:34:18 2011 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=644757
 
- gi/pygi-argument.c |	17 ++++++++++-------
- tests/test_gi.py   |	 4 ++++
+ gi/pygi-argument.c | 17 ++++++++++-------
+ tests/test_gi.py   |  4 ++++
  2 files changed, 14 insertions(+), 7 deletions(-)
 
 commit 1e70957c5470a0f4bceba38ca66a4e4274fdc8d8
@@ -9065,7 +11111,7 @@ Date:	Sun Mar 6 23:41:01 2011 +1300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=644347
 
- pygi-convert.sh |    7 +++++++
+ pygi-convert.sh | 7 +++++++
  1 file changed, 7 insertions(+)
 
 commit 2292673c96e7973a0732ca15bbd5b0bf7a9c7dcf
@@ -9076,7 +11122,7 @@ Date:	Sun Mar 6 23:41:30 2011 +1300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=644347
 
- pygi-convert.sh |   28 ----------------------------
+ pygi-convert.sh | 28 ----------------------------
  1 file changed, 28 deletions(-)
 
 commit d26e5cc45f277f6b7edb32aa416520bb53bff9c2
@@ -9085,8 +11131,8 @@ Date:	Fri Mar 11 14:09:02 2011 -0500
 
     [gi-demos] add pickers demo
 
- demos/gtk-demo/demos/pickers.py |   74
- +++++++++++++++++++++++++++++++++++++++
+ demos/gtk-demo/demos/pickers.py | 74
+ +++++++++++++++++++++++++++++++++++++++++
  1 file changed, 74 insertions(+)
 
 commit b8d926a458ed7d7e92719e41b5bc1c36f68882b3
@@ -9095,8 +11141,8 @@ Date:	Thu Mar 10 18:12:50 2011 -0500
 
     [gi-demos] add menu demo
 
- demos/gtk-demo/demos/menus.py |  122
- +++++++++++++++++++++++++++++++++++++++++
+ demos/gtk-demo/demos/menus.py | 122
+ ++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 122 insertions(+)
 
 commit 9baec8ed1c5d99c1677a75eaa1d38912f41f0b2d
@@ -9105,7 +11151,7 @@ Date:	Wed Mar 9 13:02:50 2011 -0500
 
     [gi-overrides] fix exception block so it works in Python 2.5
 
- gi/overrides/Gio.py |	  5 ++++-
+ gi/overrides/Gio.py | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit 5ac534ac3ceee3cc19fe2297e3cd009817ed726f
@@ -9124,10 +11170,10 @@ Date:	Mon Mar 21 13:19:58 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=620215
 
- gi/Makefile.am    |	4 +---
- glib/Makefile.am  |	2 +-
- m4/python.m4	   |	7 ++-----
- tests/Makefile.am |	2 +-
+ gi/Makefile.am    | 4 +---
+ glib/Makefile.am  | 2 +-
+ m4/python.m4	   | 7 ++-----
+ tests/Makefile.am | 2 +-
  4 files changed, 5 insertions(+), 10 deletions(-)
 
 commit cd01f8ce1373f28b1427dd847bef44f747f1e6b3
@@ -9136,7 +11182,7 @@ Date:	Fri Mar 18 17:06:08 2011 +0100
 
     setup.py: fix user_access_control option
 
- setup.py |    2 +-
+ setup.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2da60baec4f43c41f43527cbfde4e21e0eea728c
@@ -9149,7 +11195,7 @@ Date:	Wed Mar 16 10:22:35 2011 +0100
     to Tualatrix
     Chou for spotting this!
 
- gi/overrides/Gtk.py |	  1 +
+ gi/overrides/Gtk.py | 1 +
  1 file changed, 1 insertion(+)
 
 commit 029a79d1af1e0998aa6bc88ce1c1f48ce0ccd2a0
@@ -9173,8 +11219,8 @@ Date:	Tue Mar 15 10:22:39 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=644260
 
- gi/overrides/Gio.py |	 16 +++++++++++++++-
- tests/test_gdbus.py |	 13 +++++++++++++
+ gi/overrides/Gio.py | 16 +++++++++++++++-
+ tests/test_gdbus.py | 13 +++++++++++++
  2 files changed, 28 insertions(+), 1 deletion(-)
 
 commit 5bf66ce79267b25bcc80251f9170498fa1d765f6
@@ -9185,7 +11231,7 @@ Date:	Sun Mar 6 23:05:33 2011 +1300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=644343
 
- gi/overrides/Gtk.py |	  2 ++
+ gi/overrides/Gtk.py | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 8e4f86e17a1de533a93b0748fd8de3cbfa70ba62
@@ -9194,7 +11240,7 @@ Date:	Sun Mar 6 17:48:04 2011 +1300
 
     [gi-demos] dont try and run demos that represent directories
 
- demos/gtk-demo/gtk-demo.py |	 3 ++-
+ demos/gtk-demo/gtk-demo.py | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 097e5efab29d3d2d91d0b9fc75bf00219e9b7810
@@ -9203,10 +11249,10 @@ Date:	Mon Mar 7 18:09:18 2011 -0500
 
     [gi-demos] some python 3 compat fixes
 
- demos/gtk-demo/demos/Icon View/iconviewbasics.py |    6 ++++++
- demos/gtk-demo/demos/Tree View/liststore.py	  |    2 +-
- demos/gtk-demo/demos/rotatedtext.py		  |    4 ++--
- demos/gtk-demo/gtk-demo.py			  |    4 ++--
+ demos/gtk-demo/demos/Icon View/iconviewbasics.py | 6 ++++++
+ demos/gtk-demo/demos/Tree View/liststore.py	  | 2 +-
+ demos/gtk-demo/demos/rotatedtext.py		  | 4 ++--
+ demos/gtk-demo/gtk-demo.py			  | 4 ++--
  4 files changed, 11 insertions(+), 5 deletions(-)
 
 commit fd5d5ef3abc947d3c6066eea6378514f87b7f0ce
@@ -9215,8 +11261,8 @@ Date:	Tue Feb 22 15:07:40 2011 -0500
 
     [gi-demos] add liststore demo
 
- demos/gtk-demo/demos/Tree View/liststore.py |	205
- +++++++++++++++++++++++++++
+ demos/gtk-demo/demos/Tree View/liststore.py | 205
+ ++++++++++++++++++++++++++++
  1 file changed, 205 insertions(+)
 
 commit 09de5cf99474fc8a34b5f4a61cede1fb47353ebb
@@ -9225,7 +11271,7 @@ Date:	Mon Mar 7 18:08:40 2011 -0500
 
     [gi-demos] catch the correct error class
 
- demos/gtk-demo/demos/images.py |   11 ++++++-----
+ demos/gtk-demo/demos/images.py | 11 ++++++-----
  1 file changed, 6 insertions(+), 5 deletions(-)
 
 commit 7284d2d4622978fc9ddfd00f2714b3a572b7ab56
@@ -9242,8 +11288,8 @@ Date:	Sun Mar 6 21:18:36 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=644039
 
- gobject/propertyhelper.py |	5 ++---
- tests/test_properties.py  |   23 +++++++++++++++++++++++
+ gobject/propertyhelper.py |  5 ++---
+ tests/test_properties.py  | 23 +++++++++++++++++++++++
  2 files changed, 25 insertions(+), 3 deletions(-)
 
 commit 618dbb0ee15b47e5e7cb16a34ffce0937d7fa26d
@@ -9260,7 +11306,7 @@ Date:	Fri Mar 4 12:25:49 2011 -0500
     * PYGLIB_PyBytes_FromStringAndSize evaluates to a PyString in Python 2
       and a PyBytes object in Python 3
 
- gobject/pygtype.c |	2 +-
+ gobject/pygtype.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 7e9483ff75b7a63ddda0fa9a9847f9f22ad71240
@@ -9269,7 +11315,7 @@ Date:	Fri Mar 4 12:24:35 2011 -0500
 
     [gi-overrides] handle unichar gvalues when setting treemodels
 
- gi/overrides/Gtk.py |	 10 ++++++++++
+ gi/overrides/Gtk.py | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
 commit 6367bffa006e94dc667d7008fccad8d47d8d3646
@@ -9278,8 +11324,8 @@ Date:	Fri Mar 4 11:43:51 2011 -0500
 
     [gi-overrides] special case python 2 keywords that crept in
 
- gi/overrides/Gtk.py	 |    6 +++++-
- tests/test_overrides.py |    8 ++++----
+ gi/overrides/Gtk.py	 | 6 +++++-
+ tests/test_overrides.py | 8 ++++----
  2 files changed, 9 insertions(+), 5 deletions(-)
 
 commit 83b0f8a37d5f3236780d87a1ca466c5e44ae2bc0
@@ -9289,7 +11335,7 @@ Date:	Fri Mar 4 11:10:16 2011 -0500
     check for the py3 _thread module in configure.ac if thread is
     not found
 
- configure.ac |    6 +++++-
+ configure.ac | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit 4645af87d3c587f535404867dab56608719e5c7b
@@ -9298,8 +11344,8 @@ Date:	Fri Mar 4 00:39:23 2011 -0500
 
     [gi-demos] add iconview demo
 
- demos/gtk-demo/demos/Icon View/iconviewbasics.py |  212
- ++++++++++++++++++++++
+ demos/gtk-demo/demos/Icon View/iconviewbasics.py | 212
+ +++++++++++++++++++++++
  1 file changed, 212 insertions(+)
 
 commit 761dcb516a04f7a89b3c7d68e88fff23055e2a80
@@ -9312,7 +11358,7 @@ Date:	Thu Mar 3 18:39:16 2011 -0500
     sending in
       *args.  You can only send in **kwds.
 
- gi/types.py |	  2 +-
+ gi/types.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f9604e90af12a1b9dbe7d7f311308e87cd0ed7dd
@@ -9321,8 +11367,8 @@ Date:	Thu Mar 3 18:30:40 2011 -0500
 
     [gi-demos] add the combobox with string ids section to the demos
 
- demos/gtk-demo/demos/combobox.py |   49
- +++++++++++++++++++++++++++++++++++++-
+ demos/gtk-demo/demos/combobox.py | 49
+ +++++++++++++++++++++++++++++++++++++++-
  1 file changed, 48 insertions(+), 1 deletion(-)
 
 commit b70f4daf071cf77a4561b57f5521eb928f66d1ce
@@ -9331,8 +11377,8 @@ Date:	Thu Mar 3 16:47:51 2011 -0500
 
     [gi-overrides] add an override for Gdk.RGBA
 
- gi/overrides/Gdk.py	 |   18 ++++++++++++++++++
- tests/test_overrides.py |   10 ++++++++++
+ gi/overrides/Gdk.py	 | 18 ++++++++++++++++++
+ tests/test_overrides.py | 10 ++++++++++
  2 files changed, 28 insertions(+)
 
 commit ee2b63f60f350332ed21927721ed9ddff3a8034e
@@ -9342,7 +11388,7 @@ Date:	Thu Mar 3 16:10:17 2011 -0500
     [gi-demos] fix up search-entry to reflect annotations fixed in Gtk+
     master
 
- demos/gtk-demo/demos/Entry/search_entry.py |	23 +++++++++--------------
+ demos/gtk-demo/demos/Entry/search_entry.py | 23 +++++++++--------------
  1 file changed, 9 insertions(+), 14 deletions(-)
 
 commit cd046e4c355706ead5f512b810a2a48317f8c32e
@@ -9351,8 +11397,8 @@ Date:	Wed Mar 2 18:13:43 2011 -0500
 
     [gi-demos] add search entry demo
 
- demos/gtk-demo/demos/Entry/search_entry.py |  257
- ++++++++++++++++++++++++++++
+ demos/gtk-demo/demos/Entry/search_entry.py | 257
+ +++++++++++++++++++++++++++++
  1 file changed, 257 insertions(+)
 
 commit d5ddaa92e6349c2f52b67317326060973cb69661
@@ -9361,7 +11407,7 @@ Date:	Wed Mar 2 15:37:27 2011 -0500
 
     [gi] wrap map in a list for Python 3 compat
 
- gi/types.py |	  2 +-
+ gi/types.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 3e5ab72a2e1fa2d8c4c2864137c6251f264ff4af
@@ -9370,7 +11416,7 @@ Date:	Tue Mar 1 14:52:00 2011 -0500
 
     [gi-demos] fix up the validation combobox
 
- demos/gtk-demo/demos/combobox.py |   21 +++++++++++++++------
+ demos/gtk-demo/demos/combobox.py | 21 +++++++++++++++------
  1 file changed, 15 insertions(+), 6 deletions(-)
 
 commit 08af5f99f0838b3584f6a3b210d0a0304811e8ff
@@ -9379,7 +11425,7 @@ Date:	Tue Mar 1 12:31:35 2011 -0500
 
     add overridesdir variable in the .pc file for 3rd party overrides
 
- pygobject-2.0.pc.in |	  1 +
+ pygobject-2.0.pc.in | 1 +
  1 file changed, 1 insertion(+)
 
 commit 4a6b14a92a687a2311516b2c16c355216b5270a7
@@ -9388,7 +11434,7 @@ Date:	Fri Feb 11 17:14:11 2011 +0100
 
     setup.py: Set bdist_wininst user-access-control property
 
- setup.py |    3 ++-
+ setup.py | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit ad3ab659b83cb985730e19a83651da319d4bcb9c
@@ -9397,7 +11443,7 @@ Date:	Wed Mar 2 16:29:00 2011 +0100
 
     Fix uninitialized variable in gi.require_version()
 
- gi/__init__.py |    3 ++-
+ gi/__init__.py | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 6e7606ee8830f6f51b777f41f6df2f6ea1784e89
@@ -9411,7 +11457,7 @@ Date:	Tue Mar 1 23:26:07 2011 +0100
     visible strings. Ensure that these do not get translated in the
     test suite.
 
- tests/runtests.py |	2 ++
+ tests/runtests.py | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 0461e05174637ae02f34029b85ba217d5ae48c53
@@ -9420,8 +11466,8 @@ Date:	Mon Feb 28 18:21:43 2011 -0500
 
     [gi-overrides] override Gtk.stock_lookup to not return success
 
- demos/gtk-demo/demos/combobox.py |    2 +-
- gi/overrides/Gtk.py		  |    9 +++++++++
+ demos/gtk-demo/demos/combobox.py | 2 +-
+ gi/overrides/Gtk.py		  | 9 +++++++++
  2 files changed, 10 insertions(+), 1 deletion(-)
 
 commit 40decf3501823004a6e4d3acbbf204c4d4d0a7ec
@@ -9431,7 +11477,7 @@ Date:	Mon Feb 28 14:16:00 2011 -0500
     update NEWS to reflect changes in the 2.27.91 release (PYGOBJECT_2_28
     branch)
 
- NEWS |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ NEWS | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 50 insertions(+)
 
 commit c2d5122b8e3cf51ec52418f90f1788895b842b6a
@@ -9445,7 +11491,7 @@ Date:	Mon Feb 28 14:08:05 2011 -0500
      use this
        instead of creating our own button press event
 
- tests/test_overrides.py |    9 +++++----
+ tests/test_overrides.py | 9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)
 
 commit 1be1a2ea2787dffeb71ab4a38233fb71e761bd21
@@ -9459,7 +11505,7 @@ Date:	Thu Feb 24 19:30:32 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=642554
 
- tests/test_overrides.py |   21 +++++++++++++++++++++
+ tests/test_overrides.py | 21 +++++++++++++++++++++
  1 file changed, 21 insertions(+)
 
 commit 99044a4860dd65c97f52b41b7cd3f216f4a97cd4
@@ -9470,8 +11516,8 @@ Date:	Wed Feb 23 18:43:27 2011 -0500
 
     https://bugzilla.gnome.org/show_bug.cgi?id=642554
 
- gi/overrides/Gdk.py |	 70
- +++++++++++++++++++++++++++++++++++++++++++++++++++
+ gi/overrides/Gdk.py | 70
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 70 insertions(+)
 
 commit 6e30c69d38fd382414eb820097c297a80be547ac
@@ -9496,7 +11542,7 @@ Date:	Wed Feb 23 14:14:16 2011 -0500
 
     https://bugzilla.gnome.org/show_bug.cgi?id=642554
 
- gi/pygi-argument.c |	38 ++++++++++++++++++++++++++++++++++++++
+ gi/pygi-argument.c | 38 ++++++++++++++++++++++++++++++++++++++
  1 file changed, 38 insertions(+)
 
 commit 525f21d1365c24488b768955362085bf82512dee
@@ -9507,9 +11553,9 @@ Date:	Wed Feb 16 09:44:12 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=642437
 
- gi/types.py		 |   40 ++++++++++++++++++++++++++++++++++++++++
- gobject/gobjectmodule.c |    9 +++++++--
- tests/test_gi.py	 |   16 ++++++++++++++++
+ gi/types.py		 | 40 ++++++++++++++++++++++++++++++++++++++++
+ gobject/gobjectmodule.c |  9 +++++++--
+ tests/test_gi.py	 | 16 ++++++++++++++++
  3 files changed, 63 insertions(+), 2 deletions(-)
 
 commit da212024772a7a0c32f04f3589bfb24d2eb5706f
@@ -9519,8 +11565,8 @@ Date:	Thu Feb 24 18:46:15 2011 +0100
     [gi] Remove DyanmicModule.load() to _load() to prevent overriding
     GI attrs.
 
- gi/importer.py |    2 +-
- gi/module.py	|    2 +-
+ gi/importer.py | 2 +-
+ gi/module.py	| 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 2ce6b58c7427cf67ba4f55731ba0a4c04703e495
@@ -9569,9 +11615,9 @@ Date:	Wed Feb 23 12:05:03 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=642708
 
- gi/pygi-invoke.c |   54
+ gi/pygi-invoke.c | 54
  ++++++++++++++++++++++++++++++++++++++++++++++++++----
- tests/test_gi.py |    9 +++++++++
+ tests/test_gi.py |  9 +++++++++
  2 files changed, 59 insertions(+), 4 deletions(-)
 
 commit 702a89beca92cab6b0142829b20281b9245f28b8
@@ -9582,8 +11628,8 @@ Date:	Wed Feb 23 15:11:59 2011 -0500
 
      * as done in PyGTK None indicates the column should not be set
 
- gi/overrides/Gtk.py	 |    3 +++
- tests/test_overrides.py |   18 +++++++++++++-----
+ gi/overrides/Gtk.py	 |  3 +++
+ tests/test_overrides.py | 18 +++++++++++++-----
  2 files changed, 16 insertions(+), 5 deletions(-)
 
 commit 498f0d9c903131aca5efe27ffaad7620e40f72ea
@@ -9593,8 +11639,8 @@ Date:	Wed Feb 23 14:23:19 2011 +0100
     [gi] Add value_name for enum and flags from introspection
     "c:identifier" (if attr is available).
 
- gi/gimodule.c	  |   22 ++++++++++++++++++----
- tests/test_gi.py |   36 ++++++++++++++++++++++++++++++++++++
+ gi/gimodule.c	  | 22 ++++++++++++++++++----
+ tests/test_gi.py | 36 ++++++++++++++++++++++++++++++++++++
  2 files changed, 54 insertions(+), 4 deletions(-)
 
 commit 824aeb7fab17d6590e5babf2d1f64298f2d0e16b
@@ -9612,7 +11658,7 @@ Date:	Wed Feb 23 11:40:55 2011 +0100
     of duplicate instances we keep, because if an instance is not
     found in the dict, a new one is created anyway.
 
- gobject/pygflags.c |	 2 +-
+ gobject/pygflags.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 3afbebeee486e14fd3f48552368903eb78f6b10c
@@ -9627,7 +11673,7 @@ Date:	Tue Feb 22 21:37:33 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=642305
 
- gi/importer.py |    2 +-
+ gi/importer.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2a9cbfb435b47dc646e2c6ffe630464b560229a6
@@ -9640,9 +11686,9 @@ Date:	Mon Feb 21 17:20:57 2011 -0500
 
     https://bugzilla.gnome.org/show_bug.cgi?id=642921
 
- gi/overrides/Gtk.py	 |   37 +++++++++++++++++---
- tests/test_overrides.py |   87
- ++++++++++++++++++++++++++++++++++++++++-------
+ gi/overrides/Gtk.py	 | 37 ++++++++++++++++++---
+ tests/test_overrides.py | 87
+ +++++++++++++++++++++++++++++++++++++++++--------
  2 files changed, 107 insertions(+), 17 deletions(-)
 
 commit 9e4ce7dc0f03ea407654c4af028122f57cbc4c5e
@@ -9673,8 +11719,8 @@ Date:	Mon Feb 21 16:14:20 2011 -0500
 
     https://bugzilla.gnome.org/show_bug.cgi?id=642914
 
- gi/pygi-argument.c |	24 ++++++++++++++++++------
- tests/test_gi.py   |	 9 ++++++++-
+ gi/pygi-argument.c | 24 ++++++++++++++++++------
+ tests/test_gi.py   |  9 ++++++++-
  2 files changed, 26 insertions(+), 7 deletions(-)
 
 commit b458f6f3424a04f6ceece09d443009372d70544c
@@ -9683,8 +11729,8 @@ Date:	Sat Feb 19 19:42:41 2011 -0500
 
     [gi-demos] add icon view edit and drag-and-drop demo
 
- demos/gtk-demo/demos/Icon View/iconviewedit.py |  101
- ++++++++++++++++++++++++
+ demos/gtk-demo/demos/Icon View/iconviewedit.py | 101
+ +++++++++++++++++++++++++
  1 file changed, 101 insertions(+)
 
 commit 7b47289e25d1dd57ce15556ccfbb3ede1c4bfe8b
@@ -9693,8 +11739,8 @@ Date:	Sat Feb 19 17:26:42 2011 -0500
 
     [gi-demos] add info bars demo
 
- demos/gtk-demo/demos/infobars.py |   99
- ++++++++++++++++++++++++++++++++++++++
+ demos/gtk-demo/demos/infobars.py | 99
+ ++++++++++++++++++++++++++++++++++++++++
  1 file changed, 99 insertions(+)
 
 commit 76758efb6579752237a0dc4d56cf9518de6c6e55
@@ -9707,10 +11753,10 @@ Date:	Wed Feb 16 11:53:18 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=642305
 
- gi/__init__.py       |   29 ++++++++++++++++++++++++++++-
- gi/importer.py       |    1 +
- gi/module.py	      |   21 ++++-----------------
- gi/pygi-repository.c |   23 +++++++++++++++++++++++
+ gi/__init__.py       | 29 ++++++++++++++++++++++++++++-
+ gi/importer.py       |  1 +
+ gi/module.py	      | 21 ++++-----------------
+ gi/pygi-repository.c | 23 +++++++++++++++++++++++
  4 files changed, 56 insertions(+), 18 deletions(-)
 
 commit 96f7d1aed732db09a74cd463ed894b7347dbcb15
@@ -9732,13 +11778,13 @@ Date:	Sat Feb 19 23:11:25 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=642607
 
- gi/gimodule.c	    |  117
- ++++++++++++++++++++++++++++++++++++++++++++++++++++
- gi/module.py	    |	24 +++++++----
- gi/pygi-info.c     |	15 +++++++
- gi/types.py	    |	16 -------
- gobject/pygflags.c |	13 ++++--
- tests/test_gi.py   |	35 ++++++++++++++++
+ gi/gimodule.c	    | 117
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ gi/module.py	    |  24 ++++++-----
+ gi/pygi-info.c     |  15 +++++++
+ gi/types.py	    |  16 --------
+ gobject/pygflags.c |  13 ++++--
+ tests/test_gi.py   |  35 ++++++++++++++++
  6 files changed, 191 insertions(+), 29 deletions(-)
 
 commit 63a60bcc20e724f96ea8d565ee0cf13a228b72b9
@@ -9763,10 +11809,10 @@ Date:	Tue Feb 8 15:38:21 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=640181
 
- gi/overrides/Gio.py |	 99
- +++++++++++++++++++++++++++++++++++++++++++++++++
- tests/test_gdbus.py |	102
- ++++++++++++++++++++++++++++++++++++++++++++++++++-
+ gi/overrides/Gio.py |	99
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
+ tests/test_gdbus.py | 102
+ ++++++++++++++++++++++++++++++++++++++++++++++++++--
  2 files changed, 199 insertions(+), 2 deletions(-)
 
 commit ed5cdbb6f52bdbd13521a814516b15687955d6f7
@@ -9782,7 +11828,7 @@ Date:	Fri Feb 18 22:48:59 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=642715
 
- gi/pygi-closure.c |	8 ++++++++
+ gi/pygi-closure.c | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 commit 5a5ee3877e22939a697772a7f0630ef8cae3d52f
@@ -9791,7 +11837,7 @@ Date:	Fri Feb 18 10:15:59 2011 +0100
 
     Fix runtests.py to work with Python3 (print function syntax error).
 
- tests/runtests.py |	2 +-
+ tests/runtests.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit ad5d3fccff9433e2dadac89d731dac5cafb0eac3
@@ -9802,8 +11848,8 @@ Date:	Thu Feb 17 19:46:49 2011 -0500
 
     * needs some Pango Attr fixes to be 100% done, See FIXME
 
- demos/gtk-demo/demos/rotatedtext.py |	196
- +++++++++++++++++++++++++++++++++++
+ demos/gtk-demo/demos/rotatedtext.py | 196
+ ++++++++++++++++++++++++++++++++++++
  1 file changed, 196 insertions(+)
 
 commit 9ac11c3c3b1c0399c85ece57c0983ed60d419d7a
@@ -9814,8 +11860,8 @@ Date:	Thu Feb 17 17:25:00 2011 -0500
 
      * needs annotation fix from GdkPixbuf for ImageLoader to work
 
- demos/gtk-demo/demos/images.py |  311
- ++++++++++++++++++++++++++++++++++++++++
+ demos/gtk-demo/demos/images.py | 311
+ +++++++++++++++++++++++++++++++++++++++++
  1 file changed, 311 insertions(+)
 
 commit 13b06170b89b3468e6255be32af4833ffc675c9d
@@ -9824,8 +11870,8 @@ Date:	Thu Feb 17 14:48:24 2011 -0500
 
     [gi-demos] add pixbuf demo
 
- demos/gtk-demo/demos/pixbuf.py |  183
- ++++++++++++++++++++++++++++++++++++++++
+ demos/gtk-demo/demos/pixbuf.py | 183
+ +++++++++++++++++++++++++++++++++++++++++
  1 file changed, 183 insertions(+)
 
 commit 7abcfd5b4db99bb0f50c5a47d346a2de3836f994
@@ -9834,7 +11880,7 @@ Date:	Thu Feb 17 14:47:12 2011 -0500
 
     [gi-demos] remove fixmes from print demo, fixed in pango
 
- demos/gtk-demo/demos/printing.py |   10 +++-------
+ demos/gtk-demo/demos/printing.py | 10 +++-------
  1 file changed, 3 insertions(+), 7 deletions(-)
 
 commit 9b13f49356da7d71c69b82da2a59d92f456a6913
@@ -9845,8 +11891,8 @@ Date:	Wed Feb 16 19:39:30 2011 -0500
 
     * needs some annotations for pango before it is 100% useful
 
- demos/gtk-demo/demos/printing.py |  177
- ++++++++++++++++++++++++++++++++++++++
+ demos/gtk-demo/demos/printing.py | 177
+ +++++++++++++++++++++++++++++++++++++++
  1 file changed, 177 insertions(+)
 
 commit 6025b62ee662af347e48b6752e6d5be74b4a8215
@@ -9857,8 +11903,8 @@ Date:	Wed Feb 16 17:52:38 2011 -0500
 
     https://bugzilla.gnome.org/show_bug.cgi?id=635947
 
- gi/overrides/Gdk.py	 |   41 +++++++++++++++++++++++++++++++++++++++++
- tests/test_overrides.py |   23 +++++++++++++++++++++++
+ gi/overrides/Gdk.py	 | 41 +++++++++++++++++++++++++++++++++++++++++
+ tests/test_overrides.py | 23 +++++++++++++++++++++++
  2 files changed, 64 insertions(+)
 
 commit 03c0aa498470037ef2aa6a8233198ff521f8d42f
@@ -9867,8 +11913,8 @@ Date:	Wed Feb 16 16:18:24 2011 -0500
 
     [gi-demos] add the links demo
 
- demos/gtk-demo/demos/links.py |   74
- +++++++++++++++++++++++++++++++++++++++++
+ demos/gtk-demo/demos/links.py | 74
+ +++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 74 insertions(+)
 
 commit 79ecddf8d54b3f4f8b5ef05d302675152622c832
@@ -9877,8 +11923,8 @@ Date:	Wed Feb 16 15:48:40 2011 -0500
 
     [gi-demos] add expander demo
 
- demos/gtk-demo/demos/expander.py |   60
- ++++++++++++++++++++++++++++++++++++++
+ demos/gtk-demo/demos/expander.py | 60
+ ++++++++++++++++++++++++++++++++++++++++
  1 file changed, 60 insertions(+)
 
 commit 76cdb13ab872f91f8384d26b0f2932087a746117
@@ -9888,8 +11934,8 @@ Date:	Wed Feb 16 15:14:35 2011 -0500
     [gi-overrides] use pop instead of del and add extra tests for
     Gtk.Table kwargs
 
- gi/overrides/Gtk.py	 |    6 ++----
- tests/test_overrides.py |    8 ++++++++
+ gi/overrides/Gtk.py	 | 6 ++----
+ tests/test_overrides.py | 8 ++++++++
  2 files changed, 10 insertions(+), 4 deletions(-)
 
 commit 6ef83c049735689c42f085ca9d7b8e1f251c410f
@@ -9909,8 +11955,8 @@ Date:	Tue Feb 15 20:07:42 2011 +0100
     so that make does not continue. Otherwise you might miss the
     failures from the first batch of tests in the scrollback.
 
- tests/Makefile.am |   19 +++++++++++--------
- tests/runtests.py |	4 +++-
+ tests/Makefile.am | 19 +++++++++++--------
+ tests/runtests.py |  4 +++-
  2 files changed, 14 insertions(+), 9 deletions(-)
 
 commit e0896b45f60f37097ec521f1bc38778383b78dd8
@@ -9919,8 +11965,8 @@ Date:	Tue Feb 15 14:47:10 2011 -0500
 
     [gi-demos] add dialogs demo
 
- demos/gtk-demo/demos/dialogs.py |  153
- +++++++++++++++++++++++++++++++++++++++
+ demos/gtk-demo/demos/dialogs.py | 153
+ ++++++++++++++++++++++++++++++++++++++++
  1 file changed, 153 insertions(+)
 
 commit 2dea743e82f6b18697950c34f116b2d0f1d6b1dd
@@ -9929,7 +11975,7 @@ Date:	Tue Feb 15 14:46:41 2011 -0500
 
     [gi-overrides] fix typo in GtkTable constructor
 
- gi/overrides/Gtk.py |	  8 ++++----
+ gi/overrides/Gtk.py | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 9c277e1782c5a9d672d91fabf5289c5415891682
@@ -9939,7 +11985,7 @@ Date:	Tue Feb 15 13:26:38 2011 -0500
     [gi-demos] keep popup menu from destroying itself by holding a ref
     in app class
 
- demos/gtk-demo/demos/clipboard.py |	8 ++++----
+ demos/gtk-demo/demos/clipboard.py | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 18800c4db0e1faea38fd84f635d26a7ded5d10de
@@ -9948,7 +11994,7 @@ Date:	Tue Feb 15 13:25:13 2011 -0500
 
     [gi-overrides] add a Gtk.Menu override for the popup method
 
- gi/overrides/Gtk.py |	  7 +++++++
+ gi/overrides/Gtk.py | 7 +++++++
  1 file changed, 7 insertions(+)
 
 commit ad93386ba9f73ef4c3826544b3868cf03c01225e
@@ -9957,7 +12003,7 @@ Date:	Tue Feb 15 13:24:33 2011 -0500
 
     [gi-demos] fix the about dialog in appwindow demo
 
- demos/gtk-demo/demos/appwindow.py |   22 +++++++++-------------
+ demos/gtk-demo/demos/appwindow.py | 22 +++++++++-------------
  1 file changed, 9 insertions(+), 13 deletions(-)
 
 commit d0c45c80974f05b6adfd3bb01d785be268a53a98
@@ -9970,7 +12016,7 @@ Date:	Tue Feb 15 11:21:13 2011 -0500
     a destroy
       notify
 
- demos/gtk-demo/demos/clipboard.py |   20 ++++++++++----------
+ demos/gtk-demo/demos/clipboard.py | 20 ++++++++++----------
  1 file changed, 10 insertions(+), 10 deletions(-)
 
 commit 02d0327508234ab2e3b7dc6de506d70e6fcaaa17
@@ -9979,7 +12025,7 @@ Date:	Tue Feb 15 10:18:53 2011 -0500
 
     [gi-demos] fix clipboard demo to reflect new API
 
- demos/gtk-demo/demos/clipboard.py |	6 +++---
+ demos/gtk-demo/demos/clipboard.py | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit aa006cad6990eff0cbb68fa9550e428f2bc96473
@@ -9989,8 +12035,8 @@ Date:	Mon Feb 14 18:17:20 2011 -0500
     [gi-demo] Fix color dialog demo to run with new draw, style and
     color apis
 
- demos/gtk-demo/demos/colorselector.py |   44
- +++++++++++++--------------------
+ demos/gtk-demo/demos/colorselector.py | 44
+ ++++++++++++++---------------------
  1 file changed, 17 insertions(+), 27 deletions(-)
 
 commit f94a96c53e9432ac085bd05acee7ebdd2803fbad
@@ -10001,7 +12047,7 @@ Date:	Mon Feb 14 17:58:25 2011 -0500
 
     * Still having some issues with filtering the ComboBoxText widget
 
- demos/gtk-demo/demos/combobox.py |   17 ++++++++---------
+ demos/gtk-demo/demos/combobox.py | 17 ++++++++---------
  1 file changed, 8 insertions(+), 9 deletions(-)
 
 commit 3606eb20ad1651af621bf1aa429ec102082565eb
@@ -10015,16 +12061,16 @@ Date:	Mon Feb 14 19:36:27 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=637601
 
- gi/Makefile.am		  |    2 +
- gi/gimodule.c		  |    1 +
- gi/pygi-argument.c	  |   91 +++++++++++++++++
- gi/pygi-argument.h	  |    2 +
- gi/pygi-private.h	  |    1 +
- gi/pygi-signal-closure.c |  245
- ++++++++++++++++++++++++++++++++++++++++++++++
- gi/pygi-signal-closure.h |   46 +++++++++
- gi/pygi.h		  |   28 ++++++
- gobject/pygobject.c	  |   24 ++++-
+ gi/Makefile.am		  |   2 +
+ gi/gimodule.c		  |   1 +
+ gi/pygi-argument.c	  |  91 ++++++++++++++++++
+ gi/pygi-argument.h	  |   2 +
+ gi/pygi-private.h	  |   1 +
+ gi/pygi-signal-closure.c | 245
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ gi/pygi-signal-closure.h |  46 +++++++++
+ gi/pygi.h		  |  28 ++++++
+ gobject/pygobject.c	  |  24 ++++-
  9 files changed, 436 insertions(+), 4 deletions(-)
 
 commit 2e39d5e8f96be2253acb2f34a0d0b5b9c9adb8ff
@@ -10033,8 +12079,8 @@ Date:	Mon Feb 14 16:47:03 2011 -0500
 
     [gi-demos] fix drawingarea app to use the new draw api
 
- demos/gtk-demo/demos/drawingarea.py |	144
- ++++++++++++-----------------------
+ demos/gtk-demo/demos/drawingarea.py | 144
+ +++++++++++++-----------------------
  1 file changed, 50 insertions(+), 94 deletions(-)
 
 commit 8385afbbc5df295d9b7cd3b5d19c90faa1f7ea8e
@@ -10048,7 +12094,7 @@ Date:	Mon Feb 14 16:43:35 2011 -0500
       bindings
     * we alias this so people do not get confused
 
- gi/overrides/Gdk.py |	  5 +++++
+ gi/overrides/Gdk.py | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit d491c369e049ab726f09002af0462391d5c2f3ec
@@ -10063,7 +12109,7 @@ Date:	Mon Feb 14 15:07:11 2011 -0500
     * The GTK properties are n_columns and n_rows
     * support both
 
- gi/overrides/Gtk.py |	  8 ++++++++
+ gi/overrides/Gtk.py | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 commit 95bc2b2b025d659725d701c3b759c0c4d9681a36
@@ -10072,7 +12118,7 @@ Date:	Mon Feb 14 15:06:38 2011 -0500
 
     [gi-demos] get appwindow demo working again
 
- demos/gtk-demo/demos/appwindow.py |   24 ++++--------------------
+ demos/gtk-demo/demos/appwindow.py | 24 ++++--------------------
  1 file changed, 4 insertions(+), 20 deletions(-)
 
 commit 015185f502c498c21cb108d3bb288c5b6dbf202f
@@ -10081,7 +12127,7 @@ Date:	Mon Feb 14 15:05:44 2011 -0500
 
     [gi-demos] fixed use of tree_iter_get
 
- demos/gtk-demo/gtk-demo.py |	 2 +-
+ demos/gtk-demo/gtk-demo.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 0c20977e4598e5447dd07c069e91226efacb1160
@@ -10092,13 +12138,13 @@ Date:	Fri Feb 11 22:02:03 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=638899
 
- PKG-INFO.in			 |    2 +-
- README				 |    3 +-
- configure.ac			 |    3 --
- examples/gio/directory-async.py |   33 -----------------
- examples/gio/downloader.py	 |   77
- ---------------------------------------
- pygobject.doap			 |    2 +-
+ PKG-INFO.in			 |  2 +-
+ README				 |  3 +-
+ configure.ac			 |  3 --
+ examples/gio/directory-async.py | 33 ------------------
+ examples/gio/downloader.py	 | 77
+ -----------------------------------------
+ pygobject.doap			 |  2 +-
  6 files changed, 3 insertions(+), 117 deletions(-)
 
 commit e4ebbd7de5570af1abf41bdf9469d4ce3edd48cb
@@ -10165,9 +12211,9 @@ Date:	Fri Feb 11 11:05:04 2011 -0500
     * this branch will drop support for the static binding
     * use the pygobject-2-28 branch for static binding fixes
 
- NEWS	      |  289
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- configure.ac |    4 +-
+ NEWS	      | 289
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac |   4 +-
  2 files changed, 291 insertions(+), 2 deletions(-)
 
 commit 16140237aa45b4f188923da9f95b9d2af971011b
@@ -10176,10 +12222,10 @@ Date:	Thu Feb 10 16:46:08 2011 -0500
 
     fix build to correctly use python-config
 
- autogen.sh	   |	3 +++
- configure.ac	   |	6 ------
- m4/python.m4	   |	9 +++++----
- tests/runtests.py |	1 +
+ autogen.sh	   | 3 +++
+ configure.ac	   | 6 ------
+ m4/python.m4	   | 9 +++++----
+ tests/runtests.py | 1 +
  4 files changed, 9 insertions(+), 10 deletions(-)
 
 commit c2079f415638ef892b1e51f25eaafa3e1621667f
@@ -10188,8 +12234,8 @@ Date:	Thu Feb 10 22:26:00 2011 +0100
 
     Add missing libraries to link against
 
- glib/Makefile.am    |	  2 +-
- gobject/Makefile.am |	  1 +
+ glib/Makefile.am    | 2 +-
+ gobject/Makefile.am | 1 +
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 commit 3cca62a9e7afd3d3d302c66f4fafe253f7743d4e
@@ -10204,7 +12250,7 @@ Date:	Wed Jan 19 15:00:56 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=639948
 
- tests/runtests.py |	9 +++++++++
+ tests/runtests.py | 9 +++++++++
  1 file changed, 9 insertions(+)
 
 commit 14c4cf8e6edae893538680964380d543bde4a14d
@@ -10219,7 +12265,7 @@ Date:	Wed Feb 9 11:34:59 2011 +0100
     session
     D-BUS (such as distribution package builds).
 
- tests/Makefile.am |	3 ++-
+ tests/Makefile.am | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 0858f550e2b6f75e3f583f963f5952f5ddae4e0e
@@ -10231,7 +12277,7 @@ Date:	Tue Feb 8 15:46:36 2011 +0100
     - TestCase.assert_() has been deprecated by assertTrue().
     - Exceptions don't have a message attribute any more, use str(e)
 
- tests/test_gdbus.py |	 34 +++++++++++++++-------------------
+ tests/test_gdbus.py | 34 +++++++++++++++-------------------
  1 file changed, 15 insertions(+), 19 deletions(-)
 
 commit b7f32e4cca0cef201489b55653f96ac64a8f9ab9
@@ -10246,10 +12292,10 @@ Date:	Sat Jan 29 12:20:50 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=640838
 
- gi/overrides/Gio.py		  |   54 ++++++++++++++++++++++++++++
- tests/org.gnome.test.gschema.xml |    9 +++++
- tests/test_overrides.py	  |   73
- ++++++++++++++++++++++++++++++--------
+ gi/overrides/Gio.py		  | 54 +++++++++++++++++++++++++++++
+ tests/org.gnome.test.gschema.xml |  9 +++++
+ tests/test_overrides.py	  | 73
+ ++++++++++++++++++++++++++++++++--------
  3 files changed, 122 insertions(+), 14 deletions(-)
 
 commit 8dad0eaed60a9de26e9a729a48a1f6bc74be486e
@@ -10265,8 +12311,8 @@ Date:	Fri Feb 4 16:36:07 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=641493
 
- gi/types.py	  |    4 +++-
- tests/test_gi.py |    8 ++++++++
+ gi/types.py	  | 4 +++-
+ tests/test_gi.py | 8 ++++++++
  2 files changed, 11 insertions(+), 1 deletion(-)
 
 commit 2660be1f227be7a53092483bc9d8ead1bd1fb266
@@ -10282,7 +12328,7 @@ Date:	Thu Feb 3 15:31:42 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=639945
 
- tests/test_overrides.py |   40 ++++++++++++++++++++++++++++++++++++++++
+ tests/test_overrides.py | 40 ++++++++++++++++++++++++++++++++++++++++
  1 file changed, 40 insertions(+)
 
 commit d57500537014b3da624be33b40401ba289fa22b8
@@ -10291,8 +12337,8 @@ Date:	Thu Feb 3 09:02:16 2011 -0500
 
     [gi] make caller allocates work again
 
- gi/pygi-cache.c  |   18 +++---------------
- gi/pygi-invoke.c |   37 ++++++++++++++++++++++++++++++++++---
+ gi/pygi-cache.c  | 18 +++---------------
+ gi/pygi-invoke.c | 37 ++++++++++++++++++++++++++++++++++---
  2 files changed, 37 insertions(+), 18 deletions(-)
 
 commit 99d6e6c8d806e6f9e48c3c2380024fb3511d110a
@@ -10301,8 +12347,8 @@ Date:	Wed Feb 2 19:27:40 2011 -0500
 
     [gi] fix container object reffing
 
- gi/pygi-argument.c |	 7 +++----
- gi/pygi-cache.c    |	12 ++++--------
+ gi/pygi-argument.c |  7 +++----
+ gi/pygi-cache.c    | 12 ++++--------
  2 files changed, 7 insertions(+), 12 deletions(-)
 
 commit 09acaff29dfaabc77477cffca2c7137f68991e7f
@@ -10311,9 +12357,9 @@ Date:	Wed Feb 2 21:00:48 2011 +0100
 
     [python 3] use the right syntaxis to raise exceptions
 
- codegen/argtypes.py	|    8 ++++----
- codegen/definitions.py |   14 +++++++-------
- gi/overrides/Gtk.py	|    2 +-
+ codegen/argtypes.py	|  8 ++++----
+ codegen/definitions.py | 14 +++++++-------
+ gi/overrides/Gtk.py	|  2 +-
  3 files changed, 12 insertions(+), 12 deletions(-)
 
 commit 36094e5982d3e05d5662843b6d401f0974f5235f
@@ -10322,7 +12368,7 @@ Date:	Wed Feb 2 20:50:12 2011 +0100
 
     [gi] return PYGLIB_MODULE_ERROR_RETURN on error and use pygobject_init
 
- tests/testhelpermodule.c |    6 +++---
+ tests/testhelpermodule.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit c913c1789296310c2cf27554ce719d7f6e9c94cd
@@ -10333,7 +12379,7 @@ Date:	Wed Feb 2 20:37:21 2011 +0100
 
     This is to avoid some warnings when building with python 3
 
- gi/gimodule.c |    6 +++---
+ gi/gimodule.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 7bc4122897d9d05172a2bd5b56bded87e2afaec4
@@ -10354,8 +12400,8 @@ Date:	Sat Jan 29 00:16:50 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=640868
 
- gobject/pygobject.c	  |    4 +++-
- tests/test_everything.py |    9 ++++++++-
+ gobject/pygobject.c	  | 4 +++-
+ tests/test_everything.py | 9 ++++++++-
  2 files changed, 11 insertions(+), 2 deletions(-)
 
 commit afeaaa126f7cd6556fb855ecd0facc174c0f946c
@@ -10372,8 +12418,8 @@ Date:	Wed Jan 19 16:19:46 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=639936
 
- gi/overrides/Gdk.py	 |    6 ++++++
- tests/test_overrides.py |    8 ++++++++
+ gi/overrides/Gdk.py	 | 6 ++++++
+ tests/test_overrides.py | 8 ++++++++
  2 files changed, 14 insertions(+)
 
 commit 4a67f45880433905de33632fe0c32a13b44c0b33
@@ -10382,7 +12428,7 @@ Date:	Mon Jan 31 16:51:37 2011 -0500
 
     [gi] handle hash being NULL
 
- gi/pygi-argument.c |	 6 ++++++
+ gi/pygi-argument.c | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit 2fbfe410f4b4394a2018ada0e538585c1bec23ae
@@ -10391,9 +12437,9 @@ Date:	Mon Jan 31 16:50:52 2011 -0500
 
     [gi] handle the situation where an aux arg comes before its parent
 
- gi/pygi-cache.c  |   70
- ++++++++++++++++++++++++++++++++++++++----------------
- gi/pygi-invoke.c |    2 +-
+ gi/pygi-cache.c  | 70
+ ++++++++++++++++++++++++++++++++++++++++----------------
+ gi/pygi-invoke.c |  2 +-
  2 files changed, 51 insertions(+), 21 deletions(-)
 
 commit 858669f92c9907dd70b4966d6a8521ed122225be
@@ -10402,7 +12448,7 @@ Date:	Mon Jan 31 17:38:52 2011 +0100
 
     Ship tests/org.gnome.test.gschema.xml in dist tarballs
 
- tests/Makefile.am |	3 ++-
+ tests/Makefile.am | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 77d76df59606e470808085e977fb199cc76e8251
@@ -10411,9 +12457,9 @@ Date:	Sun Jan 30 18:21:24 2011 -0500
 
     [gi] allow caching and marshalling of ghash out
 
- gi/pygi-argument.c |  155
- ++++++++++++++++++++++++++++++++++++++++++++++++----
- gi/pygi-cache.c    |	27 +++++----
+ gi/pygi-argument.c | 155
+ +++++++++++++++++++++++++++++++++++++++++++++++++----
+ gi/pygi-cache.c    |  27 ++++++----
  2 files changed, 162 insertions(+), 20 deletions(-)
 
 commit bd66af67f248a3ca90d2fa2626605263c2392e16
@@ -10422,8 +12468,8 @@ Date:	Sun Jan 30 17:06:44 2011 -0500
 
     [gi] whitespace fixes
 
- gi/pygi-cache.c |   60
- +++++++++++++++++++++++++++----------------------------
+ gi/pygi-cache.c | 60
+ ++++++++++++++++++++++++++++-----------------------------
  1 file changed, 30 insertions(+), 30 deletions(-)
 
 commit 1cdbd4be9b015f792c2c02afa5ac7e24edbdae86
@@ -10437,11 +12483,11 @@ Date:	Sun Jan 30 17:04:13 2011 -0500
     * this works for now but is fragile if new aux values are added in
     the future
 
- gi/pygi-argument.c |	12 ++++++++--
- gi/pygi-cache.c    |	66
- +++++++++++++++++++++++++++++++++++-----------------
- gi/pygi-cache.h    |	 2 ++
- gi/pygi-invoke.c   |	12 +++++++---
+ gi/pygi-argument.c | 12 ++++++++--
+ gi/pygi-cache.c    | 66
+ +++++++++++++++++++++++++++++++++++++-----------------
+ gi/pygi-cache.h    |  2 ++
+ gi/pygi-invoke.c   | 12 +++++++---
  4 files changed, 66 insertions(+), 26 deletions(-)
 
 commit c51447f4efde2ce4caf39c1ffac905ec428d1d64
@@ -10466,8 +12512,8 @@ Date:	Sat Jan 29 13:49:36 2011 -0500
 
     [gi] marshal arrays out
 
- gi/pygi-argument.c |  101
- ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ gi/pygi-argument.c | 101
+ +++++++++++++++++++++++++++++++++++++++++++++++++++--
  1 file changed, 99 insertions(+), 2 deletions(-)
 
 commit e62e7062d5cfd782eac64852f681c63e2776b8d4
@@ -10476,8 +12522,8 @@ Date:	Sat Jan 29 13:48:23 2011 -0500
 
     [gi] fix sequence caching to support out
 
- gi/pygi-cache.c |  111
- +++++++++++++++++++++++++++++++++++++++++++------------
+ gi/pygi-cache.c | 111
+ ++++++++++++++++++++++++++++++++++++++++++++------------
  1 file changed, 87 insertions(+), 24 deletions(-)
 
 commit 69207910209ebfe450df616aeb8fa4cc2e7eccf3
@@ -10490,9 +12536,9 @@ Date:	Fri Jan 28 17:14:19 2011 +0100
     so let's
     first make sure that the canonical GLib API works.
 
- tests/Makefile.am		  |    7 +++++--
- tests/org.gnome.test.gschema.xml |   16 ++++++++++++++++
- tests/test_overrides.py	  |   31 +++++++++++++++++++++++++++++++
+ tests/Makefile.am		  |  7 +++++--
+ tests/org.gnome.test.gschema.xml | 16 ++++++++++++++++
+ tests/test_overrides.py	  | 31 +++++++++++++++++++++++++++++++
  3 files changed, 52 insertions(+), 2 deletions(-)
 
 commit 488478a83640d50baee963337fcc870fec76b784
@@ -10506,8 +12552,8 @@ Date:	Fri Jan 28 07:20:26 2011 +0100
     consistent
     with the actual GTK API.
 
- gi/overrides/Gtk.py	 |   19 ++++++++++++++-----
- tests/test_overrides.py |    4 ++--
+ gi/overrides/Gtk.py	 | 19 ++++++++++++++-----
+ tests/test_overrides.py |  4 ++--
  2 files changed, 16 insertions(+), 7 deletions(-)
 
 commit dace1a553793fb7fb054b60760f02c9e5cf00b38
@@ -10521,8 +12567,8 @@ Date:	Thu Jan 27 13:37:18 2011 +0100
     due to using varargs. As both are useful, support both cases in
     the override.
 
- gi/overrides/Gtk.py	 |    5 +++++
- tests/test_overrides.py |    9 +++++++++
+ gi/overrides/Gtk.py	 | 5 +++++
+ tests/test_overrides.py | 9 +++++++++
  2 files changed, 14 insertions(+)
 
 commit 91d34124b2a5128e93e13c7fee8693d5edc4e9bb
@@ -10534,7 +12580,7 @@ Date:	Thu Jan 27 12:23:18 2011 +0100
     This var behaves like .gitignore and allows us to skip some specific
     files.
 
- Makefile.am |	 27 +++++++++++++++++++++++++++
+ Makefile.am | 27 +++++++++++++++++++++++++++
  1 file changed, 27 insertions(+)
 
 commit 8a98d26981ce68809a21c64cac4962e58c927905
@@ -10546,25 +12592,25 @@ Date:	Thu Jan 27 12:15:30 2011 +0100
     git.mk is a script maintained in pango. From time to time we must
     check if it was updated and update it here.
 
- .gitignore		   |   46 -----------
- Makefile.am		   |	2 +
- codegen/.gitignore	   |	2 -
- codegen/Makefile.am	   |	2 +
- docs/.gitignore	   |	7 --
- docs/Makefile.am	   |	2 +
- examples/Makefile.am	   |	2 +
- gi/.gitignore		   |   40 ---------
- gi/Makefile.am		   |	2 +
- gi/overrides/Makefile.am  |	2 +
- gi/repository/Makefile.am |	2 +
- gi/tests/Makefile.am	   |	2 +
- git.mk			   |  200
- +++++++++++++++++++++++++++++++++++++++++++++
- glib/Makefile.am	   |	2 +
- gobject/.gitignore	   |	3 -
- gobject/Makefile.am	   |	2 +
- tests/.gitignore	   |	2 -
- tests/Makefile.am	   |	2 +
+ .gitignore		   |  46 -----------
+ Makefile.am		   |   2 +
+ codegen/.gitignore	   |   2 -
+ codegen/Makefile.am	   |   2 +
+ docs/.gitignore	   |   7 --
+ docs/Makefile.am	   |   2 +
+ examples/Makefile.am	   |   2 +
+ gi/.gitignore		   |  40 ----------
+ gi/Makefile.am		   |   2 +
+ gi/overrides/Makefile.am  |   2 +
+ gi/repository/Makefile.am |   2 +
+ gi/tests/Makefile.am	   |   2 +
+ git.mk			   | 200
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ glib/Makefile.am	   |   2 +
+ gobject/.gitignore	   |   3 -
+ gobject/Makefile.am	   |   2 +
+ tests/.gitignore	   |   2 -
+ tests/Makefile.am	   |   2 +
  18 files changed, 222 insertions(+), 100 deletions(-)
 
 commit 331c42b63bc60a3b906fa21e1c0a7c1b9428f347
@@ -10573,7 +12619,7 @@ Date:	Thu Jan 27 12:04:19 2011 +0100
 
     pygi-convert.sh: Convert Pango.TabAlign.*
 
- pygi-convert.sh |    1 +
+ pygi-convert.sh | 1 +
  1 file changed, 1 insertion(+)
 
 commit be1a2959fa0a3d8682e0e8aef389d73dacab0689
@@ -10585,7 +12631,7 @@ Date:	Thu Jan 27 12:02:39 2011 +0100
     It is doing more harm than good for projects which use things like
     self.window.
 
- pygi-convert.sh |    1 -
+ pygi-convert.sh | 1 -
  1 file changed, 1 deletion(-)
 
 commit dd7deb4b658c56857c26b1a278a3d688f2ea6a2a
@@ -10594,7 +12640,7 @@ Date:	Thu Jan 27 11:58:26 2011 +0100
 
     pygi-convert.sh: Don't convert self.window assignments
 
- pygi-convert.sh |    2 +-
+ pygi-convert.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 975341a26772966d4afc87a88a6a566d61237fa0
@@ -10605,8 +12651,8 @@ Date:	Fri Jan 21 18:41:54 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=640184
 
- gobject/gobjectmodule.c |    1 +
- tests/test_gobject.py	 |    4 ++++
+ gobject/gobjectmodule.c | 1 +
+ tests/test_gobject.py	 | 4 ++++
  2 files changed, 5 insertions(+)
 
 commit a59e2d58bdb3f31a4f415dbe14b7d9988ac28ce3
@@ -10617,7 +12663,7 @@ Date:	Fri Jan 21 15:54:43 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=640184
 
- tests/test_gobject.py |   21 +++++++++++++++++++++
+ tests/test_gobject.py | 21 +++++++++++++++++++++
  1 file changed, 21 insertions(+)
 
 commit 7d70105eb324ea4b6a58c2d3fb3f2dda36e7ab33
@@ -10628,10 +12674,10 @@ Date:	Fri Jan 21 17:24:49 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=640197
 
- gobject/gobjectmodule.c     |	 35 ++-------------------
- gobject/pygobject-private.h |	  5 +++
- gobject/pygobject.c	     |	 71
- +++++++++++++++++++++++++------------------
+ gobject/gobjectmodule.c     | 35 ++--------------------
+ gobject/pygobject-private.h |	5 ++++
+ gobject/pygobject.c	     | 71
+ +++++++++++++++++++++++++++------------------
  3 files changed, 50 insertions(+), 61 deletions(-)
 
 commit a3e0cfe8924887ecd1e07cedd2cfb999c853ac62
@@ -10640,7 +12686,7 @@ Date:	Wed Jan 26 15:34:24 2011 -0500
 
     [gi] in python 3 an array of uint8 can be bytes but not string
 
- tests/test_gi.py |    4 +++-
+ tests/test_gi.py | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit 843553ea958eddec185bb660851a310dc050a14b
@@ -10649,7 +12695,7 @@ Date:	Wed Jan 26 15:30:06 2011 -0500
 
     [gi] fix Gio.FileEnumerator to reflect the Python 3 iter protocol
 
- gi/overrides/Gio.py |	  6 +++++-
+ gi/overrides/Gio.py | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit 6ff357839feb39930a5f3175de3d0ed35f24d3f4
@@ -10713,12 +12759,12 @@ Date:	Wed Jan 26 15:17:03 2011 -0500
 	  from compathelper import _long
 	  l = _long(42)
 
- gi/overrides/GLib.py	 |   16 ++++++++--------
- gi/types.py		 |    5 ++++-
- tests/compathelper.py	 |   19 +++++++++++++++++++
- tests/test_gdbus.py	 |   12 ++++++++----
- tests/test_gi.py	 |   19 ++++++++++++-------
- tests/test_overrides.py |    8 +++++---
+ gi/overrides/GLib.py	 | 16 ++++++++--------
+ gi/types.py		 |  5 ++++-
+ tests/compathelper.py	 | 19 +++++++++++++++++++
+ tests/test_gdbus.py	 | 12 ++++++++----
+ tests/test_gi.py	 | 19 ++++++++++++-------
+ tests/test_overrides.py |  8 +++++---
  6 files changed, 56 insertions(+), 23 deletions(-)
 
 commit 832d662b9f90f5762bbf28b3cca73f947c1f83ce
@@ -10727,8 +12773,8 @@ Date:	Wed Jan 26 14:00:08 2011 -0500
 
     [gi] fix try/except blocks using depricated raise format
 
- gi/overrides/GLib.py |    4 ++--
- gi/overrides/Gdk.py  |    2 +-
+ gi/overrides/GLib.py | 4 ++--
+ gi/overrides/Gdk.py  | 2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 commit d3e30e240fed6ef1dd40fd29fd13dc2effc6c7b1
@@ -10737,7 +12783,7 @@ Date:	Wed Jan 26 19:03:48 2011 +0100
 
     [gi] Add docstring to GLib.Variant constructor
 
- gi/overrides/GLib.py |   11 +++++++++++
+ gi/overrides/GLib.py | 11 +++++++++++
  1 file changed, 11 insertions(+)
 
 commit 963cd52fec26f7a4fb34414f8ac6662932ede322
@@ -10746,7 +12792,7 @@ Date:	Wed Jan 26 18:45:38 2011 +0100
 
     [gi] update gdbus test cases for previous GVariant change
 
- tests/test_gdbus.py |	  4 ++--
+ tests/test_gdbus.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 27e3a6276ff5f2cdc03ddf69ee80d44c3bf2c094
@@ -10771,8 +12817,8 @@ Date:	Wed Jan 26 18:39:17 2011 +0100
 
     Thanks to Ryan Lortie for pointing this out!
 
- gi/overrides/GLib.py	 |   25 ++++++++++---------------
- tests/test_overrides.py |   32 +++++++++++++-------------------
+ gi/overrides/GLib.py	 | 25 ++++++++++---------------
+ tests/test_overrides.py | 32 +++++++++++++-------------------
  2 files changed, 23 insertions(+), 34 deletions(-)
 
 commit b15e8e2c0c933d0f827a70280faf875ac383d81b
@@ -10799,8 +12845,8 @@ Date:	Wed Jan 26 00:40:49 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=640629
 
- gi/types.py	  |   26 +++++++++++++-------------
- tests/test_gi.py |   13 +++++++++++++
+ gi/types.py	  | 26 +++++++++++++-------------
+ tests/test_gi.py | 13 +++++++++++++
  2 files changed, 26 insertions(+), 13 deletions(-)
 
 commit 569d42ac2f50fb706ef289ff631db743483f40ee
@@ -10833,9 +12879,9 @@ Date:	Thu Jan 20 16:26:18 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=640073
 
- gi/types.py	  |  104
- +++++++++++++++++++++++++++++++++---------------------
- tests/test_gi.py |   13 +++++++
+ gi/types.py	  | 104
+ ++++++++++++++++++++++++++++++++++---------------------
+ tests/test_gi.py |  13 +++++++
  2 files changed, 77 insertions(+), 40 deletions(-)
 
 commit 8f4e6536f3c2edf38a45632d1c23eb7c6681c3be
@@ -10844,7 +12890,7 @@ Date:	Mon Jan 24 19:23:19 2011 +0100
 
     pygi-convert.sh: Convert gtk.UI_MANAGER_*
 
- pygi-convert.sh |    1 +
+ pygi-convert.sh | 1 +
  1 file changed, 1 insertion(+)
 
 commit 1f473b5164407a178203eb8cc7f3c786e0d0e5c2
@@ -10853,7 +12899,7 @@ Date:	Fri Jan 21 18:41:54 2011 +0100
 
     pygi-convert.sh: Convert gdk.GRAB_*
 
- pygi-convert.sh |    1 +
+ pygi-convert.sh | 1 +
  1 file changed, 1 insertion(+)
 
 commit f5d0b7b9d189f65503c0bf66d8bda4186ca3223a
@@ -10862,7 +12908,7 @@ Date:	Fri Jan 21 16:45:07 2011 +0100
 
     [gi] set the gtype GValue correctly
 
- gi/pygi-property.c |	 4 ++--
+ gi/pygi-property.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit ce521011d7f6d7f082aaea76fa05c5af9f6e93f5
@@ -10871,11 +12917,11 @@ Date:	Fri Jan 21 16:20:23 2011 +0100
 
     [gi] use the right argument type for callback
 
- gi/pygi-foreign-cairo.c    |	 8 ++++----
- gi/pygi-foreign-gvariant.c |	 4 ++--
- gi/pygi-foreign-gvariant.h |	 2 +-
- gi/pygi-foreign.c	    |	 2 +-
- gi/pygi.h		    |	 2 +-
+ gi/pygi-foreign-cairo.c    | 8 ++++----
+ gi/pygi-foreign-gvariant.c | 4 ++--
+ gi/pygi-foreign-gvariant.h | 2 +-
+ gi/pygi-foreign.c	    | 2 +-
+ gi/pygi.h		    | 2 +-
  5 files changed, 9 insertions(+), 9 deletions(-)
 
 commit 9f101baaa63a75acf62f955cfc4b311ff0dd5464
@@ -10884,8 +12930,8 @@ Date:	Fri Jan 21 09:23:54 2011 -0500
 
     [gi] marshal out flags and enum
 
- gi/pygi-argument.c |	14 +++++++++-----
- gi/pygi-cache.c    |	24 ++++++++++++------------
+ gi/pygi-argument.c | 14 +++++++++-----
+ gi/pygi-cache.c    | 24 ++++++++++++------------
  2 files changed, 21 insertions(+), 17 deletions(-)
 
 commit 4c93bdeae76830aa4029dfc86e32e6f277d5271d
@@ -10894,7 +12940,7 @@ Date:	Fri Jan 21 08:18:37 2011 -0500
 
     [gi] marshal unions
 
- gi/pygi-cache.c |   27 +++++++++++++--------------
+ gi/pygi-cache.c | 27 +++++++++++++--------------
  1 file changed, 13 insertions(+), 14 deletions(-)
 
 commit a060287d1a6d190acb9d344f08fd5662e3296da5
@@ -10903,9 +12949,9 @@ Date:	Fri Jan 21 11:00:27 2011 +0100
 
     [gi] Add test cases for GDBus client operations
 
- tests/Makefile.am   |	  1 +
- tests/test_gdbus.py |	 94
- +++++++++++++++++++++++++++++++++++++++++++++++++++
+ tests/Makefile.am   |	1 +
+ tests/test_gdbus.py | 94
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 95 insertions(+)
 
 commit e7699d9af41f8c374326b8a4ec0939ef1426e386
@@ -10914,7 +12960,7 @@ Date:	Fri Jan 21 04:28:15 2011 -0500
 
     [gi] error out if the constructor returns NULL
 
- gi/pygi-invoke.c |    7 +++++++
+ gi/pygi-invoke.c | 7 +++++++
  1 file changed, 7 insertions(+)
 
 commit 58ff2b2c38c1004861083ca88633be76767229f0
@@ -10924,7 +12970,7 @@ Date:	Fri Jan 21 04:26:45 2011 -0500
     [gi] throw error for caller allocates until we can write code to
     support it
 
- gi/pygi-cache.c |   11 +++++++++++
+ gi/pygi-cache.c | 11 +++++++++++
  1 file changed, 11 insertions(+)
 
 commit 5eb779439daa8bf1e86df689377dc10ef1430eab
@@ -10933,8 +12979,8 @@ Date:	Fri Jan 21 04:26:11 2011 -0500
 
     [gi] support struct out
 
- gi/pygi-argument.c |	30 ++++++++++++++++++++++++++----
- gi/pygi-cache.c    |	15 ++-------------
+ gi/pygi-argument.c | 30 ++++++++++++++++++++++++++----
+ gi/pygi-cache.c    | 15 ++-------------
  2 files changed, 28 insertions(+), 17 deletions(-)
 
 commit 3133dc595adf44279397d30712c0f8595f0e1acc
@@ -10951,16 +12997,16 @@ Date:	Fri Jan 21 04:22:06 2011 -0500
       interface_info
       to the interface cache
 
- gi/pygi-argument.c	    |	20 ++++----------------
- gi/pygi-cache.c	    |	43
+ gi/pygi-argument.c	    | 20 ++++----------------
+ gi/pygi-cache.c	    | 43
  ++++++++++++++++++++++++++++++++-----------
- gi/pygi-cache.h	    |	 4 +++-
- gi/pygi-foreign-cairo.c    |	24 ++++++++++++------------
- gi/pygi-foreign-gvariant.c |	11 +++++------
- gi/pygi-foreign-gvariant.h |	10 +++++-----
- gi/pygi-foreign.c	    |	21 +++++++++------------
- gi/pygi-foreign.h	    |	 6 +++---
- gi/pygi.h		    |	 8 ++++----
+ gi/pygi-cache.h	    |  4 +++-
+ gi/pygi-foreign-cairo.c    | 24 ++++++++++++------------
+ gi/pygi-foreign-gvariant.c | 11 +++++------
+ gi/pygi-foreign-gvariant.h | 10 +++++-----
+ gi/pygi-foreign.c	    | 21 +++++++++------------
+ gi/pygi-foreign.h	    |  6 +++---
+ gi/pygi.h		    |  8 ++++----
  9 files changed, 77 insertions(+), 70 deletions(-)
 
 commit e97e28048efb966ecc1a03277d36cbaa81b8db7d
@@ -10974,8 +13020,8 @@ Date:	Fri Jan 21 09:54:14 2011 +0100
     currently does not work (see
     https://bugzilla.gnome.org/show_bug.cgi?id=639952)
 
- gi/overrides/GLib.py	 |   18 +++++++++++++++++-
- tests/test_overrides.py |   26 ++++++++++++++++++++++++++
+ gi/overrides/GLib.py	 | 18 +++++++++++++++++-
+ tests/test_overrides.py | 26 ++++++++++++++++++++++++++
  2 files changed, 43 insertions(+), 1 deletion(-)
 
 commit 71dd03261fc06b8180c14cd31b54d8e4b200be3a
@@ -10993,7 +13039,7 @@ Date:	Thu Jan 20 19:48:23 2011 +0100
 
     GNOME bug #639880
 
- pygi-convert.sh |    1 +
+ pygi-convert.sh | 1 +
  1 file changed, 1 insertion(+)
 
 commit d1b0fa501cc431baa530d96fb50f4c35590890ac
@@ -11004,7 +13050,7 @@ Date:	Thu Jan 20 19:45:01 2011 +0100
 
     GNOME bug #639880
 
- pygi-convert.sh |    1 +
+ pygi-convert.sh | 1 +
  1 file changed, 1 insertion(+)
 
 commit 6d8ff4d5bdda5480089543869535cc3ee83da2f5
@@ -11029,9 +13075,9 @@ Date:	Wed Jan 19 11:41:11 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=639939
 
- gi/overrides/GLib.py	 |  229
- +++++++++++++++++++++++++----------------------
- tests/test_overrides.py |  159 ++++++++++++++++++++++++++++++--
+ gi/overrides/GLib.py	 | 229
+ ++++++++++++++++++++++++++----------------------
+ tests/test_overrides.py | 159 +++++++++++++++++++++++++++++++--
  2 files changed, 273 insertions(+), 115 deletions(-)
 
 commit ac095f5435f106e175fa3297cb273e63c85d2809
@@ -11040,7 +13086,7 @@ Date:	Thu Jan 20 15:55:45 2011 +0100
 
     Uncomment test_gi.TestInterfaceClash
 
- tests/test_gi.py |   22 +++++++++++-----------
+ tests/test_gi.py | 22 +++++++++++-----------
  1 file changed, 11 insertions(+), 11 deletions(-)
 
 commit 1239f3709ba257c404dda72b7067b77b19c240fa
@@ -11049,9 +13095,9 @@ Date:	Thu Jan 20 09:05:02 2011 -0500
 
     [gi] add support for enum and flags
 
- gi/pygi-argument.c |  121
- +++++++++++++++++++++++++++++++++++++++++-----------
- gi/pygi-cache.c    |	30 +++++++------
+ gi/pygi-argument.c | 121
+ +++++++++++++++++++++++++++++++++++++++++------------
+ gi/pygi-cache.c    |  30 ++++++-------
  2 files changed, 111 insertions(+), 40 deletions(-)
 
 commit f0a0b6c2eda89622de2b1e5ebb6a48103ad72a42
@@ -11066,13 +13112,13 @@ Date:	Thu Jan 20 14:14:15 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=639949
 
- gobject/gobjectmodule.c  |    2 ++
- gobject/pygobject.c	  |   14 +++++------
- tests/test-floating.c	  |   36 ++++++++++++++++++++++++++
- tests/test-floating.h	  |   21 ++++++++++++++++
- tests/test_gobject.py	  |   63
- ++++++++++++++++++++++++++++++++++++++++++++++
- tests/testhelpermodule.c |   50 ++++++++++++++++++++++++++++++++++++
+ gobject/gobjectmodule.c  |  2 ++
+ gobject/pygobject.c	  | 14 +++++------
+ tests/test-floating.c	  | 36 +++++++++++++++++++++++++++
+ tests/test-floating.h	  | 21 ++++++++++++++++
+ tests/test_gobject.py	  | 63
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ tests/testhelpermodule.c | 50 ++++++++++++++++++++++++++++++++++++++
  6 files changed, 179 insertions(+), 7 deletions(-)
 
 commit cae2cf3d4fb049c94389bf8f84d7d97a544d7a3f
@@ -11087,11 +13133,11 @@ Date:	Wed Jan 19 16:57:57 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=639949
 
- tests/test-floating.c	  |   30 ++++++++++++++++++++++
- tests/test-floating.h	  |   20 +++++++++++++++
- tests/test_gobject.py	  |   62
- ++++++++++++++++++++++++++++++++++++++++++++++
- tests/testhelpermodule.c |   51 ++++++++++++++++++++++++++++++++++++++
+ tests/test-floating.c	  | 30 +++++++++++++++++++++++
+ tests/test-floating.h	  | 20 ++++++++++++++++
+ tests/test_gobject.py	  | 62
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ tests/testhelpermodule.c | 51 +++++++++++++++++++++++++++++++++++++++
  4 files changed, 163 insertions(+)
 
 commit b6737b91938d527872eff1d645a205cacf94e15d
@@ -11102,7 +13148,7 @@ Date:	Wed Jan 19 14:52:41 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=639949
 
- tests/test_gobject.py |    8 +++++++-
+ tests/test_gobject.py | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 commit 2b0f1ede820414ef1cfd6b37569fcb946d2031fc
@@ -11117,7 +13163,7 @@ Date:	Thu Jan 20 14:15:52 2011 +0100
     Gtk.TreeView.enable_model_drag_{source,dest}(). Thus
     drop the explicit array length argument from the call in the override.
 
- gi/overrides/Gtk.py |	  2 --
+ gi/overrides/Gtk.py | 2 --
  1 file changed, 2 deletions(-)
 
 commit b59edf4f0f7cab44033f9d704d476e10ee0d0c0a
@@ -11126,7 +13172,7 @@ Date:	Wed Jan 19 18:04:10 2011 +0100
 
     Fix a typo in a private symbol name.
 
- gobject/gobjectmodule.c |    6 +++---
+ gobject/gobjectmodule.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 6447688e283a8fb22de3ab68cbc06e34ad23d198
@@ -11135,7 +13181,7 @@ Date:	Thu Jan 20 11:49:08 2011 +0100
 
     pygi-convert.sh: Convert glib.source_remove()
 
- pygi-convert.sh |    1 +
+ pygi-convert.sh | 1 +
  1 file changed, 1 insertion(+)
 
 commit 84ee8de4bc00a8f901926cc6386d73c12dbd0b0b
@@ -11144,7 +13190,7 @@ Date:	Thu Jan 20 11:42:34 2011 +0100
 
     Fix typo in previous commit to actually convert glib.GError
 
- pygi-convert.sh |    2 +-
+ pygi-convert.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit b238cb614338f46e6feb7935cca0a55c7a929418
@@ -11154,7 +13200,7 @@ Date:	Thu Jan 20 11:40:14 2011 +0100
     pygi-convert.sh: Move some glib bits which are better handled
     by gobject
 
- pygi-convert.sh |    3 +++
+ pygi-convert.sh | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 21c09a7ee294b59abb3eca6f64f13bf5c8a2fa0e
@@ -11172,8 +13218,8 @@ Date:	Wed Jan 19 12:00:02 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=639934
 
- gi/overrides/Gtk.py	 |   14 ++++++++++++--
- tests/test_overrides.py |   34 +++++++++++++++++++++++++++-------
+ gi/overrides/Gtk.py	 | 14 ++++++++++++--
+ tests/test_overrides.py | 34 +++++++++++++++++++++++++++-------
  2 files changed, 39 insertions(+), 9 deletions(-)
 
 commit d465e25297ad6589ff2cd0c00e11e8bd8ffe3f78
@@ -11188,7 +13234,7 @@ Date:	Wed Jan 19 22:52:51 2011 +0100
     in bug
     639939 does.
 
- tests/test_overrides.py |    2 +-
+ tests/test_overrides.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2b8e1d0531dcb8f57dc9f2fddf25970bee3daa90
@@ -11199,8 +13245,8 @@ Date:	Wed Jan 19 20:18:19 2011 +0100
 
     This extends commit b1a98083c to also work for strings.
 
- gi/overrides/GLib.py	 |    8 +++++++-
- tests/test_overrides.py |   13 +++++++++++++
+ gi/overrides/GLib.py	 |  8 +++++++-
+ tests/test_overrides.py | 13 +++++++++++++
  2 files changed, 20 insertions(+), 1 deletion(-)
 
 commit 8efd14c87b35072cdd039bf223f8ced8f51be9bb
@@ -11209,7 +13255,7 @@ Date:	Wed Jan 19 14:08:03 2011 -0500
 
     [gi] return NULL if out_marshaller fails
 
- gi/pygi-invoke.c |    5 +++++
+ gi/pygi-invoke.c | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 5b1db41d60204c8021f47f43b85dac126c389c8d
@@ -11218,9 +13264,9 @@ Date:	Wed Jan 19 13:57:54 2011 -0500
 
     [gi] fix some transfer issues and test case failures
 
- gi/pygi-argument.c |	 4 ++++
- gi/pygi-cache.c    |	11 ++++++++---
- gi/pygi-invoke.c   |	17 +++++++++--------
+ gi/pygi-argument.c |  4 ++++
+ gi/pygi-cache.c    | 11 ++++++++---
+ gi/pygi-invoke.c   | 17 +++++++++--------
  3 files changed, 21 insertions(+), 11 deletions(-)
 
 commit 7c2f48bb6d67ec9a1ee5ac03a5aee34b54c6ebdd
@@ -11235,8 +13281,8 @@ Date:	Wed Jan 19 18:09:23 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=627444
 
- gi/pygi-info.c |   37 +++++++++++++++++++++++++++++++++++++
- gi/types.py	|    7 +++++++
+ gi/pygi-info.c | 37 +++++++++++++++++++++++++++++++++++++
+ gi/types.py	|  7 +++++++
  2 files changed, 44 insertions(+)
 
 commit db7300e173388d9557dcd2333781bfaa6b021605
@@ -11245,7 +13291,7 @@ Date:	Wed Jan 19 18:54:39 2011 +0100
 
     pygi-convert.sh: Migrate Gdk.Cursor constructor, and some cursor names
 
- pygi-convert.sh |    2 ++
+ pygi-convert.sh | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 4c1d4faddf1c9cb233c484da3eadd8e31c231f70
@@ -11258,7 +13304,7 @@ Date:	Wed Jan 19 18:43:29 2011 +0100
     calling the
     GtkWidget methods instead.
 
- pygi-convert.sh |    5 ++++-
+ pygi-convert.sh | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit b1049b947d073fb569ba900a4d5c8519482d831e
@@ -11271,7 +13317,7 @@ Date:	Wed Jan 19 17:35:09 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=639967
 
- gi/pygi-argument.c |	 4 ++--
+ gi/pygi-argument.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 25b69ae257a12b6dc97ed3f2f7ea54b166ddbba1
@@ -11291,9 +13337,9 @@ Date:	Wed Jan 19 17:45:11 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=639834
 
- gi/Makefile.am   |    3 ++-
- gi/pygi-invoke.c |   12 +++---------
- tests/test_gi.py |   10 ++++++++++
+ gi/Makefile.am   |  3 ++-
+ gi/pygi-invoke.c | 12 +++---------
+ tests/test_gi.py | 10 ++++++++++
  3 files changed, 15 insertions(+), 10 deletions(-)
 
 commit 18b84767db1d66e3d6f09067ab19ffd4b82539ca
@@ -11302,8 +13348,8 @@ Date:	Wed Jan 19 12:05:45 2011 -0500
 
     [gi] fix out marshalling for a couple of int types
 
- gi/pygi-argument.c |	 2 +-
- gi/pygi-cache.c    |	 2 +-
+ gi/pygi-argument.c | 2 +-
+ gi/pygi-cache.c    | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit c5d7c730008275b2c585b2609fc2ff5e051cce47
@@ -11313,9 +13359,9 @@ Date:	Wed Jan 19 11:59:09 2011 -0500
     [gi] fixed range checking and type conversion with unsigned and
     large numbers
 
- gi/pygi-argument.c |	90
- +++++++++++++++++++++++++++++++++++++++++++---------
- gi/pygi-cache.c    |	 2 +-
+ gi/pygi-argument.c | 90
+ +++++++++++++++++++++++++++++++++++++++++++++---------
+ gi/pygi-cache.c    |  2 +-
  2 files changed, 76 insertions(+), 16 deletions(-)
 
 commit e6fcafc6179e963cbae7774e7ee50415bde2c523
@@ -11333,7 +13379,7 @@ Date:	Wed Jan 19 17:03:06 2011 +0100
     preferred for
     now, so disable the replacement rules.
 
- pygi-convert.sh |   19 ++++++++++---------
+ pygi-convert.sh | 19 ++++++++++---------
  1 file changed, 10 insertions(+), 9 deletions(-)
 
 commit 167261d556eab0d2e448c7ed28eef540a024ba1d
@@ -11342,7 +13388,7 @@ Date:	Wed Jan 19 16:47:08 2011 +0100
 
     Link libregress.so to GIO_LIBS again
 
- configure.ac |    5 +++++
+ configure.ac | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit d143afa6da4f5b5f47be8df11fa41d7b47ab1794
@@ -11355,7 +13401,7 @@ Date:	Wed Jan 19 16:14:42 2011 +0100
     because in Python attributes starting with a numeral causes a
     syntax error.
 
- gi/overrides/Gdk.py |	  7 +++++--
+ gi/overrides/Gdk.py | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 commit 4f5d20966d4a8c649e5fae584039621edab178f3
@@ -11364,7 +13410,7 @@ Date:	Wed Jan 19 10:02:40 2011 -0500
 
     [gi] use correct format stings when setting errors
 
- gi/pygi-argument.c |	12 ++++++------
+ gi/pygi-argument.c | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 commit 7f08fd5c33ee5c9907f5becbe2f21fb7122d6e19
@@ -11373,7 +13419,7 @@ Date:	Wed Jan 19 09:45:09 2011 -0500
 
     [gi] allow marshalling strings as None
 
- gi/pygi-argument.c |	 5 +++++
+ gi/pygi-argument.c | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 093242a9e125998cd07bf66fc4b2880f532a2e4d
@@ -11382,8 +13428,8 @@ Date:	Wed Jan 19 09:41:56 2011 -0500
 
     [gi] make error messages more detailed
 
- gi/pygi-argument.c |	 2 +-
- gi/pygi-cache.c    |	18 +++++++++---------
+ gi/pygi-argument.c |  2 +-
+ gi/pygi-cache.c    | 18 +++++++++---------
  2 files changed, 10 insertions(+), 10 deletions(-)
 
 commit f0b17605ed2eb917b350654b070984beb553eae3
@@ -11392,7 +13438,7 @@ Date:	Wed Jan 19 09:41:13 2011 -0500
 
     [gi] allow marshalling None for hashes
 
- gi/pygi-argument.c |	 5 +++++
+ gi/pygi-argument.c | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 93f1b787ab8420300d1064c0237a0c2d8a2ac98f
@@ -11401,7 +13447,7 @@ Date:	Wed Jan 19 09:40:37 2011 -0500
 
     [gi] add marshalling to some out values
 
- gi/pygi-argument.c |	50
+ gi/pygi-argument.c | 50
  +++++++++++++++++++++++++++++++++++++++++---------
  1 file changed, 41 insertions(+), 9 deletions(-)
 
@@ -11411,7 +13457,7 @@ Date:	Wed Jan 19 15:27:33 2011 +0100
 
     [gi] Fixed typo in exception
 
- gi/overrides/Gtk.py |	  2 +-
+ gi/overrides/Gtk.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 5f16df31b5a5a9f45f702eee48c3a18899ea3f71
@@ -11420,9 +13466,9 @@ Date:	Wed Jan 19 09:13:44 2011 -0500
 
     [gi] fix marshalling structs
 
- gi/pygi-argument.c |	47 +++++++++++++++++++++++++++++++++++------------
- gi/pygi-foreign.c  |	18 ++++++++++++------
- gi/pygi-foreign.h  |	 8 ++++----
+ gi/pygi-argument.c | 47 +++++++++++++++++++++++++++++++++++------------
+ gi/pygi-foreign.c  | 18 ++++++++++++------
+ gi/pygi-foreign.h  |  8 ++++----
  3 files changed, 51 insertions(+), 22 deletions(-)
 
 commit b2189424f9dd6d3a4a5b9792f0d5843fc27657d1
@@ -11431,7 +13477,7 @@ Date:	Wed Jan 19 15:12:25 2011 +0100
 
     [gi] Enable handling of Gdk.EventType.2BUTTON_PRESS and 3BUTTON_PRESS
 
- gi/overrides/Gdk.py |	  4 ++--
+ gi/overrides/Gdk.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 5eca5ff2c9509ec96158fe43b29f0fd951243efe
@@ -11454,8 +13500,8 @@ Date:	Wed Jan 19 14:54:57 2011 +0100
 
     This reverts commit 8878c57676091c08e66bc6cbe735d898cb420582.
 
- gi/overrides/Pango.py	 |    5 ++++-
- tests/test_overrides.py |    5 +++++
+ gi/overrides/Pango.py	 | 5 ++++-
+ tests/test_overrides.py | 5 +++++
  2 files changed, 9 insertions(+), 1 deletion(-)
 
 commit 9e7b95b3676a1b502662523a9bd4ebe40ccb4845
@@ -11464,9 +13510,9 @@ Date:	Thu Dec 16 23:39:33 2010 +0000
 
     Python iterator interface support for GFileEnumerator.
 
- gi/overrides/Gio.py	  |   41 +++++++++++++++++++++++++++++++++++++++++
- gi/overrides/Makefile.am |    1 +
- tests/test_overrides.py  |   20 ++++++++++++++++++++
+ gi/overrides/Gio.py	  | 41 +++++++++++++++++++++++++++++++++++++++++
+ gi/overrides/Makefile.am |  1 +
+ tests/test_overrides.py  | 20 ++++++++++++++++++++
  3 files changed, 62 insertions(+)
 
 commit bca5834fc8fa342149e0eec7b396877a2abe6d33
@@ -11533,8 +13579,8 @@ Date:	Wed Jan 19 07:56:16 2011 -0500
     [gi] switch from using (*arg). to arg-> when referencing union
     memebers
 
- gi/pygi-argument.c |	54
- ++++++++++++++++++++++++++--------------------------
+ gi/pygi-argument.c | 54
+ +++++++++++++++++++++++++++---------------------------
  1 file changed, 27 insertions(+), 27 deletions(-)
 
 commit 762ccb3d2620ea22023446b6ae79f3a111d8b56a
@@ -11543,7 +13589,7 @@ Date:	Wed Jan 19 07:49:52 2011 -0500
 
     [gi] return FALSE when setting errors in the marshaller
 
- gi/pygi-argument.c |	 3 ++-
+ gi/pygi-argument.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit cbaba6357937cbed3ebd34d2db1cdd59d37df118
@@ -11552,10 +13598,10 @@ Date:	Wed Jan 19 07:14:18 2011 -0500
 
     [gi] do arg counting in new invoke
 
- gi/pygi-cache.c	       |    2 ++
- gi/pygi-cache.h	       |   14 ++++++++------
- gi/pygi-invoke-state-struct.h |    2 +-
- gi/pygi-invoke.c	       |   20 +++++++++++++++++++-
+ gi/pygi-cache.c	       |  2 ++
+ gi/pygi-cache.h	       | 14 ++++++++------
+ gi/pygi-invoke-state-struct.h |  2 +-
+ gi/pygi-invoke.c	       | 20 +++++++++++++++++++-
  4 files changed, 30 insertions(+), 8 deletions(-)
 
 commit f45033858bed70d7defec3f71f26aa5b3999d680
@@ -11564,7 +13610,7 @@ Date:	Wed Jan 19 06:35:45 2011 -0500
 
     [gi] set length for uint8 in arrays in new invoke marshaller
 
- gi/pygi-argument.c |	 1 +
+ gi/pygi-argument.c | 1 +
  1 file changed, 1 insertion(+)
 
 commit 09f7ca7e2378e6679002677ac3f4802f4cc7d9d5
@@ -11573,8 +13619,8 @@ Date:	Wed Jan 19 12:04:15 2011 +0100
 
     [gi] set length when marshalling guint8 erases
 
- gi/pygi-argument.c |	 1 +
- tests/test_gi.py   |	 4 ++++
+ gi/pygi-argument.c | 1 +
+ tests/test_gi.py   | 4 ++++
  2 files changed, 5 insertions(+)
 
 commit 22eee43e50a150ace80694213fb87be9f0c72f51
@@ -11583,7 +13629,7 @@ Date:	Wed Jan 19 10:27:47 2011 +0100
 
     Convert Gdk.Pixbuf to GdkPixbuf.Pixbuf
 
- pygi-convert.sh |    1 +
+ pygi-convert.sh | 1 +
  1 file changed, 1 insertion(+)
 
 commit a4b210d69c832629894090b7154ae194209b0c60
@@ -11598,8 +13644,8 @@ Date:	Tue Jan 18 18:31:29 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=374603
 
- glib/pyglib.c		     |	 12 ++++++++++++
- gobject/pygobject-private.h |	  6 ++++++
+ glib/pyglib.c		     | 12 ++++++++++++
+ gobject/pygobject-private.h |	6 ++++++
  2 files changed, 18 insertions(+)
 
 commit 329afb6fb1b3c325a6a9de2b6aca91c64d51dd9f
@@ -11608,9 +13654,9 @@ Date:	Tue Jan 18 12:31:57 2011 -0500
 
     [gi] fix handling of garrays vs c arrays
 
- gi/pygi-argument.c |	 9 +++++++--
- gi/pygi-cache.c    |	 2 ++
- gi/pygi-cache.h    |	 1 +
+ gi/pygi-argument.c | 9 +++++++--
+ gi/pygi-cache.c    | 2 ++
+ gi/pygi-cache.h    | 1 +
  3 files changed, 10 insertions(+), 2 deletions(-)
 
 commit a000627ec3904b9414ce375aec8d144fc0c26248
@@ -11620,7 +13666,7 @@ Date:	Tue Jan 18 18:29:50 2011 +0100
     pygi-convert.sh: Do not comment out set_cell_data_func() calls;
     these should be ported properly
 
- pygi-convert.sh |    1 -
+ pygi-convert.sh | 1 -
  1 file changed, 1 deletion(-)
 
 commit 99ff4610fb5ece2fc8d2f9eba13e661968adf3f0
@@ -11629,7 +13675,7 @@ Date:	Tue Jan 18 18:26:01 2011 +0100
 
     pygi-convert.sh: Fix match for adding missing imports
 
- pygi-convert.sh |    8 ++++----
+ pygi-convert.sh | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 3aa95011fad67df20370e92bf25236a34d7d08d3
@@ -11643,7 +13689,7 @@ Date:	Tue Jan 18 18:09:30 2011 +0100
     hackish unfortunately. We can't use a match test or a lookahead/behind
     assertion.
 
- pygi-convert.sh |    5 +++--
+ pygi-convert.sh | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit f66051380c0432bf142774542ade2144adcd455e
@@ -11652,7 +13698,7 @@ Date:	Tue Jan 18 11:44:27 2011 -0500
 
     [gi] use correct union memeber when marshalling floats
 
- gi/pygi-argument.c |	 2 +-
+ gi/pygi-argument.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 36bc1c17e7d4189059337cc6a73c64edd819ec12
@@ -11661,7 +13707,7 @@ Date:	Tue Jan 18 17:29:52 2011 +0100
 
     Remove trailing whitespace from gi/overrides/Gtk.py
 
- gi/overrides/Gtk.py |	 10 +++++-----
+ gi/overrides/Gtk.py | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 commit 1006df1929a667716c25e74b35b8f14643358732
@@ -11675,11 +13721,11 @@ Date:	Tue Jan 18 11:24:06 2011 -0500
     static methods
       which happen to return an instance
 
- gi/pygi-argument.c |	 8 ++--
- gi/pygi-cache.c    |  132
- ++++++++++++++++++++++++++++++++++++++++++++++++++--
- gi/pygi-invoke.c   |	 9 ++--
- gi/types.py	    |	21 +++------
+ gi/pygi-argument.c |	8 ++--
+ gi/pygi-cache.c    | 132
+ +++++++++++++++++++++++++++++++++++++++++++++++++++--
+ gi/pygi-invoke.c   |	9 ++--
+ gi/types.py	    |  21 +++------
  4 files changed, 142 insertions(+), 28 deletions(-)
 
 commit 8878c57676091c08e66bc6cbe735d898cb420582
@@ -11694,7 +13740,7 @@ Date:	Tue Jan 18 16:47:10 2011 +0100
     (which works
     just fine now).
 
- gi/overrides/Pango.py |    7 +------
+ gi/overrides/Pango.py | 7 +------
  1 file changed, 1 insertion(+), 6 deletions(-)
 
 commit efbbe71634037fa100b17327389b883b259cca54
@@ -11705,7 +13751,7 @@ Date:	Tue Jan 18 16:23:39 2011 +0100
 
     This allows us to run the test suite against local typelibs.
 
- tests/Makefile.am |	2 +-
+ tests/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit c96ca383350e5b9b079d9a86464922314939c006
@@ -11719,7 +13765,7 @@ Date:	Tue Jan 18 07:16:40 2011 -0500
     * use _pygi_g_type_info_size instead of _pygi_g_type_tag_size to
       support all types
 
- gi/pygi-cache.c |   42 ++++++++++++++++++++++++------------------
+ gi/pygi-cache.c | 42 ++++++++++++++++++++++++------------------
  1 file changed, 24 insertions(+), 18 deletions(-)
 
 commit f56d85a7f39c2088bf9fd50b1b1e5b67c03104d3
@@ -11736,8 +13782,8 @@ Date:	Tue Jan 18 13:12:36 2011 +0100
     GTK overrides: Do type conversion to column types of ListStore and
     TreeStore in set_value
 
- gi/overrides/Gtk.py	 |   28 ++++++++++++++++++----------
- tests/test_overrides.py |   12 +++++++++++-
+ gi/overrides/Gtk.py	 | 28 ++++++++++++++++++----------
+ tests/test_overrides.py | 12 +++++++++++-
  2 files changed, 29 insertions(+), 11 deletions(-)
 
 commit 84d6142c14a7ebfb7284d3db52e14d3393f93905
@@ -11760,8 +13806,8 @@ Date:	Mon Jan 17 18:57:58 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=543056
 
- gobject/__init__.py |	  6 +++---
- tests/test_gi.py    |	 21 ++-------------------
+ gobject/__init__.py |	6 +++---
+ tests/test_gi.py    | 21 ++-------------------
  2 files changed, 5 insertions(+), 22 deletions(-)
 
 commit 30750ccef31e6c864628f418fc00e8c573d29a1b
@@ -11772,7 +13818,7 @@ Date:	Tue Jan 18 12:57:13 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=612126
 
- configure.ac |    6 +++---
+ configure.ac | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 761e98d32729f5894f4c75a54c65ed11329dc9d5
@@ -11781,7 +13827,7 @@ Date:	Tue Jan 18 12:52:32 2011 +0100
 
     pygi-convert.sh: Handle keysyms
 
- pygi-convert.sh |    1 +
+ pygi-convert.sh | 1 +
  1 file changed, 1 insertion(+)
 
 commit d62cdfa38a675c1daf3bc12d5cd769434eea5dc8
@@ -11790,7 +13836,7 @@ Date:	Tue Jan 18 12:14:09 2011 +0100
 
     GLib overrides: Add test case for array variant building
 
- tests/test_overrides.py |    7 +++++++
+ tests/test_overrides.py | 7 +++++++
  1 file changed, 7 insertions(+)
 
 commit 69a78307f3762e3f54d28d98514cec7d31ff20db
@@ -11801,8 +13847,8 @@ Date:	Tue Jan 18 10:21:03 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=639824
 
- gi/pygi-foreign-cairo.c |   96
- -----------------------------------------------
+ gi/pygi-foreign-cairo.c | 96
+ -------------------------------------------------
  1 file changed, 96 deletions(-)
 
 commit 017680c9a5e163021628bf29543598861a3b600a
@@ -11813,7 +13859,7 @@ Date:	Tue Jan 18 10:20:25 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=639823
 
- gi/pygi-invoke.c |    5 ++++-
+ gi/pygi-invoke.c | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit 771ef76574690eb98926249f38661d741d1ebbb0
@@ -11822,7 +13868,7 @@ Date:	Tue Jan 18 12:02:01 2011 +0100
 
     The tags can be Empty not None.
 
- gi/overrides/Gtk.py |	  2 +-
+ gi/overrides/Gtk.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit b1a98083cdc50653e1d7bfb809bdf089f833df3d
@@ -11837,9 +13883,9 @@ Date:	Tue Jan 18 12:01:28 2011 +0100
 
     Add corresponding test cases.
 
- gi/overrides/GLib.py	 |   50 ++++++++++++++++++++++++++++++++++++++++++
- tests/test_overrides.py |   55
- +++++++++++++++++++++++++++++++++++++++++++++++
+ gi/overrides/GLib.py	 | 50 ++++++++++++++++++++++++++++++++++++++++++++
+ tests/test_overrides.py | 55
+ +++++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 105 insertions(+)
 
 commit ecb9f824c503c529d43e585b4cdb4c1c9ab14593
@@ -11856,9 +13902,9 @@ Date:	Tue Jan 18 10:48:03 2011 +0100
 
     Add appropriate test case.
 
- gi/overrides/GLib.py	 |   45
+ gi/overrides/GLib.py	 | 45
  +++++++++++++++++++++++++++++++++++++++++++++
- tests/test_overrides.py |   33 ++++++++++++++++++++++++++++++++-
+ tests/test_overrides.py | 33 ++++++++++++++++++++++++++++++++-
  2 files changed, 77 insertions(+), 1 deletion(-)
 
 commit 31c73dee34a52fd22b5ff3a23adce92cea5ddc3d
@@ -11867,8 +13913,8 @@ Date:	Tue Jan 18 10:56:18 2011 +0100
 
     Add override for gtk_text_buffer_insert_with_tags
 
- gi/overrides/Gtk.py	 |   12 ++++++++++++
- tests/test_overrides.py |    6 ++++++
+ gi/overrides/Gtk.py	 | 12 ++++++++++++
+ tests/test_overrides.py |  6 ++++++
  2 files changed, 18 insertions(+)
 
 commit fc7d7f7f153d57ff3866b7bfd5e6479d702cc4d9
@@ -11879,11 +13925,11 @@ Date:	Mon Jan 17 14:35:14 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=620215
 
- gi/Makefile.am    |	6 ++++--
- gio/Makefile.am   |	2 +-
- glib/Makefile.am  |	2 +-
- m4/python.m4	   |	7 +++++--
- tests/Makefile.am |	2 +-
+ gi/Makefile.am    | 6 ++++--
+ gio/Makefile.am   | 2 +-
+ glib/Makefile.am  | 2 +-
+ m4/python.m4	   | 7 +++++--
+ tests/Makefile.am | 2 +-
  5 files changed, 12 insertions(+), 7 deletions(-)
 
 commit bceec758b27e6c396d17a79424633b5dc9116f54
@@ -11896,8 +13942,8 @@ Date:	Mon Jan 17 14:20:55 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=620215
 
- configure.ac |    2 +-
- m4/python.m4 |   31 +------------------------------
+ configure.ac |  2 +-
+ m4/python.m4 | 31 +------------------------------
  2 files changed, 2 insertions(+), 31 deletions(-)
 
 commit e2dea065da94d17a915abe1ce4671b1dc48e02c0
@@ -11913,7 +13959,7 @@ Date:	Mon Jan 17 19:09:27 2011 +0100
 
 	gi/overrides/Gtk.py
 
- gi/overrides/Gtk.py |	 10 ----------
+ gi/overrides/Gtk.py | 10 ----------
  1 file changed, 10 deletions(-)
 
 commit 4fbae9629adc166627de05bb0946b71485343d69
@@ -11925,7 +13971,7 @@ Date:	Mon Jan 17 19:08:23 2011 +0100
 
     This reverts commit 232841148f35684be83a2f47b5b18da4fb74f63a.
 
- gi/overrides/Gtk.py |	 13 ++-----------
+ gi/overrides/Gtk.py | 13 ++-----------
  1 file changed, 2 insertions(+), 11 deletions(-)
 
 commit c054f0aca67952876b3519bb75ddc62c5517f7cb
@@ -11937,7 +13983,7 @@ Date:	Mon Jan 17 19:08:06 2011 +0100
 
     This reverts commit ed7e7a8f22b1481acf78c0c2e4c489dbad72f599.
 
- gi/overrides/Gtk.py |	  9 ---------
+ gi/overrides/Gtk.py | 9 ---------
  1 file changed, 9 deletions(-)
 
 commit 2d9534f347505573da46743b47318e08bf073aef
@@ -11946,7 +13992,7 @@ Date:	Mon Jan 17 18:54:10 2011 +0100
 
     pygi-convert.sh: Handle gtk.combo_box_new_text()
 
- pygi-convert.sh |    1 +
+ pygi-convert.sh | 1 +
  1 file changed, 1 insertion(+)
 
 commit 0586a83212a9f9234fe00659ae744ab04e7ccc67
@@ -11955,11 +14001,11 @@ Date:	Mon Jan 17 12:31:03 2011 -0500
 
     support callbacks
 
- gi/pygi-argument.c |	68 ++++++++++++++++++++++++++++++++++++++++++--
- gi/pygi-cache.c    |	80
- +++++++++++++++++++++++++++++++++++++++-------------
- gi/pygi-cache.h    |	13 +++++++--
- gi/pygi-invoke.c   |	 2 +-
+ gi/pygi-argument.c | 68 ++++++++++++++++++++++++++++++++++++++++++++--
+ gi/pygi-cache.c    | 80
+ +++++++++++++++++++++++++++++++++++++++++-------------
+ gi/pygi-cache.h    | 13 +++++++--
+ gi/pygi-invoke.c   |  2 +-
  4 files changed, 138 insertions(+), 25 deletions(-)
 
 commit 914d3a0a29680f4d3aa0e1f8afdd625b017b013a
@@ -11969,7 +14015,7 @@ Date:	Mon Jan 17 16:57:53 2011 +0100
     Override TreeSortable.set_sort_func and set_default_sort_func to
     add default values to be pygtk compliant
 
- gi/overrides/Gtk.py |	  6 ++++++
+ gi/overrides/Gtk.py | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit ed7e7a8f22b1481acf78c0c2e4c489dbad72f599
@@ -11979,7 +14025,7 @@ Date:	Mon Jan 17 16:29:28 2011 +0100
     Override Gtk.TreeViewColumn.pack_start, pack_end and
     set_cell_data_func to add default values to be compliant with pygtk
 
- gi/overrides/Gtk.py |	  9 +++++++++
+ gi/overrides/Gtk.py | 9 +++++++++
  1 file changed, 9 insertions(+)
 
 commit 232841148f35684be83a2f47b5b18da4fb74f63a
@@ -11989,7 +14035,7 @@ Date:	Mon Jan 17 16:28:51 2011 +0100
     Override Gtk.CellLayout.pack_start and pack_end to add default values
     to be compliant with pygtk
 
- gi/overrides/Gtk.py |	 13 +++++++++++--
+ gi/overrides/Gtk.py | 13 +++++++++++--
  1 file changed, 11 insertions(+), 2 deletions(-)
 
 commit 1dec12826753756fcadefc8ef8c756fc902c320b
@@ -11999,7 +14045,7 @@ Date:	Mon Jan 17 15:54:32 2011 +0100
     Override Gtk.Paned pack1 and pack2 to add default values to be
     compliant with pygtk
 
- gi/overrides/Gtk.py |	 10 ++++++++++
+ gi/overrides/Gtk.py | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
 commit a8c727b9c4195d8085a45661683a18614ae84485
@@ -12009,7 +14055,7 @@ Date:	Mon Jan 17 15:46:25 2011 +0100
     Override Gtk.Box.pack_start and pack_end to set default values to
     be compliant with pygtk
 
- gi/overrides/Gtk.py |	 10 ++++++++++
+ gi/overrides/Gtk.py | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
 commit 7cc8ac35bb0d8dbf7d66f014f8cd7ff070b3acb8
@@ -12020,8 +14066,8 @@ Date:	Wed Aug 4 00:30:05 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=625982
 
- gobject/propertyhelper.py |   26 +++++++++++++-------------
- tests/test_properties.py  |	9 +++++++++
+ gobject/propertyhelper.py | 26 +++++++++++++-------------
+ tests/test_properties.py  |  9 +++++++++
  2 files changed, 22 insertions(+), 13 deletions(-)
 
 commit 7a0548dbfbdfe481f75315b6bc7824a9f1a8a87b
@@ -12038,8 +14084,8 @@ Date:	Mon Jan 17 17:52:15 2011 +0100
 
     Add corresponding test case.
 
- gi/overrides/Gtk.py	 |    2 +-
- tests/test_overrides.py |   12 +++++++++++-
+ gi/overrides/Gtk.py	 |  2 +-
+ tests/test_overrides.py | 12 +++++++++++-
  2 files changed, 12 insertions(+), 2 deletions(-)
 
 commit 09c21c79fb6063c8451f53d4588363d2be7239f4
@@ -12056,14 +14102,14 @@ Date:	Mon Jan 17 16:46:08 2011 +0100
     In Gstreamer, there is a function gst_version, which was previously
     inaccessible because of IntrospectionModule.version overriding it.
 
- gi/module.py			    |	26 +++++++++++++-------------
- gi/overrides/GIMarshallingTests.py |	 2 +-
- gi/overrides/GLib.py		    |	 2 +-
- gi/overrides/Gdk.py		    |	10 +++++-----
- gi/overrides/Gtk.py		    |	 2 +-
- gi/overrides/Pango.py		    |	 2 +-
- gi/overrides/__init__.py	    |	 2 +-
- tests/test_everything.py	    |	 2 +-
+ gi/module.py			    | 26 +++++++++++++-------------
+ gi/overrides/GIMarshallingTests.py |  2 +-
+ gi/overrides/GLib.py		    |  2 +-
+ gi/overrides/Gdk.py		    | 10 +++++-----
+ gi/overrides/Gtk.py		    |  2 +-
+ gi/overrides/Pango.py		    |  2 +-
+ gi/overrides/__init__.py	    |  2 +-
+ tests/test_everything.py	    |  2 +-
  8 files changed, 24 insertions(+), 24 deletions(-)
 
 commit 2c70beca9e76e4dc253453c556e6985ce59a3dd9
@@ -12073,8 +14119,8 @@ Date:	Mon Jan 17 16:17:25 2011 +0100
     Amend previous enum wrapping commit to remove redundant setting of
     __info__ attribute.
 
- gi/module.py |    2 +-
- gi/types.py  |    6 +++---
+ gi/module.py | 2 +-
+ gi/types.py  | 6 +++---
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 commit 6fbb6be5a5d0d9cd43e1504b8dda5aa75feb95ca
@@ -12083,7 +14129,7 @@ Date:	Mon Jan 17 16:16:45 2011 +0100
 
     pygi-convert.sh: Handle GdkPixbuf.InterpType
 
- pygi-convert.sh |    2 ++
+ pygi-convert.sh | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 66a5784f4ab5de5b6d8d51eb4ce869fa26f6a601
@@ -12101,9 +14147,9 @@ Date:	Mon Jan 17 15:43:34 2011 +0100
     enum from the GIMarshallingTests (updating gobject-introspection
     will be required).
 
- gi/module.py	  |    2 +-
- gi/types.py	  |    2 ++
- tests/test_gi.py |   10 ++++++++++
+ gi/module.py	  |  2 +-
+ gi/types.py	  |  2 ++
+ tests/test_gi.py | 10 ++++++++++
  3 files changed, 13 insertions(+), 1 deletion(-)
 
 commit da50d5620a42046d4fc905bb28a0890d73533cb1
@@ -12114,12 +14160,12 @@ Date:	Mon Dec 13 18:03:51 2010 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=637165
 
- gi/pygi-info.c   |    4 +--
- gi/pygi-invoke.c |   72
- +++++++++++++++++++++++++++++++++++++++++-------------
- gi/pygi-invoke.h |    3 ++-
- gi/types.py	  |   28 ++++++++++++++++++++-
- tests/test_gi.py |    5 ++--
+ gi/pygi-info.c   |  4 ++--
+ gi/pygi-invoke.c | 72
+ +++++++++++++++++++++++++++++++++++++++++++-------------
+ gi/pygi-invoke.h |  3 ++-
+ gi/types.py	  | 28 +++++++++++++++++++++-
+ tests/test_gi.py |  5 ++--
  5 files changed, 89 insertions(+), 23 deletions(-)
 
 commit 8ceef79c98a1c2e22ed8ab655ef1169f1763dd23
@@ -12144,18 +14190,18 @@ Date:	Fri Dec 31 18:38:04 2010 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=636656
 
- glib/glibmodule.c	 |    5 ++++-
- glib/pyglib-private.h	 |    3 +++
- glib/pyglib.c		 |   48
- +++--------------------------------------------
- glib/pygmaincontext.c	 |   22 ++++++++++++++++++++++
- glib/pygmaincontext.h	 |    2 +-
- glib/pygmainloop.c	 |    2 +-
- glib/pygoptioncontext.c |   21 +++++++++++++++++++++
- glib/pygoptioncontext.h |    2 ++
- glib/pygoptiongroup.c	 |   26 +++++++++++++++++++++++++
- glib/pygoptiongroup.h	 |    2 ++
- glib/pygsource.c	 |    2 +-
+ glib/glibmodule.c	 |  5 ++++-
+ glib/pyglib-private.h	 |  3 +++
+ glib/pyglib.c		 | 48
+ +++---------------------------------------------
+ glib/pygmaincontext.c	 | 22 ++++++++++++++++++++++
+ glib/pygmaincontext.h	 |  2 +-
+ glib/pygmainloop.c	 |  2 +-
+ glib/pygoptioncontext.c | 21 +++++++++++++++++++++
+ glib/pygoptioncontext.h |  2 ++
+ glib/pygoptiongroup.c	 | 26 ++++++++++++++++++++++++++
+ glib/pygoptiongroup.h	 |  2 ++
+ glib/pygsource.c	 |  2 +-
  11 files changed, 86 insertions(+), 49 deletions(-)
 
 commit 17caffe4eeefeaf33a56ececbc6c7454f60b9d76
@@ -12164,7 +14210,7 @@ Date:	Mon Jan 17 14:51:26 2011 +0100
 
     pygi-convert.sh: Handle Gdk.DragAction
 
- pygi-convert.sh |    1 +
+ pygi-convert.sh | 1 +
  1 file changed, 1 insertion(+)
 
 commit aa390aa80f06ac83ec89e5c5ee143d21ace97917
@@ -12175,7 +14221,7 @@ Date:	Mon Jan 17 14:46:58 2011 +0100
 
     There are other GSettings.get_* functions like get_for_screen().
 
- pygi-convert.sh |    2 +-
+ pygi-convert.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2e6d5bb49425e6087ca61765ecb72e7a760f2ab2
@@ -12186,7 +14232,7 @@ Date:	Mon Jan 17 11:22:46 2011 +0100
 
     This particular affects dbus.mainloop.glib.*
 
- pygi-convert.sh |    2 +-
+ pygi-convert.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 3887b030fc19d25e0cd7b4ed504f4ed23363c3d6
@@ -12197,7 +14243,7 @@ Date:	Sun Jan 16 22:09:56 2011 +0100
 
     Do not leak interface info in (g|s)_et_property.
 
- gi/pygi-property.c |	 4 ++++
+ gi/pygi-property.c | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit a4950b4cbb3c7567a8586061bb361adb7d9afb98
@@ -12208,7 +14254,7 @@ Date:	Sun Jan 16 21:43:30 2011 +0100
 
     Do not leak type_info in find_vfunc_info
 
- gi/gimodule.c |   10 +++++-----
+ gi/gimodule.c | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 commit d0cbcc45366d40702c69cef207d3c0f361260c02
@@ -12219,8 +14265,8 @@ Date:	Sun Jan 16 12:16:31 2011 +0100
 
     It is fairly common and even gtk itself still has attach_defaults.
 
- gi/overrides/Gtk.py	 |    3 +++
- tests/test_overrides.py |    4 ++++
+ gi/overrides/Gtk.py	 | 3 +++
+ tests/test_overrides.py | 4 ++++
  2 files changed, 7 insertions(+)
 
 commit 6409d659326bf3cefdf6051379e8bc2031f16733
@@ -12229,7 +14275,7 @@ Date:	Sat Jan 15 11:20:23 2011 -0600
 
     pygi-convert.sh: Convert Pango.WrapMode
 
- pygi-convert.sh |    1 +
+ pygi-convert.sh | 1 +
  1 file changed, 1 insertion(+)
 
 commit 6aaa6a38198e84a189ca1e8d26b1871d5b6bb711
@@ -12242,7 +14288,7 @@ Date:	Sat Jan 15 11:17:09 2011 -0600
     changing those,
     just change module names which start with "gtk" or "gdk".
 
- pygi-convert.sh |    4 ++--
+ pygi-convert.sh | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 9be0f1f2dfb89150faf1827ef482feea03645149
@@ -12251,10 +14297,10 @@ Date:	Thu Jan 13 23:56:19 2011 -0500
 
     [gi] implement aux arg handling for array lengths
 
- gi/pygi-argument.c |	 8 ++++++++
- gi/pygi-cache.c    |	36 ++++++++++++++++++++++++++++--------
- gi/pygi-cache.h    |	 1 -
- gi/pygi-invoke.c   |	 8 ++++++--
+ gi/pygi-argument.c |  8 ++++++++
+ gi/pygi-cache.c    | 36 ++++++++++++++++++++++++++++--------
+ gi/pygi-cache.h    |  1 -
+ gi/pygi-invoke.c   |  8 ++++++--
  4 files changed, 42 insertions(+), 11 deletions(-)
 
 commit cfca2f0a53a5c29f543875ca4cb83a2e18d3bc72
@@ -12263,9 +14309,9 @@ Date:	Thu Jan 13 21:07:25 2011 -0500
 
     [gi] marshal in hashes
 
- gi/pygi-argument.c |	93 +++++++++++++++++++++++++++++++++++++--
- gi/pygi-cache.c    |  122
- ++++++++++++++++++++++++++++++++++++----------------
+ gi/pygi-argument.c |  93 ++++++++++++++++++++++++++++++++++++++--
+ gi/pygi-cache.c    | 122
+ +++++++++++++++++++++++++++++++++++++----------------
  2 files changed, 176 insertions(+), 39 deletions(-)
 
 commit c36fbf4918c8557a8e274a12004a412da3b22b2c
@@ -12286,8 +14332,8 @@ Date:	Tue Jan 11 21:41:47 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=639229
 
- gi/module.py		  |   28 +++++++++++++++++++++-------
- tests/test_everything.py |   18 ++++++++++++++++++
+ gi/module.py		  | 28 +++++++++++++++++++++-------
+ tests/test_everything.py | 18 ++++++++++++++++++
  2 files changed, 39 insertions(+), 7 deletions(-)
 
 commit 1679e6af3f212e4d4644e048dc3c6177ed3fac6b
@@ -12296,7 +14342,7 @@ Date:	Thu Jan 13 00:02:20 2011 +0100
 
     pygi-convert.sh: handle ReliefStyle
 
- pygi-convert.sh |    1 +
+ pygi-convert.sh | 1 +
  1 file changed, 1 insertion(+)
 
 commit e9166ba5d19f2b586f65a3b83a671a5afd486d8f
@@ -12305,8 +14351,8 @@ Date:	Wed Jan 12 16:50:30 2011 -0500
 
     [gi] support for GList and GSList in
 
- gi/pygi-argument.c |  122
- +++++++++++++++++++++++++++++++++++++++++++++++++---
+ gi/pygi-argument.c | 122
+ ++++++++++++++++++++++++++++++++++++++++++++++++++---
  1 file changed, 116 insertions(+), 6 deletions(-)
 
 commit 9baf3240fbac103823ad0feaaf1c82e46d276722
@@ -12315,9 +14361,9 @@ Date:	Wed Jan 12 16:24:17 2011 -0500
 
     [gi] handle allow_none for all args
 
- gi/pygi-cache.c  |    3 ++-
- gi/pygi-cache.h  |    1 +
- gi/pygi-invoke.c |    7 +++++++
+ gi/pygi-cache.c  | 3 ++-
+ gi/pygi-cache.h  | 1 +
+ gi/pygi-invoke.c | 7 +++++++
  3 files changed, 10 insertions(+), 1 deletion(-)
 
 commit d54d12c66226910952b0dc44c8d9514a7edaa6f2
@@ -12328,8 +14374,8 @@ Date:	Wed Jan 12 16:23:02 2011 -0500
 
     * get the correct item_size and pass the GArray data not the GArray
 
- gi/pygi-argument.c |	39 ++++++++++++++++++++++-----------------
- gi/pygi-cache.c    |	 3 ++-
+ gi/pygi-argument.c | 39 ++++++++++++++++++++++-----------------
+ gi/pygi-cache.c    |  3 ++-
  2 files changed, 24 insertions(+), 18 deletions(-)
 
 commit 3b0eff80d2ee35e0417476f0a170b9e178e3d1ee
@@ -12338,11 +14384,11 @@ Date:	Tue Jan 11 17:20:43 2011 -0500
 
     [gi] implement out arg handling
 
- gi/pygi-argument.c	       |   43 +++++++++--------------------------
- gi/pygi-cache.c	       |   22 +++++++++++++-----
- gi/pygi-invoke-state-struct.h |   13 +++++++++++
- gi/pygi-invoke.c	       |   50
- +++++++++++++++++++++++++++++++++++++++--
+ gi/pygi-argument.c	       | 43 ++++++++++---------------------------
+ gi/pygi-cache.c	       | 22 ++++++++++++++-----
+ gi/pygi-invoke-state-struct.h | 13 +++++++++++
+ gi/pygi-invoke.c	       | 50
+ +++++++++++++++++++++++++++++++++++++++++--
  4 files changed, 89 insertions(+), 39 deletions(-)
 
 commit bd002c72675d35b5e60ab773181e7c36c30d2625
@@ -12351,7 +14397,7 @@ Date:	Tue Jan 11 22:21:18 2011 +0100
 
     setup.py: fix the provides keyword argument
 
- setup.py |    2 +-
+ setup.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 59dac72d0fa8e1d68bbbc13d76c2747f1cb11857
@@ -12360,7 +14406,7 @@ Date:	Tue Jan 11 22:19:18 2011 +0100
 
     setup.py: use the same spaces-less format for all setup() parameters
 
- setup.py |    8 ++++----
+ setup.py | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit c5c149be171895d292852df364541f14f0ec423a
@@ -12369,12 +14415,12 @@ Date:	Tue Jan 11 15:39:09 2011 -0500
 
     [gi] implemented return marshalling and started on out marshalling
 
- gi/pygi-argument.c |  387
- +++++++++++++++++++++++++++++++++++++++++++++++++++-
- gi/pygi-argument.h |  117 ++++++++++++++++
- gi/pygi-cache.c    |  316 +++++++++++++++++++++++++++++++++++++++++-
- gi/pygi-cache.h    |	 8 +-
- gi/pygi-invoke.c   |	12 +-
+ gi/pygi-argument.c | 387
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ gi/pygi-argument.h | 117 ++++++++++++++++
+ gi/pygi-cache.c    | 316 ++++++++++++++++++++++++++++++++++++++++++-
+ gi/pygi-cache.h    |	8 +-
+ gi/pygi-invoke.c   |  12 +-
  5 files changed, 829 insertions(+), 11 deletions(-)
 
 commit 4fcca8518774ab89607196dfc52037e3da30ac8a
@@ -12383,11 +14429,11 @@ Date:	Tue Jan 11 13:49:58 2011 -0500
 
     [gi] flesh out interface in marshalling a bit more
 
- gi/pygi-argument.c |	74
- ++++++++++++++++++++++++++++++++++++++----------
- gi/pygi-cache.c    |	79
- +++++++++++++++++++++++++++++++++++++++++-----------
- gi/pygi-cache.h    |	 1 +
+ gi/pygi-argument.c | 74
+ ++++++++++++++++++++++++++++++++++++++++----------
+ gi/pygi-cache.c    | 79
+ ++++++++++++++++++++++++++++++++++++++++++------------
+ gi/pygi-cache.h    |  1 +
  3 files changed, 123 insertions(+), 31 deletions(-)
 
 commit 4992dca9f5cea68d85eb2ed86105c9c6b8311d79
@@ -12407,7 +14453,7 @@ Date:	Tue Jan 11 19:30:38 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=639232
 
- gi/module.py |    9 +++++++++
+ gi/module.py | 9 +++++++++
  1 file changed, 9 insertions(+)
 
 commit 2ffaec59e7349c145a0e2a5edba2ffb7d8628369
@@ -12418,7 +14464,7 @@ Date:	Tue Jan 11 19:40:19 2011 +0100
 
     Breaks marshalling of some types
 
- gi/module.py |    2 +-
+ gi/module.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 52a298cc0f05ceec96457f17f9a801e9838fb757
@@ -12439,7 +14485,7 @@ Date:	Tue Jan 11 19:26:50 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=639229
 
- gi/module.py |   10 +++++++---
+ gi/module.py | 10 +++++++---
  1 file changed, 7 insertions(+), 3 deletions(-)
 
 commit 369a75ba5fb64ff7a7c95d21f8bfe359e639e9ff
@@ -12451,11 +14497,11 @@ Date:	Mon Jan 10 17:55:03 2011 -0500
     * also remove the PyGIArgCleanup sinature as GDestroyNotify works
     just fine
 
- gi/pygi-argument.c |	15 +++--
- gi/pygi-cache.c    |  182
- +++++++++++++++++++++++++++++++++++++++++++++++-----
- gi/pygi-cache.h    |	 1 -
- gi/pygi-invoke.c   |	 1 +
+ gi/pygi-argument.c |  15 +++--
+ gi/pygi-cache.c    | 182
+ ++++++++++++++++++++++++++++++++++++++++++++++++-----
+ gi/pygi-cache.h    |	1 -
+ gi/pygi-invoke.c   |	1 +
  4 files changed, 178 insertions(+), 21 deletions(-)
 
 commit 88531c58d0491a31dd319387237a03df5c9edc07
@@ -12464,7 +14510,7 @@ Date:	Mon Jan 10 15:33:56 2011 -0500
 
     [gi] fix casting when marshaling a char to uint8
 
- gi/pygi-argument.c |	 2 +-
+ gi/pygi-argument.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 441da4a7346ca059630dbc820c5b46e4d0222f4b
@@ -12478,15 +14524,15 @@ Date:	Mon Jan 10 15:07:16 2011 -0500
     complex
       in types
 
- gi/Makefile.am		       |    1 +
- gi/pygi-argument.c	       |   60 +++++++++--------
- gi/pygi-argument.h	       |   60 ++++++++---------
- gi/pygi-cache.h	       |    6 +-
- gi/pygi-invoke-state-struct.h |   26 +++++++
- gi/pygi-invoke.c	       |  149
- +++++++++++++++++++++++++++++++----------
- gi/pygi-invoke.h	       |    2 +-
- gi/pygi-private.h	       |    1 +
+ gi/Makefile.am		       |   1 +
+ gi/pygi-argument.c	       |  60 +++++++++--------
+ gi/pygi-argument.h	       |  60 ++++++++---------
+ gi/pygi-cache.h	       |   6 +-
+ gi/pygi-invoke-state-struct.h |  26 ++++++++
+ gi/pygi-invoke.c	       | 149
+ ++++++++++++++++++++++++++++++++----------
+ gi/pygi-invoke.h	       |   2 +-
+ gi/pygi-private.h	       |   1 +
  8 files changed, 208 insertions(+), 97 deletions(-)
 
 commit f32b1f494aa5d09b9b198f607722c819c6bbd808
@@ -12498,11 +14544,11 @@ Date:	Sun Jan 9 19:37:55 2011 -0500
     * caching stage is hooked up but not used yet
     * throws exceptions for everything that can not be cached yet
 
- gi/pygi-cache.c  |   59
- ++++++++++++++++++++++++++++++++++++++++++------------
- gi/pygi-info.c   |    3 +++
- gi/pygi-invoke.c |    5 +++++
- gi/pygi.h	  |    2 ++
+ gi/pygi-cache.c  | 59
+ +++++++++++++++++++++++++++++++++++++++++++-------------
+ gi/pygi-info.c   |  3 +++
+ gi/pygi-invoke.c |  5 +++++
+ gi/pygi.h	  |  2 ++
  4 files changed, 56 insertions(+), 13 deletions(-)
 
 commit c2bf1d4d9cf2e9f8e313528fe717f6279dad5da1
@@ -12511,7 +14557,7 @@ Date:	Sun Jan 9 18:05:31 2011 -0500
 
     [gi] fix some function names
 
- gi/pygi-cache.c |    5 ++---
+ gi/pygi-cache.c | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
 
 commit 2ec4230a5180f048c26c2e4234b2a098d42f030b
@@ -12520,10 +14566,10 @@ Date:	Sun Jan 9 15:58:06 2011 -0500
 
     [gi] refactor cache structs so they inherit from ArgCache
 
- gi/pygi-argument.c |  122 ++++++++++---------
- gi/pygi-cache.c    |  344
- ++++++++++++++++++++++++++++------------------------
- gi/pygi-cache.h    |	50 ++++----
+ gi/pygi-argument.c | 122 +++++++++----------
+ gi/pygi-cache.c    | 344
+ +++++++++++++++++++++++++++++------------------------
+ gi/pygi-cache.h    |  50 ++++----
  3 files changed, 273 insertions(+), 243 deletions(-)
 
 commit f4cdf0c0321285da015686fcb7115bd91bfd5c7c
@@ -12533,13 +14579,13 @@ Date:	Sat Jan 8 20:45:11 2011 -0500
     [gi]fix cache compile error - now compiles but cache still not
     hooked up
 
- gi/Makefile.am     |	 2 +
- gi/pygi-argument.c |  100 +++++++++++++++---------------
- gi/pygi-argument.h |  174
- +++++++++++++++++++++++++++++++++++++++++++---------
- gi/pygi-cache.c    |  169
- +++++++++++++++++++++++++-------------------------
- gi/pygi-cache.h    |	25 ++++----
+ gi/Makefile.am     |	2 +
+ gi/pygi-argument.c | 100 +++++++++++++++---------------
+ gi/pygi-argument.h | 174
+ ++++++++++++++++++++++++++++++++++++++++++++---------
+ gi/pygi-cache.c    | 169
+ +++++++++++++++++++++++++--------------------------
+ gi/pygi-cache.h    |  25 ++++----
  5 files changed, 293 insertions(+), 177 deletions(-)
 
 commit 5f8f3044dd8085b2e8ce0bf70e9d52f05abf909d
@@ -12553,10 +14599,10 @@ Date:	Sat Jan 8 19:10:29 2011 -0500
       for geneating marshalling caches for container items, not just
       arguments
 
- gi/pygi-argument.c |	76 ++++++++++++++++-
- gi/pygi-cache.c    |  242
- ++++++++++++++++++++++------------------------------
- gi/pygi-cache.h    |	 4 +-
+ gi/pygi-argument.c |  76 ++++++++++++++++-
+ gi/pygi-cache.c    | 242
+ ++++++++++++++++++++++-------------------------------
+ gi/pygi-cache.h    |	4 +-
  3 files changed, 175 insertions(+), 147 deletions(-)
 
 commit 202a268db7f98f5a3c525c6e65ec4bff1917257e
@@ -12567,7 +14613,7 @@ Date:	Sat Jan 8 02:19:52 2011 +0000
 
     Needed for G_TYPE_CONVERTER_FLAGS and others.
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit c3aa36151fdef9ed9884d93114786bbe86387983
@@ -12576,7 +14622,7 @@ Date:	Fri Jan 7 12:58:11 2011 +0100
 
     Add test for incorrect attributes in Gdk.Event
 
- tests/test_overrides.py |    4 ++++
+ tests/test_overrides.py | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 204b45c7e95eb50d9e3843127fb10e13b1b17fee
@@ -12599,7 +14645,7 @@ Date:	Sun Jan 2 19:25:55 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=638523
 
- gi/overrides/Gdk.py |	  2 +-
+ gi/overrides/Gdk.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 6cf298ca5565d0eb99824f050ff47407e50a5c01
@@ -12610,7 +14656,7 @@ Date:	Fri Jan 7 09:08:31 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=638847
 
- gi/pygi-closure.c |	3 +++
+ gi/pygi-closure.c | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 1be76d5e006efa24598ff7bf26153660dbe0a890
@@ -12621,7 +14667,7 @@ Date:	Fri Jan 7 09:07:35 2011 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=638847
 
- gi/pygi-argument.c |	 1 +
+ gi/pygi-argument.c | 1 +
  1 file changed, 1 insertion(+)
 
 commit 43849c51391fc9cd239697065c3d40fa02fb6783
@@ -12630,8 +14676,8 @@ Date:	Thu Jan 6 17:30:14 2011 -0500
 
     whitespace fixes
 
- gi/pygi-cache.c |   24 ++++++++++++------------
- gi/pygi-cache.h |   42 +++++++++++++++++++++---------------------
+ gi/pygi-cache.c | 24 ++++++++++++------------
+ gi/pygi-cache.h | 42 +++++++++++++++++++++---------------------
  2 files changed, 33 insertions(+), 33 deletions(-)
 
 commit 8b5b3d2bbbbdf5d26c83e9a6fe67121cbd77ebe1
@@ -12642,11 +14688,11 @@ Date:	Thu Jan 6 17:29:00 2011 -0500
 
     * still doesn't compile
 
- gi/pygi-argument.c |  708
- ++++++++++++++++++++++++++++++++++++++++++++++++++++
- gi/pygi-argument.h |	35 ++-
- gi/pygi-cache.c    |	82 ++++--
- gi/pygi-cache.h    |	41 ++-
+ gi/pygi-argument.c | 708
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ gi/pygi-argument.h |  35 ++-
+ gi/pygi-cache.c    |  82 +++++--
+ gi/pygi-cache.h    |  41 +++-
  4 files changed, 832 insertions(+), 34 deletions(-)
 
 commit f554cf62848104d31518138ae85bc51acaafda67
@@ -12658,9 +14704,9 @@ Date:	Tue Jan 4 18:49:53 2011 -0500
     * this does not compile and is not hooked up to the build system
     * lays out the caching data structures and some skeleton functions
 
- gi/pygi-cache.c |  480
- +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- gi/pygi-cache.h |  104 ++++++++++++
+ gi/pygi-cache.c | 480
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ gi/pygi-cache.h | 104 ++++++++++++
  2 files changed, 584 insertions(+)
 
 commit 8d5a7857876669f56bb03bf618bcfdcc290721c0
@@ -12671,8 +14717,8 @@ Date:	Wed Dec 22 12:34:10 2010 -0800
 
     https://bugzilla.gnome.org/show_bug.cgi?id=637832
 
- gi/pygi-closure.c |   66
- +++++++++++++++++++++++++++++++++++++++++++++--------
+ gi/pygi-closure.c | 66
+ ++++++++++++++++++++++++++++++++++++++++++++++---------
  1 file changed, 56 insertions(+), 10 deletions(-)
 
 commit f14976ffabec28f6cafe1e37dc81d207a947d4ca
@@ -12681,7 +14727,7 @@ Date:	Tue Dec 28 18:34:25 2010 +0100
 
     Fix stupid name clash
 
- gi/module.py |    7 +++++--
+ gi/module.py | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 commit 01b2a193d403beb861eab524300b4f1af63157ce
@@ -12690,7 +14736,7 @@ Date:	Tue Dec 28 13:49:18 2010 +0100
 
     Add /usr/share to XDG_DATA_DIRS when running the tests
 
- tests/Makefile.am |	7 ++++++-
+ tests/Makefile.am | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 commit efc186f692f9eac781cc47456be74a3da7f14dcd
@@ -12699,7 +14745,7 @@ Date:	Tue Dec 28 13:25:34 2010 +0100
 
     Comment out tests that require SRV lookups
 
- tests/test_gresolver.py |    5 ++++-
+ tests/test_gresolver.py | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit d2462cc1ab51d76fb4625c47c3d34de1d5d0dee8
@@ -12708,9 +14754,9 @@ Date:	Tue Dec 28 13:00:16 2010 +0100
 
     Use suppresion file when running valgrind
 
- tests/Makefile.am |	2 +-
- tests/python.supp |  387
- +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ tests/Makefile.am |   2 +-
+ tests/python.supp | 387
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 388 insertions(+), 1 deletion(-)
 
 commit 0ee58113ecbea72784c52de928c041fc8fc88984
@@ -12719,12 +14765,12 @@ Date:	Thu Dec 23 00:10:41 2010 +0100
 
     Fix warnings.
 
- gi/pygi-argument.c	     |	 16 +++++++---------
- gi/pygi-foreign-cairo.c     |	 13 ++-----------
- gio/gfile.override	     |	  5 ++---
- glib/pyglib-python-compat.h |	  3 +++
- glib/pyglib.c		     |	  2 +-
- glib/pygmainloop.c	     |	  3 ++-
+ gi/pygi-argument.c	     | 16 +++++++---------
+ gi/pygi-foreign-cairo.c     | 13 ++-----------
+ gio/gfile.override	     |	5 ++---
+ glib/pyglib-python-compat.h |	3 +++
+ glib/pyglib.c		     |	2 +-
+ glib/pygmainloop.c	     |	3 ++-
  6 files changed, 17 insertions(+), 25 deletions(-)
 
 commit 78ea84cd91392400ebac5a361ef8793bfe928fd0
@@ -12735,8 +14781,8 @@ Date:	Sun Dec 19 23:10:57 2010 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=637615
 
- gi/overrides/Gtk.py	 |   12 ++++++------
- tests/test_overrides.py |    6 ++++++
+ gi/overrides/Gtk.py	 | 12 ++++++------
+ tests/test_overrides.py |  6 ++++++
  2 files changed, 12 insertions(+), 6 deletions(-)
 
 commit 046cc5915286e042d1040271a90676b77632409e
@@ -12755,8 +14801,8 @@ Date:	Thu Dec 16 15:41:10 2010 -0500
 
     https://bugzilla.gnome.org/show_bug.cgi?id=620579
 
- gobject/pygtype.c	  |   35 ++++++++++++++++++++++++++---------
- tests/test_properties.py |   16 ++++++++++++++++
+ gobject/pygtype.c	  | 35 ++++++++++++++++++++++++++---------
+ tests/test_properties.py | 16 ++++++++++++++++
  2 files changed, 42 insertions(+), 9 deletions(-)
 
 commit 7aa783d5cd674f34da318f826bd5f4a0e09d24cb
@@ -12766,7 +14812,7 @@ Date:	Tue Dec 14 12:29:54 2010 +0100
     dsextras.py: check if gcc is there when platform is win32 and compiler
     is mingw32
 
- dsextras.py |	  6 ++++++
+ dsextras.py | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit cebf5f09a6c5018ced64f35e7747fc81b93b823e
@@ -12775,7 +14821,7 @@ Date:	Tue Dec 14 12:29:01 2010 +0100
 
     dsextras.py: be consistent in how distutils imports are done
 
- dsextras.py |	  6 +++---
+ dsextras.py | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 35e590d48c78f2e76c47c2b4eaf0f7e8d1ed5c93
@@ -12784,7 +14830,7 @@ Date:	Tue Dec 14 12:25:07 2010 +0100
 
     dsextras.py: add have_gcc() function
 
- dsextras.py |	  5 +++++
+ dsextras.py | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 637c2c287cfb0e89365026531c651111f5593ac7
@@ -12793,7 +14839,7 @@ Date:	Tue Dec 14 12:24:41 2010 +0100
 
     dsextras.py: use distutils.spawn.find_executable for have_pkgconfig()
 
- dsextras.py |	  8 ++------
+ dsextras.py | 8 ++------
  1 file changed, 2 insertions(+), 6 deletions(-)
 
 commit 020d00bc0ce7b77006b4d4f42d63122d79bcbf89
@@ -12802,7 +14848,7 @@ Date:	Tue Dec 14 12:22:54 2010 +0100
 
     setup.py: fix another case of use True/False instead of 1/0
 
- setup.py |    2 +-
+ setup.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit b03cc9e0d66d8caea3cd6a63db198c43de9267e9
@@ -12811,7 +14857,7 @@ Date:	Mon Dec 13 10:21:52 2010 +0100
 
     pygi-convert.sh: improve GtkSourceView conversion
 
- pygi-convert.sh |    7 +++++++
+ pygi-convert.sh | 7 +++++++
  1 file changed, 7 insertions(+)
 
 commit fbc12cd7c09a67de9e28b7b0b28de9dc0e0e3418
@@ -12820,7 +14866,7 @@ Date:	Mon Dec 13 10:27:56 2010 +0100
 
     pygi-convert.sh: Gtk.DialogFlags conversion
 
- pygi-convert.sh |    1 +
+ pygi-convert.sh | 1 +
  1 file changed, 1 insertion(+)
 
 commit 73e933d2429aea4d14e15350a538da1c5c3f71eb
@@ -12837,7 +14883,7 @@ Date:	Sun Dec 12 20:38:46 2010 -0500
 	Thanks to Krzesimir Nowak for suggesting this in a gtksourceviewmm
 	recent commit.
 
- codegen/docextract_to_xml.py |    2 +-
+ codegen/docextract_to_xml.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit db7ffa75b007074cb6b33b547c6d8140da300a3e
@@ -12846,7 +14892,7 @@ Date:	Mon Dec 13 00:17:26 2010 +0100
 
     pygi-convert.sh: add more Gtk conversions and sort
 
- pygi-convert.sh |   50 ++++++++++++++++++++++++++------------------------
+ pygi-convert.sh | 50 ++++++++++++++++++++++++++------------------------
  1 file changed, 26 insertions(+), 24 deletions(-)
 
 commit f4bfe73d0ccedf7f671d3acd6d9e262d5383b733
@@ -12855,7 +14901,7 @@ Date:	Mon Dec 13 00:01:40 2010 +0100
 
     pygi-convert.sh: convert Atk
 
- pygi-convert.sh |   12 ++++++++++++
+ pygi-convert.sh | 12 ++++++++++++
  1 file changed, 12 insertions(+)
 
 commit e55ce3667eb1d352bf96f265bf018ffe8aea75f9
@@ -12864,7 +14910,7 @@ Date:	Sun Dec 12 23:48:48 2010 +0100
 
     pygi-convert.sh: convert a few more Gio types
 
- pygi-convert.sh |    9 +++++++++
+ pygi-convert.sh | 9 +++++++++
  1 file changed, 9 insertions(+)
 
 commit acc9f84bc6e13d76c6516cefe393d4a4f868aa24
@@ -12873,7 +14919,7 @@ Date:	Sun Dec 12 14:19:00 2010 +0100
 
     pygi-convert.sh: more GLib conversion
 
- pygi-convert.sh |    7 +++++++
+ pygi-convert.sh | 7 +++++++
  1 file changed, 7 insertions(+)
 
 commit c903390814bebdc62d530472f6f94feecc59b8b3
@@ -12882,7 +14928,7 @@ Date:	Sun Dec 12 14:00:34 2010 +0100
 
     pygi-convert.sh: remove two cases handled by overrides
 
- pygi-convert.sh |    2 --
+ pygi-convert.sh | 2 --
  1 file changed, 2 deletions(-)
 
 commit d33c987e505ec8ddffa2b8cb5526f05b9b5f62be
@@ -12891,8 +14937,8 @@ Date:	Sun Dec 12 13:38:56 2010 +0100
 
     Override Gtk.ScrolledWindow constructor
 
- gi/overrides/Gtk.py	 |    7 +++++++
- tests/test_overrides.py |    7 +++++++
+ gi/overrides/Gtk.py	 | 7 +++++++
+ tests/test_overrides.py | 7 +++++++
  2 files changed, 14 insertions(+)
 
 commit 1c24bb089fcd69e3104ae72a0e7560a8c5a3f05b
@@ -12901,7 +14947,7 @@ Date:	Sun Dec 12 12:32:39 2010 +0100
 
     pygi-convert.sh: Fix 'find' syntax
 
- pygi-convert.sh |    2 +-
+ pygi-convert.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f0a1d6b6bb53d0fa2788d8b9027d737b0aef8dfc
@@ -12910,7 +14956,7 @@ Date:	Sun Dec 12 12:29:38 2010 +0100
 
     pygi-convert.sh: start handling Gio and GLib
 
- pygi-convert.sh |    8 ++++++++
+ pygi-convert.sh | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 commit 365bf3251af3498dc797a58cce071805451b49b1
@@ -12919,7 +14965,7 @@ Date:	Sat Dec 11 23:05:31 2010 +0100
 
     pygi-convert.sh: convert Gdk.ScrollDirection.
 
- pygi-convert.sh |    1 +
+ pygi-convert.sh | 1 +
  1 file changed, 1 insertion(+)
 
 commit bca603de0f217fb290189a0ea330f82961c46d5d
@@ -12932,8 +14978,8 @@ Date:	Sat Dec 11 15:03:21 2010 +0100
     not a
     gobject property so we need to jump through some oops.
 
- gi/overrides/Pango.py	 |   13 +++++++++++++
- tests/test_overrides.py |    6 ++++++
+ gi/overrides/Pango.py	 | 13 +++++++++++++
+ tests/test_overrides.py |  6 ++++++
  2 files changed, 19 insertions(+)
 
 commit df233301802e3f7f9ce338cde015ca2a2fc648ab
@@ -12944,7 +14990,7 @@ Date:	Sat Dec 11 14:18:53 2010 +0100
 
     It is now properly handled by an override.
 
- pygi-convert.sh |    1 -
+ pygi-convert.sh | 1 -
  1 file changed, 1 deletion(-)
 
 commit d8abcc9463542af9cd43d71849d0ad4c183b570b
@@ -12953,8 +14999,8 @@ Date:	Fri Dec 10 14:05:20 2010 +0100
 
     Override GtkAction and GtkRadioAction constructors.
 
- gi/overrides/Gtk.py	 |   20 +++++++++++++++++---
- tests/test_overrides.py |   18 ++++++++++++++++++
+ gi/overrides/Gtk.py	 | 20 +++++++++++++++++---
+ tests/test_overrides.py | 18 ++++++++++++++++++
  2 files changed, 35 insertions(+), 3 deletions(-)
 
 commit 7924b18a99a0680c04aca46be4b64a7aa507dfe5
@@ -12965,8 +15011,8 @@ Date:	Sat Dec 4 22:13:28 2010 +0000
 
     https://bugzilla.gnome.org/show_bug.cgi?id=636486
 
- gi/overrides/Gtk.py	 |    7 +++++++
- tests/test_overrides.py |    9 +++++++++
+ gi/overrides/Gtk.py	 | 7 +++++++
+ tests/test_overrides.py | 9 +++++++++
  2 files changed, 16 insertions(+)
 
 commit e76352dd83c8706e68ad57d00d185da9afea99c4
@@ -12975,8 +15021,8 @@ Date:	Thu Dec 9 13:23:10 2010 -0500
 
     add secondary_text apis to MessageDialog
 
- gi/overrides/Gtk.py	 |    8 ++++++++
- tests/test_overrides.py |    8 ++++++++
+ gi/overrides/Gtk.py	 | 8 ++++++++
+ tests/test_overrides.py | 8 ++++++++
  2 files changed, 16 insertions(+)
 
 commit de682b2d36c362140ab7d43c0743b01ec0865a74
@@ -12985,7 +15031,7 @@ Date:	Wed Dec 8 16:39:27 2010 -0500
 
     [gi] get rid of some debug prints and fix error messages
 
- gi/overrides/Gtk.py |	  7 +++----
+ gi/overrides/Gtk.py | 7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
 
 commit dbb16571803bf51f497768bf80944514f4290ee5
@@ -12994,7 +15040,7 @@ Date:	Wed Dec 8 18:25:15 2010 +0100
 
     Fix demo for override changes.
 
- demos/gtk-demo/gtk-demo.py |	 5 +++--
+ demos/gtk-demo/gtk-demo.py | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit 2adcd95762944a4e27123093d3c8d080e49be1ea
@@ -13003,11 +15049,10 @@ Date:	Wed Dec 8 18:06:01 2010 +0100
 
     Override Pango.FontDescription.
 
- demos/gtk-demo/gtk-demo.py |	 2 +-
- gi/overrides/Makefile.am   |	 1 +
- gi/overrides/Pango.py	    |	40
- ++++++++++++++++++++++++++++++++++++++++
- tests/test_overrides.py    |	 7 +++++++
+ demos/gtk-demo/gtk-demo.py |  2 +-
+ gi/overrides/Makefile.am   |  1 +
+ gi/overrides/Pango.py	    | 40 ++++++++++++++++++++++++++++++++++++++++
+ tests/test_overrides.py    |  7 +++++++
  4 files changed, 49 insertions(+), 1 deletion(-)
 
 commit 769da968c9187414d0420412d8fb8c833d12042a
@@ -13021,9 +15066,9 @@ Date:	Wed Dec 8 17:38:11 2010 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=619606
 
- gi/gimodule.c	  |    4 +++-
- gi/types.py	  |   12 ++----------
- tests/test_gi.py |   10 ----------
+ gi/gimodule.c	  |  4 +++-
+ gi/types.py	  | 12 ++----------
+ tests/test_gi.py | 10 ----------
  3 files changed, 5 insertions(+), 21 deletions(-)
 
 commit 167a01c46b3fa0b3c8339502c875d32bd2bca974
@@ -13032,7 +15077,7 @@ Date:	Wed Dec 8 17:37:00 2010 +0100
 
     Fix usage of TreeIter api that is now an override.
 
- demos/gtk-demo/gtk-demo.py |	 6 +++---
+ demos/gtk-demo/gtk-demo.py | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit d2cfd6e9250d40de7c715ac74e299deddf137683
@@ -13045,7 +15090,7 @@ Date:	Wed Dec 8 17:34:54 2010 +0100
     end up up with two 'label' in the kwds dict. Besides 'str' is a
     reserved keyword.
 
- gi/overrides/Gtk.py |	  4 ++--
+ gi/overrides/Gtk.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit c0c684c9bb4e2bc08d7cb6ac246705e8a3b77656
@@ -13054,7 +15099,7 @@ Date:	Wed Dec 8 14:16:39 2010 +0100
 
     Fix typo when raising an exception
 
- gi/types.py |	  2 +-
+ gi/types.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 88c9a3ad49d9fcf779c3523672d8bf4767910301
@@ -13063,7 +15108,7 @@ Date:	Wed Dec 8 10:46:27 2010 +0100
 
     pygi-convert.sh: Added more conversions
 
- pygi-convert.sh |   14 ++++++++++++++
+ pygi-convert.sh | 14 ++++++++++++++
  1 file changed, 14 insertions(+)
 
 commit 4d8d96326b2cac91e6d75e6601b92e202d1918ff
@@ -13072,8 +15117,8 @@ Date:	Tue Dec 7 20:39:15 2010 +0100
 
     Override LinkButton constructor to make 'uri' mandatory
 
- gi/overrides/Gtk.py	 |    7 +++++++
- tests/test_overrides.py |    6 ++++++
+ gi/overrides/Gtk.py	 | 7 +++++++
+ tests/test_overrides.py | 6 ++++++
  2 files changed, 13 insertions(+)
 
 commit f4f7fb35af1b41598dc050f5df155a01c370a920
@@ -13082,8 +15127,8 @@ Date:	Sat Dec 4 19:19:19 2010 +0600
 
     Container should be iterable.
 
- gi/overrides/Gtk.py	 |    9 +++++++++
- tests/test_overrides.py |    6 +++++-
+ gi/overrides/Gtk.py	 | 9 +++++++++
+ tests/test_overrides.py | 6 +++++-
  2 files changed, 14 insertions(+), 1 deletion(-)
 
 commit d2ad05d6d8d53b941e0ad33fcb200f1245a2d308
@@ -13092,7 +15137,7 @@ Date:	Tue Dec 7 14:13:00 2010 +0100
 
     No need to import Gdk
 
- gi/overrides/Gtk.py |	  1 -
+ gi/overrides/Gtk.py | 1 -
  1 file changed, 1 deletion(-)
 
 commit b6a40badf0b2b59e690ce818efb03c7c816b8a04
@@ -13101,7 +15146,7 @@ Date:	Tue Dec 7 14:07:53 2010 +0100
 
     Remove semicolumns
 
- gi/overrides/Gtk.py |	  7 +++----
+ gi/overrides/Gtk.py | 7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
 
 commit cdc9c26553bf47ea488676e7bdc5f8ab0a2c906b
@@ -13111,7 +15156,7 @@ Date:	Mon Dec 6 16:05:30 2010 -0500
     [gi] make sure Gtk.Button override passes all keywords to parent
     constructor
 
- gi/overrides/Gtk.py |	  4 ++--
+ gi/overrides/Gtk.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit cede81ad65db017e95543d8d35715751aa202fed
@@ -13120,7 +15165,7 @@ Date:	Sun Dec 5 13:31:20 2010 +0100
 
     Fix cut&paste error in the Label override
 
- gi/overrides/Gtk.py |	  2 +-
+ gi/overrides/Gtk.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 607c59b74ebbc1e39cb4121c870b689e1888c106
@@ -13129,7 +15174,7 @@ Date:	Sat Dec 4 16:03:27 2010 +0100
 
     pygi-convert.sh: handle TextWindowType
 
- pygi-convert.sh |    1 +
+ pygi-convert.sh | 1 +
  1 file changed, 1 insertion(+)
 
 commit dfeabe0b68938e27da2e65903983b5113dc422f1
@@ -13138,8 +15183,8 @@ Date:	Sat Dec 4 15:49:15 2010 +0100
 
     Override Label constructor to behave like pygtk
 
- gi/overrides/Gtk.py	 |    7 +++++++
- tests/test_overrides.py |    4 ++++
+ gi/overrides/Gtk.py	 | 7 +++++++
+ tests/test_overrides.py | 4 ++++
  2 files changed, 11 insertions(+)
 
 commit da4e045e5abbed2796cc4ed39df35a0dde2de31b
@@ -13148,8 +15193,8 @@ Date:	Sat Dec 4 15:40:35 2010 +0100
 
     Override GtkTable constructor to behave like pygtk
 
- gi/overrides/Gtk.py	 |    7 +++++++
- tests/test_overrides.py |   12 ++++++++++++
+ gi/overrides/Gtk.py	 |  7 +++++++
+ tests/test_overrides.py | 12 ++++++++++++
  2 files changed, 19 insertions(+)
 
 commit 81452c23ab1befa59ff375692e582791432796a5
@@ -13158,7 +15203,7 @@ Date:	Sat Dec 4 12:59:43 2010 +0100
 
     pygi-convert.sh: convert MovementStep
 
- pygi-convert.sh |    1 +
+ pygi-convert.sh | 1 +
  1 file changed, 1 insertion(+)
 
 commit 4d097eea94258eda0c328711491fd456cbd6741b
@@ -13171,7 +15216,7 @@ Date:	Sat Dec 4 11:57:02 2010 +0100
     point we
     shuld just clean up the old stuff.
 
- gi/overrides/Gdk.py |	 22 ++++++++++++++++------
+ gi/overrides/Gdk.py | 22 ++++++++++++++++------
  1 file changed, 16 insertions(+), 6 deletions(-)
 
 commit cda317195566711d66190145b545e26ed7226172
@@ -13189,8 +15234,8 @@ Date:	Thu Dec 2 23:47:40 2010 -0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=636336
 
- gi/overrides/Gtk.py	  |    5 ++++-
- gi/overrides/__init__.py |   27 +++++++++++++++++++++++++--
+ gi/overrides/Gtk.py	  |  5 ++++-
+ gi/overrides/__init__.py | 27 +++++++++++++++++++++++++--
  2 files changed, 29 insertions(+), 3 deletions(-)
 
 commit 82689cbf53d92b1b951a459fe3de0e1d3a91791a
@@ -13215,8 +15260,8 @@ Date:	Thu Dec 2 16:27:04 2010 -0500
 
     https://bugzilla.gnome.org/show_bug.cgi?id=635172
 
- gi/overrides/Gtk.py	 |   38 ++++++++++++++++++++++++++++++++++++--
- tests/test_overrides.py |    8 +++++++-
+ gi/overrides/Gtk.py	 | 38 ++++++++++++++++++++++++++++++++++++--
+ tests/test_overrides.py |  8 +++++++-
  2 files changed, 43 insertions(+), 3 deletions(-)
 
 commit 677490e9402bad7b7c2a832345ef54f7f0c5fc7f
@@ -13227,8 +15272,8 @@ Date:	Fri Dec 3 23:39:50 2010 +0100
 
     The "path" argument may also be a string or a tuple
 
- gi/overrides/Gtk.py	 |   10 ++++++++++
- tests/test_overrides.py |   29 +++++++++++++++++++++++++++++
+ gi/overrides/Gtk.py	 | 10 ++++++++++
+ tests/test_overrides.py | 29 +++++++++++++++++++++++++++++
  2 files changed, 39 insertions(+)
 
 commit dacfe618fa244445c979f1a5efa80c1f9a5a4ae9
@@ -13241,8 +15286,8 @@ Date:	Fri Dec 3 23:29:00 2010 +0100
     override __new__ and it will be useful for all the api that take a
     TreePath or a string or a tuple.
 
- gi/overrides/Gtk.py	 |   33 +++++++++++++++------------------
- tests/test_overrides.py |   18 ++++++++++++++++++
+ gi/overrides/Gtk.py	 | 33 +++++++++++++++------------------
+ tests/test_overrides.py | 18 ++++++++++++++++++
  2 files changed, 33 insertions(+), 18 deletions(-)
 
 commit 7a8af9e220ee48aa28f6b025c5dae324b14fe128
@@ -13251,8 +15296,8 @@ Date:	Sun Nov 28 13:02:30 2010 +0100
 
     Override Container to behave like a sequence
 
- gi/overrides/Gtk.py	 |    6 ++++++
- tests/test_overrides.py |   11 +++++++++++
+ gi/overrides/Gtk.py	 |  6 ++++++
+ tests/test_overrides.py | 11 +++++++++++
  2 files changed, 17 insertions(+)
 
 commit 94e8befc935d4a6c7f766e34195e10fc3fb3b93a
@@ -13265,8 +15310,7 @@ Date:	Tue Nov 30 16:57:05 2010 -0500
     * this patch does the recursion using the previous patche's support
     functions
 
- gi/types.py |	 55
- +++++++++++++++++++++++++++++++++++++++++++++----------
+ gi/types.py | 55 +++++++++++++++++++++++++++++++++++++++++++++----------
  1 file changed, 45 insertions(+), 10 deletions(-)
 
 commit 9c5aee4f06f92457f9ae987656c0c469f76d0ee8
@@ -13279,9 +15323,9 @@ Date:	Thu Jul 22 23:19:51 2010 +1000
 
     https://bugzilla.gnome.org/show_bug.cgi?id=625033
 
- gi/gimodule.c	  |  130
- +++++++++++++++++++++++++++++++++++++++---------------
- tests/test_gi.py |   37 ++++++++++++++++
+ gi/gimodule.c	  | 130
+ ++++++++++++++++++++++++++++++++++++++++---------------
+ tests/test_gi.py |  37 ++++++++++++++++
  2 files changed, 131 insertions(+), 36 deletions(-)
 
 commit 78358e1ab54d02317f397276adee03ecb2187588
@@ -13290,8 +15334,8 @@ Date:	Mon Nov 29 18:29:57 2010 -0500
 
     add a profiling torture test for when we fix up invoke
 
- tests/test_everything.py |   67
- ++++++++++++++++++++++++++++++++++++++++++++++
+ tests/test_everything.py | 67
+ ++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 67 insertions(+)
 
 commit 792e679c06df4357843fd310c7953a931172fc99
@@ -13311,13 +15355,13 @@ Date:	Mon Nov 29 16:41:38 2010 -0500
     out if it
       causes any issues with legacy modules and code
 
- gi/Makefile.am		   |	2 +-
- gi/overrides/Makefile.am  |	2 +-
- gi/repository/Makefile.am |	2 +-
- glib/Makefile.am	   |	2 +-
- gobject/Makefile.am	   |	2 +-
- tests/test_gi.py	   |	2 --
- tests/test_overrides.py   |	3 ---
+ gi/Makefile.am		   | 2 +-
+ gi/overrides/Makefile.am  | 2 +-
+ gi/repository/Makefile.am | 2 +-
+ glib/Makefile.am	   | 2 +-
+ gobject/Makefile.am	   | 2 +-
+ tests/test_gi.py	   | 2 --
+ tests/test_overrides.py   | 3 ---
  7 files changed, 5 insertions(+), 10 deletions(-)
 
 commit c587e1ace7429195ac6fd4db03d2f33e2af09838
@@ -13326,7 +15370,7 @@ Date:	Mon Nov 29 15:11:46 2010 -0500
 
     add test for inout argument count
 
- tests/test_gi.py |    1 +
+ tests/test_gi.py | 1 +
  1 file changed, 1 insertion(+)
 
 commit 5de88b4bcffdafcf8c7c20033cdf95dc690199ce
@@ -13337,8 +15381,8 @@ Date:	Mon Nov 22 19:17:23 2010 -0500
 
     https://bugzilla.gnome.org/show_bug.cgi?id=623615
 
- gi/pygi-argument.c	  |   27 ++++++++++++++++++++++++++-
- tests/test_everything.py |   17 +++++++++++++++--
+ gi/pygi-argument.c	  | 27 ++++++++++++++++++++++++++-
+ tests/test_everything.py | 17 +++++++++++++++--
  2 files changed, 41 insertions(+), 3 deletions(-)
 
 commit f129b3db2c78d3cce3614993fdd1619fb9eb9c79
@@ -13349,10 +15393,10 @@ Date:	Sun Nov 21 12:16:53 2010 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=623615
 
- gi/pygi-argument.c	  |   60
- ++++++++++++++++++++++++++++++++++++++++++++++
- gi/pygi-info.c		  |    5 ++++
- tests/test_everything.py |    5 ++++
+ gi/pygi-argument.c	  | 60
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ gi/pygi-info.c		  |  5 ++++
+ tests/test_everything.py |  5 ++++
  3 files changed, 70 insertions(+)
 
 commit fd2c0288eb67823fca1265348a27a9f8f147ae50
@@ -13361,7 +15405,7 @@ Date:	Sat Nov 27 23:01:42 2010 +0100
 
     pygi-convert.sh: gtk.accel_map -> Gtk.AccelMap._
 
- pygi-convert.sh |    1 +
+ pygi-convert.sh | 1 +
  1 file changed, 1 insertion(+)
 
 commit 13d0ff1d9c129bb458e234b630ebe920b50e2e0f
@@ -13370,7 +15414,7 @@ Date:	Sat Nov 27 22:34:13 2010 +0100
 
     pygi-convert.sh: handle "from gtk import gdk"
 
- pygi-convert.sh |    2 ++
+ pygi-convert.sh | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 63a97634031c3d159ad77fdaa1f6341d7656eb07
@@ -13379,7 +15423,7 @@ Date:	Sat Nov 27 22:23:24 2010 +0100
 
     pygi-convert.sh: add some Pango special cases
 
- pygi-convert.sh |    3 +++
+ pygi-convert.sh | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 57e42bf4230d1aa20a47e3b0df2e509602333892
@@ -13390,8 +15434,8 @@ Date:	Sat Nov 27 19:51:38 2010 +0100
 
     Make the tag argument optional.
 
- gi/overrides/Gtk.py	 |    9 +++++++++
- tests/test_overrides.py |   17 +++++++++++++++++
+ gi/overrides/Gtk.py	 |  9 +++++++++
+ tests/test_overrides.py | 17 +++++++++++++++++
  2 files changed, 26 insertions(+)
 
 commit 828b698e47ee819a60d24a772a3cc51ff9cd6601
@@ -13400,8 +15444,8 @@ Date:	Sat Nov 27 19:32:48 2010 +0100
 
     Override TextBuffer.set_text() to make length optional
 
- gi/overrides/Gtk.py	 |    3 +++
- tests/test_overrides.py |   11 ++++++++++-
+ gi/overrides/Gtk.py	 |  3 +++
+ tests/test_overrides.py | 11 ++++++++++-
  2 files changed, 13 insertions(+), 1 deletion(-)
 
 commit bf55dc862755a57bb1b998702d284fc460e88a30
@@ -13412,8 +15456,8 @@ Date:	Sat Nov 27 16:46:40 2010 +0100
 
     Override create_mark to make the left_gravity argument optional
 
- gi/overrides/Gtk.py	 |    3 +++
- tests/test_overrides.py |    3 +++
+ gi/overrides/Gtk.py	 | 3 +++
+ tests/test_overrides.py | 3 +++
  2 files changed, 6 insertions(+)
 
 commit 94c0e2f71636d055bdebe3ec378f3d339eea66c9
@@ -13424,8 +15468,8 @@ Date:	Sat Nov 27 16:10:33 2010 +0100
 
     Fix the override and add unit test
 
- gi/overrides/Gtk.py	 |    8 +++++---
- tests/test_overrides.py |    7 +++++++
+ gi/overrides/Gtk.py	 | 8 +++++---
+ tests/test_overrides.py | 7 +++++++
  2 files changed, 12 insertions(+), 3 deletions(-)
 
 commit 0cd717e3926276540b9145e58a4a3368136b00de
@@ -13435,7 +15479,7 @@ Date:	Mon Nov 22 18:35:09 2010 -0500
     [gi] fix ActionGroup constructor to allow other keyword properties
     to be set
 
- gi/overrides/Gtk.py |	  4 ++--
+ gi/overrides/Gtk.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 226777cdb70fc72d206664ffd8b6737f7239d23f
@@ -13444,8 +15488,8 @@ Date:	Mon Nov 22 18:32:28 2010 -0500
 
     [gi] require the name parameter when creatin a Gtk.ActionGroup
 
- gi/overrides/Gtk.py	 |    3 +++
- tests/test_overrides.py |    2 ++
+ gi/overrides/Gtk.py	 | 3 +++
+ tests/test_overrides.py | 2 ++
  2 files changed, 5 insertions(+)
 
 commit d0049fa9982d13b3553b05569fb0a227e48b6647
@@ -13456,8 +15500,8 @@ Date:	Sun Nov 21 15:20:58 2010 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=635437
 
- gi/overrides/Gtk.py	 |    3 +++
- tests/test_overrides.py |   34 +++++++++++++++++++++-------------
+ gi/overrides/Gtk.py	 |  3 +++
+ tests/test_overrides.py | 34 +++++++++++++++++++++-------------
  2 files changed, 24 insertions(+), 13 deletions(-)
 
 commit e1db544e46aeed984133896af34b671a6a5547df
@@ -13468,8 +15512,8 @@ Date:	Sun Nov 21 23:03:25 2010 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=635466
 
- gi/overrides/Gtk.py	 |   15 +++++++++++++++
- tests/test_overrides.py |    6 ++++++
+ gi/overrides/Gtk.py	 | 15 +++++++++++++++
+ tests/test_overrides.py |  6 ++++++
  2 files changed, 21 insertions(+)
 
 commit a5e806ad8a8b279402ff7adb1c1cdc04f9f3da76
@@ -13480,7 +15524,7 @@ Date:	Sun Nov 21 21:57:40 2010 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=635464
 
- gi/overrides/Gtk.py |	  6 ++++++
+ gi/overrides/Gtk.py | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit 1c537bc67107948c92b51ba6ba749747e84263e2
@@ -13496,8 +15540,8 @@ Date:	Mon Nov 22 15:04:00 2010 -0500
     which
       should be accepted by pycairo for any API that takes a rect
 
- gi/pygi-foreign-cairo.c |   85
- +++++++++++++++++++++++++++++++++++------------
+ gi/pygi-foreign-cairo.c | 85
+ +++++++++++++++++++++++++++++++++++++------------
  1 file changed, 64 insertions(+), 21 deletions(-)
 
 commit 4cede8f12321bed6c3b71813a62c01b61853ba69
@@ -13508,8 +15552,8 @@ Date:	Fri Nov 19 16:46:53 2010 -0500
 
     https://bugzilla.gnome.org/show_bug.cgi?id=627367
 
- gi/overrides/Gdk.py |	  7 +++++++
- gi/overrides/Gtk.py |	 25 +++++++++++++++++++++++++
+ gi/overrides/Gdk.py |	7 +++++++
+ gi/overrides/Gtk.py | 25 +++++++++++++++++++++++++
  2 files changed, 32 insertions(+)
 
 commit 3fd51bb903724b752f72f49c7cb35652b819791d
@@ -13523,9 +15567,9 @@ Date:	Fri Nov 19 16:44:32 2010 -0500
 
     https://bugzilla.gnome.org/show_bug.cgi?id=627367
 
- gi/pygi-argument.c |	65
- ++++++++++++++++++++++++++++++++++++++++++----------
- tests/test_gi.py   |	 6 +++--
+ gi/pygi-argument.c | 65
+ ++++++++++++++++++++++++++++++++++++++++++++----------
+ tests/test_gi.py   |  6 +++--
  2 files changed, 57 insertions(+), 14 deletions(-)
 
 commit 7ddb0f7fd8b1b9e8f691c6d42a83cb16c6561d26
@@ -13534,7 +15578,7 @@ Date:	Fri Nov 19 18:19:38 2010 +0100
 
     pygi-convert.sh: Add pynotify -> Notify
 
- pygi-convert.sh |    3 +++
+ pygi-convert.sh | 3 +++
  1 file changed, 3 insertions(+)
 
 commit bf03d4db03a7739ac16ddc4e614441557ede554d
@@ -13554,7 +15598,7 @@ Date:	Fri Nov 19 09:08:07 2010 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=635244
 
- pygi-convert.sh |   25 +++++--------------------
+ pygi-convert.sh | 25 +++++--------------------
  1 file changed, 5 insertions(+), 20 deletions(-)
 
 commit 18f5d229d3a4b9520c1c456be2635c8e36015c12
@@ -13565,7 +15609,7 @@ Date:	Fri Nov 19 09:00:35 2010 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=635244
 
- pygi-convert.sh |    2 ++
+ pygi-convert.sh | 2 ++
  1 file changed, 2 insertions(+)
 
 commit ef74273c2043944708515e59a654ebe4944b46ff
@@ -13578,7 +15622,7 @@ Date:	Thu Nov 18 13:54:48 2010 -0500
     were entered
       since they reside in an unordered hash internally
 
- tests/test_overrides.py |    9 +++++----
+ tests/test_overrides.py | 9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)
 
 commit 2c25886bf6710568d0646f82dce4770faa44c40d
@@ -13590,9 +15634,9 @@ Date:	Wed Nov 17 14:38:09 2010 -0500
 
     https://bugzilla.gnome.org/show_bug.cgi?id=620579
 
- gi/pygi-argument.c	     |	 14 ++++++++++++--
- glib/pyglib-python-compat.h |	  5 +++++
- tests/test_gi.py	     |	  3 +++
+ gi/pygi-argument.c	     | 14 ++++++++++++--
+ glib/pyglib-python-compat.h |	5 +++++
+ tests/test_gi.py	     |	3 +++
  3 files changed, 20 insertions(+), 2 deletions(-)
 
 commit 8c2d32c8205b971b4353e3d5d2ed1efa6ef0e06c
@@ -13607,7 +15651,7 @@ Date:	Fri Nov 12 10:20:32 2010 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=634671
 
- gi/pygi-invoke.c |   25 ++++++++++++++-----------
+ gi/pygi-invoke.c | 25 ++++++++++++++-----------
  1 file changed, 14 insertions(+), 11 deletions(-)
 
 commit d9bab3b185bb59bd29e3c3f6225f3636f58ec45e
@@ -13616,8 +15660,8 @@ Date:	Wed Nov 10 14:11:56 2010 -0500
 
     update news for release
 
- NEWS |   73
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ NEWS | 73
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 73 insertions(+)
 
 commit 1338a95339e21cc02b9df6d10166996c8b97a6bf
@@ -13628,7 +15672,7 @@ Date:	Tue Sep 28 13:44:13 2010 +1000
 
     https://bugzilla.gnome.org/show_bug.cgi?id=625033
 
- gi/pygi-info.c |   29 +++++++++++++++++++++++++++++
+ gi/pygi-info.c | 29 +++++++++++++++++++++++++++++
  1 file changed, 29 insertions(+)
 
 commit 9ce3edf69824935aeca9e676eaa9782786c22a97
@@ -13644,7 +15688,7 @@ Date:	Tue Nov 9 22:57:41 2010 -0500
     compile
       without the forign structs
 
- gi/pygi-foreign-cairo.c |    4 ++++
+ gi/pygi-foreign-cairo.c | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 68b8211d8b014cf26ca7e9ab751fb3f61f228290
@@ -13669,9 +15713,9 @@ Date:	Mon Oct 25 18:28:36 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=627545
 
- gi/pygi-foreign-cairo.c |   57
- +++++++++++++++++++++++++++++++++++++++++++++++
- gi/pygi-invoke.c	 |   15 +++++++++++--
+ gi/pygi-foreign-cairo.c | 57
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ gi/pygi-invoke.c	 | 15 +++++++++++--
  2 files changed, 70 insertions(+), 2 deletions(-)
 
 commit ce8b948310220288e9eef904eef4ec8f4e24a376
@@ -13680,8 +15724,8 @@ Date:	Tue Nov 9 22:11:51 2010 -0500
 
     [gi] add overrides to Gtk.Editable
 
- gi/overrides/Gtk.py	 |   17 +++++++++++++++++
- tests/test_overrides.py |   12 ++++++++++++
+ gi/overrides/Gtk.py	 | 17 +++++++++++++++++
+ tests/test_overrides.py | 12 ++++++++++++
  2 files changed, 29 insertions(+)
 
 commit 87dbc716f26cefc0e9427c3d6e8befe8eabd3d1e
@@ -13699,8 +15743,8 @@ Date:	Tue Nov 9 21:12:54 2010 -0500
     * this keeps the old way of checking vfuncs while adding the edge case
       where vfunc is named differently from their invoker
 
- gi/pygi-info.c |   16 ++++++++++++++++
- gi/types.py	|    2 +-
+ gi/pygi-info.c | 16 ++++++++++++++++
+ gi/types.py	|  2 +-
  2 files changed, 17 insertions(+), 1 deletion(-)
 
 commit 540e9f1f349ba3625e28b7673c92210eb8974098
@@ -13714,9 +15758,9 @@ Date:	Tue Nov 9 12:17:05 2010 -0500
 
     https://bugzilla.gnome.org/show_bug.cgi?id=634423
 
- gi/overrides/Gtk.py	 |   80
- ++++++++++++++++++++++++++++++++++++-----------
- tests/test_overrides.py |   53 ++++++++++++++++++++++++++++++-
+ gi/overrides/Gtk.py	 | 80
+ ++++++++++++++++++++++++++++++++++++++-----------
+ tests/test_overrides.py | 53 +++++++++++++++++++++++++++++++-
  2 files changed, 114 insertions(+), 19 deletions(-)
 
 commit 0bcb58b9541d9ae52e1d96e6239e9dbe0698872a
@@ -13726,7 +15770,7 @@ Date:	Fri Nov 5 13:56:12 2010 -0400
     fix dialogs overrides which were relying on broken inheritance
     behavior
 
- gi/overrides/Gtk.py |	 14 ++++++++++++--
+ gi/overrides/Gtk.py | 14 ++++++++++++--
  1 file changed, 12 insertions(+), 2 deletions(-)
 
 commit 89c104d17d79d7b935cd76101cba19d49390f7be
@@ -13750,14 +15794,14 @@ Date:	Thu Nov 4 12:00:14 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=633347
 
- gi/module.py			    |	12 +++++++++-
- gi/overrides/GIMarshallingTests.py |	 2 +-
- gi/overrides/Gdk.py		    |	 2 +-
- gi/overrides/Gtk.py		    |	 2 +-
- gi/overrides/__init__.py	    |	43
- ++++++++++++++++++++++++++++++++++++
- gi/types.py			    |	 8 -------
- tests/test_overrides.py	    |	27 ++++++++++++++++++++++
+ gi/module.py			    | 12 ++++++++++-
+ gi/overrides/GIMarshallingTests.py |  2 +-
+ gi/overrides/Gdk.py		    |  2 +-
+ gi/overrides/Gtk.py		    |  2 +-
+ gi/overrides/__init__.py	    | 43
+ ++++++++++++++++++++++++++++++++++++++
+ gi/types.py			    |  8 -------
+ tests/test_overrides.py	    | 27 ++++++++++++++++++++++++
  7 files changed, 84 insertions(+), 12 deletions(-)
 
 commit 878b8f630acd2146bee364054acd45cd33eea37a
@@ -13773,7 +15817,7 @@ Date:	Thu Nov 4 11:16:43 2010 +0100
 
     setup.py: ease maintenance burden for tests installation
 
- setup.py |   23 +++--------------------
+ setup.py | 23 +++--------------------
  1 file changed, 3 insertions(+), 20 deletions(-)
 
 commit cdacaa9572893796e0f3aa3730d0191911cb29ee
@@ -13782,8 +15826,8 @@ Date:	Wed Nov 3 09:51:09 2010 -0400
 
     fix inheritence issues in overrides
 
- gi/overrides/Gtk.py |	 79
- ++++++++++++++++++++++++++-------------------------
+ gi/overrides/Gtk.py | 79
+ +++++++++++++++++++++++++++--------------------------
  1 file changed, 40 insertions(+), 39 deletions(-)
 
 commit 3d5955767d81f45e796ab2af0707533375681774
@@ -13794,8 +15838,8 @@ Date:	Wed Nov 3 09:38:56 2010 +0100
 
     Signed-off-by: Dieter Verfaillie <dieterv@optionexplicit.be>
 
- tests/runtests-windows.py |   47
- +++++++++++++++++++++++++++++++++++++++++++++
+ tests/runtests-windows.py | 47
+ +++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 47 insertions(+)
 
 commit 8cb3f2e78161639c568110aad6a807dcf59f3ae8
@@ -13808,7 +15852,7 @@ Date:	Wed Nov 3 09:35:52 2010 +0100
 
     Signed-off-by: Dieter Verfaillie <dieterv@optionexplicit.be>
 
- pygobject_postinstall.py |   26 +++-----------------------
+ pygobject_postinstall.py | 26 +++-----------------------
  1 file changed, 3 insertions(+), 23 deletions(-)
 
 commit 63167574df53eb481cc11b6a097b2bfe7d5747f5
@@ -13819,7 +15863,7 @@ Date:	Wed Nov 3 09:34:38 2010 +0100
 
     Signed-off-by: Dieter Verfaillie <dieterv@optionexplicit.be>
 
- pygobject_postinstall.py |   35 +----------------------------------
+ pygobject_postinstall.py | 35 +----------------------------------
  1 file changed, 1 insertion(+), 34 deletions(-)
 
 commit f7b12611f94fd8c27fb67a03746c10149ce6e0ef
@@ -13830,7 +15874,7 @@ Date:	Wed Nov 3 09:31:14 2010 +0100
 
     Signed-off-by: Dieter Verfaillie <dieterv@optionexplicit.be>
 
- setup.py |   56 ++++++++++++++++++++++++++------------------------------
+ setup.py | 56 ++++++++++++++++++++++++++------------------------------
  1 file changed, 26 insertions(+), 30 deletions(-)
 
 commit a31b4196fbb4638a245430f2fdeafd7534b1d84d
@@ -13841,7 +15885,7 @@ Date:	Wed Nov 3 09:28:36 2010 +0100
 
     Signed-off-by: Dieter Verfaillie <dieterv@optionexplicit.be>
 
- setup.py |   61
+ setup.py | 61
  +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 61 insertions(+)
 
@@ -13853,7 +15897,7 @@ Date:	Wed Nov 3 09:26:59 2010 +0100
 
     Signed-off-by: Dieter Verfaillie <dieterv@optionexplicit.be>
 
- setup.py |    3 +++
+ setup.py | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 78533d851ee1314686f18cfa793613a9cf7d6686
@@ -13864,7 +15908,7 @@ Date:	Wed Nov 3 09:25:56 2010 +0100
 
     Signed-off-by: Dieter Verfaillie <dieterv@optionexplicit.be>
 
- setup.py |   25 +++++++++++++++++++++++++
+ setup.py | 25 +++++++++++++++++++++++++
  1 file changed, 25 insertions(+)
 
 commit ad40688df533dda0b1f7be8ea37c542b8796a26b
@@ -13875,7 +15919,7 @@ Date:	Wed Nov 3 09:24:45 2010 +0100
 
     Signed-off-by: Dieter Verfaillie <dieterv@optionexplicit.be>
 
- setup.py |    3 +++
+ setup.py | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 21ddfc66e4e18c002a33154eb4ab81170ed71ecc
@@ -13886,7 +15930,7 @@ Date:	Wed Nov 3 09:23:05 2010 +0100
 
     Signed-off-by: Dieter Verfaillie <dieterv@optionexplicit.be>
 
- setup.py |   37 ++++++++++++++++++++-----------------
+ setup.py | 37 ++++++++++++++++++++-----------------
  1 file changed, 20 insertions(+), 17 deletions(-)
 
 commit 7d353d04892de67265bf693f591f37fd393de639
@@ -13898,7 +15942,7 @@ Date:	Wed Nov 3 09:18:11 2010 +0100
 
     Signed-off-by: Dieter Verfaillie <dieterv@optionexplicit.be>
 
- setup.py |   18 ++++++++++--------
+ setup.py | 18 ++++++++++--------
  1 file changed, 10 insertions(+), 8 deletions(-)
 
 commit 286364ed39953e942e24d5911519bcac2f90975a
@@ -13910,7 +15954,7 @@ Date:	Wed Nov 3 09:05:59 2010 +0100
 
     Signed-off-by: Dieter Verfaillie <dieterv@optionexplicit.be>
 
- setup.py |   29 +++++++++--------------------
+ setup.py | 29 +++++++++--------------------
  1 file changed, 9 insertions(+), 20 deletions(-)
 
 commit 3f70f92904c123e6cc40929c0affd3f75d061828
@@ -13921,7 +15965,7 @@ Date:	Wed Nov 3 09:02:30 2010 +0100
 
     Signed-off-by: Dieter Verfaillie <dieterv@optionexplicit.be>
 
- setup.py |   31 ++++++++++++++++++++++---------
+ setup.py | 31 ++++++++++++++++++++++---------
  1 file changed, 22 insertions(+), 9 deletions(-)
 
 commit 9aa54b65f729c0f3b0e96ab7ff797f87dad6a455
@@ -13932,7 +15976,7 @@ Date:	Wed Nov 3 08:58:00 2010 +0100
 
     Signed-off-by: Dieter Verfaillie <dieterv@optionexplicit.be>
 
- README.win32 |   13 +++++--------
+ README.win32 | 13 +++++--------
  1 file changed, 5 insertions(+), 8 deletions(-)
 
 commit 5a33105f690ba84b2e4bb15d73d3467e92fa06e0
@@ -13943,8 +15987,8 @@ Date:	Wed Nov 3 07:59:18 2010 +0100
 
     Signed-off-by: Dieter Verfaillie <dieterv@optionexplicit.be>
 
- dsextras.py |	148
- +++++++++++++++++++++++++++++++++++++----------------------
+ dsextras.py | 148
+ ++++++++++++++++++++++++++++++++++++++----------------------
  1 file changed, 93 insertions(+), 55 deletions(-)
 
 commit d03503d0412d173acb383926ab3c2d640dad3e3f
@@ -13955,7 +15999,7 @@ Date:	Wed Nov 3 07:00:40 2010 +0100
 
     Signed-off-by: Dieter Verfaillie <dieterv@optionexplicit.be>
 
- dsextras.py |	  4 ++--
+ dsextras.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 8c62968e9f8467e24870b8c4f61112676eef4630
@@ -13967,7 +16011,7 @@ Date:	Wed Nov 3 06:56:32 2010 +0100
 
     Signed-off-by: Dieter Verfaillie <dieterv@optionexplicit.be>
 
- dsextras.py |	 15 ++++++---------
+ dsextras.py | 15 ++++++---------
  1 file changed, 6 insertions(+), 9 deletions(-)
 
 commit b98277afc24886bbda400e0ad360992bffa77b7c
@@ -13978,7 +16022,7 @@ Date:	Wed Nov 3 06:49:48 2010 +0100
 
     Signed-off-by: Dieter Verfaillie <dieterv@optionexplicit.be>
 
- dsextras.py |	 10 ++++++++++
+ dsextras.py | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
 commit a565558652ebc3fa49d7aea40d399b06bbe376c4
@@ -13990,7 +16034,7 @@ Date:	Wed Nov 3 06:45:05 2010 +0100
 
     Signed-off-by: Dieter Verfaillie <dieterv@optionexplicit.be>
 
- dsextras.py |	  4 ++--
+ dsextras.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 4b1ff0c7f9953f925d2178069263cca67ca7db02
@@ -14001,7 +16045,7 @@ Date:	Wed Nov 3 06:44:21 2010 +0100
 
     Signed-off-by: Dieter Verfaillie <dieterv@optionexplicit.be>
 
- dsextras.py |	 25 +++++++++++++------------
+ dsextras.py | 25 +++++++++++++------------
  1 file changed, 13 insertions(+), 12 deletions(-)
 
 commit 819a21cea831c3892040390e9446b78a91d1cbbe
@@ -14012,7 +16056,7 @@ Date:	Wed Nov 3 06:28:04 2010 +0100
 
     Signed-off-by: Dieter Verfaillie <dieterv@optionexplicit.be>
 
- dsextras.py |	 58
+ dsextras.py | 58
  +++++++++++++++++++++++++++++++---------------------------
  1 file changed, 31 insertions(+), 27 deletions(-)
 
@@ -14025,7 +16069,7 @@ Date:	Wed Nov 3 06:16:21 2010 +0100
 
     Signed-off-by: Dieter Verfaillie <dieterv@optionexplicit.be>
 
- .gitignore |	 7 +++++++
+ .gitignore | 7 +++++++
  1 file changed, 7 insertions(+)
 
 commit 268d6ed2b0b1d266c612da4453b6117d9e14437e
@@ -14034,7 +16078,7 @@ Date:	Thu Oct 28 15:32:28 2010 -0400
 
     [gi] add tests for calling dir on a dynamic module
 
- tests/test_gi.py |   24 ++++++++++++++++++++++++
+ tests/test_gi.py | 24 ++++++++++++++++++++++++
  1 file changed, 24 insertions(+)
 
 commit f6386a6e0d225c83cdbe1add4c4d3ea51d3ec2f0
@@ -14045,7 +16089,7 @@ Date:	Wed Oct 27 18:28:11 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=625093
 
- gi/module.py |    8 ++++++++
+ gi/module.py | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 commit 28ed01c34c503cfb4f14fe7af7912060ca70aba6
@@ -14061,7 +16105,7 @@ Date:	Mon Sep 20 23:10:14 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=629552
 
- gobject/pygpointer.c |    2 +-
+ gobject/pygpointer.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 1731f89e4b5a20c33976963e12a1f39a21d33fde
@@ -14074,7 +16118,7 @@ Date:	Thu Oct 28 14:21:12 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=629042
 
- gi/pygi-invoke.c |   10 +++++++++-
+ gi/pygi-invoke.c | 10 +++++++++-
  1 file changed, 9 insertions(+), 1 deletion(-)
 
 commit 783e2e351ec7470bda6b441e51f387dd61543c4b
@@ -14085,9 +16129,9 @@ Date:	Fri Oct 15 14:30:10 2010 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=632185
 
- gi/pygi-info.c |   91
- +++++++++++++++++++++++++++++++++++++++++++++++---------
- gi/pygi-info.h |    7 +++++
+ gi/pygi-info.c | 91
+ +++++++++++++++++++++++++++++++++++++++++++++++++---------
+ gi/pygi-info.h |  7 +++++
  2 files changed, 84 insertions(+), 14 deletions(-)
 
 commit 2ca897273f52ae38f5e06e72c773a048e199eee5
@@ -14096,7 +16140,7 @@ Date:	Thu Oct 28 13:49:15 2010 -0400
 
     include Python.h so that PY_VERSION_HEX gets defined
 
- gi/pygi-foreign-cairo.c |    1 +
+ gi/pygi-foreign-cairo.c | 1 +
  1 file changed, 1 insertion(+)
 
 commit 8b28b1d713df33931e255600ab98feda37a8e02a
@@ -14106,7 +16150,7 @@ Date:	Thu Oct 28 13:47:34 2010 -0400
     [gi] make overrides work for python 3.x protocols and alias for
     python 2.x
 
- gi/overrides/Gtk.py |	  9 +++++++--
+ gi/overrides/Gtk.py | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 commit 3c09710d2f68af9c16ce39fd25656147656a486a
@@ -14115,7 +16159,7 @@ Date:	Sat Oct 23 14:24:24 2010 +0200
 
     Override Gtk.Widget.translate_coordinates to not return success value
 
- gi/overrides/Gtk.py |	 11 +++++++++++
+ gi/overrides/Gtk.py | 11 +++++++++++
  1 file changed, 11 insertions(+)
 
 commit 9d4443b3de8c327d8645ddde0a7a6dc5b977d7b4
@@ -14125,7 +16169,7 @@ Date:	Sat Oct 23 14:22:36 2010 +0200
     Override Gtk.TreeViewColumn.cell_get_position to not return success
     value
 
- gi/overrides/Gtk.py |	  5 +++++
+ gi/overrides/Gtk.py | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 6679d39ace06294e98f9d6fc911ed6fb27656010
@@ -14135,7 +16179,7 @@ Date:	Sat Oct 23 14:21:36 2010 +0200
     Override get_path_at_pos and get_dest_row_at_pos of Gtk.TreeView to
     not return success value
 
- gi/overrides/Gtk.py |	 15 +++++++++++++++
+ gi/overrides/Gtk.py | 15 +++++++++++++++
  1 file changed, 15 insertions(+)
 
 commit 80b1b266fa68a5c67106871502017166628f71e4
@@ -14145,7 +16189,7 @@ Date:	Sat Oct 23 14:20:38 2010 +0200
     Override Gtk.TreeSortable.get_sort_column_id to not return success
     value
 
- gi/overrides/Gtk.py |	 12 ++++++++++++
+ gi/overrides/Gtk.py | 12 ++++++++++++
  1 file changed, 12 insertions(+)
 
 commit 17cd0fb3a2d2ca0c6109c41727ba0b8c42217cd5
@@ -14155,7 +16199,7 @@ Date:	Sat Oct 23 14:19:20 2010 +0200
     Override forward_search and backward_search of Gtk.TextIter to not
     return success value
 
- gi/overrides/Gtk.py |	 15 +++++++++++++++
+ gi/overrides/Gtk.py | 15 +++++++++++++++
  1 file changed, 15 insertions(+)
 
 commit 95c86fa31da3d2fe84db0e2b5bc2a6dc896c9223
@@ -14165,7 +16209,7 @@ Date:	Sat Oct 23 14:18:09 2010 +0200
     Override Gtk.TextBuffer.get_selection_bounds to not return success
     value
 
- gi/overrides/Gtk.py |	  5 +++++
+ gi/overrides/Gtk.py | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit da6d87460b9392c29d025a7eed9249fb604204bc
@@ -14175,7 +16219,7 @@ Date:	Sat Oct 23 14:17:04 2010 +0200
     Override Gtk.RecentInfo.get_application_info to not return success
     value
 
- gi/overrides/Gtk.py |	 10 ++++++++++
+ gi/overrides/Gtk.py | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
 commit 0ed2e8772bdc405b0d0c7e0b2803e0e141abcb6a
@@ -14184,7 +16228,7 @@ Date:	Sat Oct 23 14:16:21 2010 +0200
 
     Override Gtk.IMContext.get_surrounding to not return success value
 
- gi/overrides/Gtk.py |	 10 ++++++++++
+ gi/overrides/Gtk.py | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
 commit b85b445f15421209c0b4adf676d7c8218d6437c5
@@ -14194,7 +16238,7 @@ Date:	Sat Oct 23 14:15:24 2010 +0200
     Override get_item_at_pos, get_visible_range, get_dest_item_at_pos
     of Gtk.IconView to not return success value
 
- gi/overrides/Gtk.py |	 19 +++++++++++++++++++
+ gi/overrides/Gtk.py | 19 +++++++++++++++++++
  1 file changed, 19 insertions(+)
 
 commit 684d716192d58c972083e579e909bcd97f8a5025
@@ -14203,7 +16247,7 @@ Date:	Sat Oct 23 14:13:47 2010 +0200
 
     Override Gtk.Container.get_focus_chain to not return success value
 
- gi/overrides/Gtk.py |	 10 ++++++++++
+ gi/overrides/Gtk.py | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
 commit 8ec830c57fafbfe50d9619c6caba3cb95a00d688
@@ -14212,7 +16256,7 @@ Date:	Sat Oct 23 14:12:44 2010 +0200
 
     Override Gtk.ComboBox.get_active_iter to not return success value
 
- gi/overrides/Gtk.py |	 10 ++++++++++
+ gi/overrides/Gtk.py | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
 commit b483852904468722230903989e3451c7c6a24c0f
@@ -14232,14 +16276,14 @@ Date:	Tue Oct 12 12:18:33 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=622987
 
- gi/pygi-argument.c	     |	 17 ++++++---------
- gobject/gobjectmodule.c     |	  4 ++--
- gobject/pygobject-private.h |	  1 +
- gobject/pygobject.h	     |	  2 ++
- gobject/pygtype.c	     |	 37 ++++++++++++++++++++++++++++----
- tests/test_gi.py	     |	  1 -
- tests/test_overrides.py     |	 50
- +++++++++++++++++++++++++++++++++++++++----
+ gi/pygi-argument.c	     | 17 ++++++---------
+ gobject/gobjectmodule.c     |	4 ++--
+ gobject/pygobject-private.h |	1 +
+ gobject/pygobject.h	     |	2 ++
+ gobject/pygtype.c	     | 37 +++++++++++++++++++++++++++++----
+ tests/test_gi.py	     |	1 -
+ tests/test_overrides.py     | 50
+ +++++++++++++++++++++++++++++++++++++++++----
  7 files changed, 90 insertions(+), 22 deletions(-)
 
 commit 8c87d622dcc6d76a981edfc5818fe67bb2e114e2
@@ -14248,7 +16292,7 @@ Date:	Fri Oct 22 13:28:31 2010 +1300
 
     Shortcut removal is not needed on post-uninstall
 
- pygobject_postinstall.py |   14 ++------------
+ pygobject_postinstall.py | 14 ++------------
  1 file changed, 2 insertions(+), 12 deletions(-)
 
 commit a3ed97fe6f80548801739fe6b72771b9eb6d93f7
@@ -14257,7 +16301,7 @@ Date:	Thu Oct 21 13:25:35 2010 +1300
 
     Disable shortcut creation in windows installer
 
- pygobject_postinstall.py |    2 +-
+ pygobject_postinstall.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a3d6212b0abccef58f05d454c091936776413d98
@@ -14268,9 +16312,9 @@ Date:	Thu Oct 7 11:43:27 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=631634
 
- gi/overrides/Gtk.py	 |   94
- ++++++++++++++++++++++++++++++++++++++++++++---
- tests/test_overrides.py |   64 +++++++++++++++++++++++++++++++-
+ gi/overrides/Gtk.py	 | 94
+ +++++++++++++++++++++++++++++++++++++++++++++----
+ tests/test_overrides.py | 64 ++++++++++++++++++++++++++++++++-
  2 files changed, 151 insertions(+), 7 deletions(-)
 
 commit a87e3ba64b54e6df0b5b96af47c34e3be790b58f
@@ -14298,9 +16342,9 @@ Date:	Thu Oct 7 19:37:53 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=631547
 
- gi/overrides/Gtk.py	 |  195
- +++++++++++++++++++++++++++++++++++++++++++++++
- tests/test_overrides.py |  160 ++++++++++++++++++++++++++++++++++++--
+ gi/overrides/Gtk.py	 | 195
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ tests/test_overrides.py | 160 +++++++++++++++++++++++++++++++++++++--
  2 files changed, 349 insertions(+), 6 deletions(-)
 
 commit acfcc29af727fb67d0dfbbcc7cc14963ef21f1ea
@@ -14309,7 +16353,7 @@ Date:	Sat Oct 16 18:59:25 2010 +1300
 
     Correctly build GIO on windows
 
- setup.py |    6 +++---
+ setup.py | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 33b59fd7437009b6c3ed43412e171d2cc91ee317
@@ -14318,7 +16362,7 @@ Date:	Sat Oct 16 18:17:28 2010 +1300
 
     Require Python >= 2.6.0 for Windows build
 
- setup.py |    2 +-
+ setup.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 544e0e4de4f5f97b0584eaf72ae8a081eca28ab6
@@ -14327,7 +16371,7 @@ Date:	Sat Oct 16 17:41:01 2010 +1300
 
     Fix depreciation warning in dsextras.py
 
- dsextras.py |	  2 +-
+ dsextras.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 239ff961778e4e1587404d8a70dfbe8630ab0623
@@ -14336,9 +16380,9 @@ Date:	Sat Oct 16 17:34:50 2010 +1300
 
     Fix build on windows
 
- gi/pygi-foreign.c |	5 ++++-
- gi/pygi.h	   |	5 ++++-
- setup.py	   |	4 ++--
+ gi/pygi-foreign.c | 5 ++++-
+ gi/pygi.h	   | 5 ++++-
+ setup.py	   | 4 ++--
  3 files changed, 10 insertions(+), 4 deletions(-)
 
 commit 9a2f81d63012fef23fdde2b4d903bd69601c07c6
@@ -14347,7 +16391,7 @@ Date:	Sat Oct 16 17:08:11 2010 +1300
 
     Support for GCC4 in Windows distutils build - bug 626548
 
- dsextras.py |	  3 ++-
+ dsextras.py | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 27367c8dc3a3a31fdd778505b319cd3f4afb9e27
@@ -14356,7 +16400,7 @@ Date:	Fri Oct 15 09:39:02 2010 +1300
 
     Remove obsolete comments in dsextras.py
 
- dsextras.py |	 11 ++---------
+ dsextras.py | 11 ++---------
  1 file changed, 2 insertions(+), 9 deletions(-)
 
 commit b5f383f854fb8f72677828b029589320c59006d1
@@ -14367,7 +16411,7 @@ Date:	Fri Oct 15 09:21:03 2010 +1300
 
 	* Fixes bug 631962
 
- dsextras.py |	  2 +-
+ dsextras.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e1981da105b574e273ae6500fc6d25caf6af6aae
@@ -14396,15 +16440,15 @@ Date:	Tue Sep 28 15:31:03 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=630844
 
- gi/gimodule.c		     |	  2 +-
- gi/pygi.h		     |	  5 ++++-
- glib/glibmodule.c	     |	  2 +-
- glib/pyglib-python-compat.h |	 28 ++++++++++++++++++++++++++++
- glib/pyglib.c		     |	  6 +++---
- glib/pygoptioncontext.c     |	  2 +-
- gobject/gobjectmodule.c     |	  2 +-
- gobject/pygobject.h	     |	  6 ++++++
- gobject/pygtype.c	     |	 10 +++++-----
+ gi/gimodule.c		     |	2 +-
+ gi/pygi.h		     |	5 ++++-
+ glib/glibmodule.c	     |	2 +-
+ glib/pyglib-python-compat.h | 28 ++++++++++++++++++++++++++++
+ glib/pyglib.c		     |	6 +++---
+ glib/pygoptioncontext.c     |	2 +-
+ gobject/gobjectmodule.c     |	2 +-
+ gobject/pygobject.h	     |	6 ++++++
+ gobject/pygtype.c	     | 10 +++++-----
  9 files changed, 50 insertions(+), 13 deletions(-)
 
 commit 03d2e2924e27a9d6cae89e5748f70e0a51be91c6
@@ -14418,7 +16462,7 @@ Date:	Tue Sep 28 12:44:42 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=630807
 
- gi/module.py |    2 ++
+ gi/module.py | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 28f9366c9cb382801bad080864f667c867daa3c7
@@ -14429,7 +16473,7 @@ Date:	Sat Oct 9 17:40:40 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=631765
 
- gi/overrides/Gtk.py |	 12 ++++++++++++
+ gi/overrides/Gtk.py | 12 ++++++++++++
  1 file changed, 12 insertions(+)
 
 commit f01a7d9e8222663ce52100e061033f2745a5e7af
@@ -14440,7 +16484,7 @@ Date:	Thu Oct 7 09:42:24 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=631548
 
- gi/overrides/Gtk.py |	 36 ++++++++++++++++++++++--------------
+ gi/overrides/Gtk.py | 36 ++++++++++++++++++++++--------------
  1 file changed, 22 insertions(+), 14 deletions(-)
 
 commit 1e1357f5fa1a034b0b707040d664ac46be6e23f7
@@ -14453,15 +16497,15 @@ Date:	Mon Oct 4 12:50:55 2010 -0400
 
     I ment to commit another patch and ended up comitting both
 
- gi/gimodule.c		     |	  2 +-
- gi/pygi.h		     |	  5 +----
- glib/glibmodule.c	     |	  2 +-
- glib/pyglib-python-compat.h |	 19 -------------------
- glib/pyglib.c		     |	  6 +++---
- glib/pygoptioncontext.c     |	  2 +-
- gobject/gobjectmodule.c     |	  2 +-
- gobject/pygobject.h	     |	  6 ------
- gobject/pygtype.c	     |	 10 +++++-----
+ gi/gimodule.c		     |	2 +-
+ gi/pygi.h		     |	5 +----
+ glib/glibmodule.c	     |	2 +-
+ glib/pyglib-python-compat.h | 19 -------------------
+ glib/pyglib.c		     |	6 +++---
+ glib/pygoptioncontext.c     |	2 +-
+ gobject/gobjectmodule.c     |	2 +-
+ gobject/pygobject.h	     |	6 ------
+ gobject/pygtype.c	     | 10 +++++-----
  9 files changed, 13 insertions(+), 41 deletions(-)
 
 commit 97774cb149c5b03d5ef82a5af3f19e2ce4d79d0b
@@ -14473,7 +16517,7 @@ Date:	Mon Oct 4 12:43:31 2010 -0400
 
     * see https://bugzilla.gnome.org/show_bug.cgi?id=631158
 
- gi/pygi.h |	2 +-
+ gi/pygi.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f25e763d53e5cdd4de08e90b04aea4b4c4720ac0
@@ -14486,15 +16530,15 @@ Date:	Tue Sep 28 15:31:03 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=630844
 
- gi/gimodule.c		     |	  2 +-
- gi/pygi.h		     |	  5 ++++-
- glib/glibmodule.c	     |	  2 +-
- glib/pyglib-python-compat.h |	 19 +++++++++++++++++++
- glib/pyglib.c		     |	  6 +++---
- glib/pygoptioncontext.c     |	  2 +-
- gobject/gobjectmodule.c     |	  2 +-
- gobject/pygobject.h	     |	  6 ++++++
- gobject/pygtype.c	     |	 10 +++++-----
+ gi/gimodule.c		     |	2 +-
+ gi/pygi.h		     |	5 ++++-
+ glib/glibmodule.c	     |	2 +-
+ glib/pyglib-python-compat.h | 19 +++++++++++++++++++
+ glib/pyglib.c		     |	6 +++---
+ glib/pygoptioncontext.c     |	2 +-
+ gobject/gobjectmodule.c     |	2 +-
+ gobject/pygobject.h	     |	6 ++++++
+ gobject/pygtype.c	     | 10 +++++-----
  9 files changed, 41 insertions(+), 13 deletions(-)
 
 commit 80b8ccd450fe4e3ea77b27e58bb63cabc2a2bb2b
@@ -14504,7 +16548,7 @@ Date:	Tue Sep 28 15:28:16 2010 -0400
     fix commit 7fe83108 which didn't use the compat functions for
     string handling
 
- glib/glibmodule.c |	2 +-
+ glib/glibmodule.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 9562842907a9d94f6adae2c1bb20d6b1f189abda
@@ -14513,8 +16557,8 @@ Date:	Tue Sep 28 13:15:57 2010 -0400
 
     Python 3 fixes for dsextras and the python.m4 distribution files
 
- dsextras.py  |   13 +++++++------
- m4/python.m4 |    4 ++--
+ dsextras.py  | 13 +++++++------
+ m4/python.m4 |  4 ++--
  2 files changed, 9 insertions(+), 8 deletions(-)
 
 commit 98f69957ee9e3037b0a05a037098e4d2133ca256
@@ -14525,8 +16569,8 @@ Date:	Mon Sep 27 14:01:31 2010 -0400
 
     * update hacking to fill in some holes in the release instructions
 
- HACKING      |    6 ++++--
- configure.ac |    2 +-
+ HACKING      | 6 ++++--
+ configure.ac | 2 +-
  2 files changed, 5 insertions(+), 3 deletions(-)
 
 commit fd38010101411e6bc1ca9314657f418de660fa13
@@ -14535,8 +16579,8 @@ Date:	Mon Sep 27 12:03:10 2010 -0400
 
     update NEWS for release
 
- NEWS |   93
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ NEWS | 93
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 93 insertions(+)
 
 commit 7072d56b6cba13da97a052c75d1ae0c2cc417fd1
@@ -14545,7 +16589,7 @@ Date:	Sun Sep 26 08:37:31 2010 +0200
 
     Pre-release version bump 2.26.0
 
- configure.ac |    4 ++--
+ configure.ac | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit a549f429d2ced7a78d5baa5e2f28f6750b4788f2
@@ -14557,8 +16601,8 @@ Date:	Fri Sep 24 22:44:03 2010 +1200
 	* Also tidy up g_get_{cache,config,data}_dir
 	  to share common code
 
- glib/glibmodule.c |   68
- +++++++++++++++++++++++++++++++++++++++--------------
+ glib/glibmodule.c | 68
+ ++++++++++++++++++++++++++++++++++++++++---------------
  1 file changed, 50 insertions(+), 18 deletions(-)
 
 commit 328aca600714bdca89dfdb531c222ee561ede27e
@@ -14567,7 +16611,7 @@ Date:	Fri Sep 24 12:16:22 2010 -0400
 
     fixed make check and make dist
 
- tests/Makefile.am |   31 ++++++++++++++++++-------------
+ tests/Makefile.am | 31 ++++++++++++++++++-------------
  1 file changed, 18 insertions(+), 13 deletions(-)
 
 commit 27023fd56148dd17b5576c1e81e0fe851d9b8727
@@ -14576,7 +16620,7 @@ Date:	Fri Sep 24 21:20:53 2010 +1200
 
     Disable GI tests when introspection disabled
 
- tests/Makefile.am |	2 ++
+ tests/Makefile.am | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 7fe831081cdd2e26f5d948326b9f89ea0694e752
@@ -14585,10 +16629,10 @@ Date:	Sat Jul 18 19:35:08 2009 +0200
 
     Wrap g_uri_list_extract_uris. Fixes bug #584431
 
- glib/glibmodule.c   |	 38 ++++++++++++++++++++++++++++++++++++++
- gobject/__init__.py |	  2 +-
- tests/Makefile.am   |	  3 ++-
- tests/test_uris.py  |	 15 +++++++++++++++
+ glib/glibmodule.c   | 38 ++++++++++++++++++++++++++++++++++++++
+ gobject/__init__.py |	2 +-
+ tests/Makefile.am   |	3 ++-
+ tests/test_uris.py  | 15 +++++++++++++++
  4 files changed, 56 insertions(+), 2 deletions(-)
 
 commit d6721a59c294f2471142b8c32de2f647b7084bca
@@ -14597,12 +16641,12 @@ Date:	Thu Sep 23 15:38:40 2010 -0400
 
     Fix a few uses of TRUE and FALSE in the docs
 
- docs/reference/pygio-mount.xml		|    5 +++--
- docs/reference/pyglib-functions.xml	|   18 +++++++++---------
- docs/reference/pyglib-maincontext.xml	|   12 ++++++------
- docs/reference/pyglib-mainloop.xml	|    6 +++---
- docs/reference/pygobject-functions.xml |    6 +++---
- docs/reference/pygobject.xml		|    4 ++--
+ docs/reference/pygio-mount.xml		|  5 +++--
+ docs/reference/pyglib-functions.xml	| 18 +++++++++---------
+ docs/reference/pyglib-maincontext.xml	| 12 ++++++------
+ docs/reference/pyglib-mainloop.xml	|  6 +++---
+ docs/reference/pygobject-functions.xml |  6 +++---
+ docs/reference/pygobject.xml		|  4 ++--
  6 files changed, 26 insertions(+), 25 deletions(-)
 
 commit a08c9fffb4262ae678e17f90bbfb2d5f880cfad0
@@ -14627,9 +16671,9 @@ Date:	Tue Sep 21 17:52:14 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=630271
 
- gi/pygi-invoke.c	  |   83
- +++++++++++++++++++++-------------------------
- tests/test_everything.py |    4 ++-
+ gi/pygi-invoke.c	  | 83
+ +++++++++++++++++++++---------------------------
+ tests/test_everything.py |  4 ++-
  2 files changed, 40 insertions(+), 47 deletions(-)
 
 commit 9714d765a34e246899f11b6792eea3aecce0b7ec
@@ -14640,12 +16684,12 @@ Date:	Mon Sep 13 16:36:47 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=629367
 
- gi/gimodule.c		    |	20 +++++++
- gi/overrides/GLib.py	    |  131
- +++++++++++++++++++++++++++++++++++++++++---
- gi/pygi-foreign-gvariant.c |	 2 +-
- tests/test_everything.py   |	16 ------
- tests/test_overrides.py    |	25 +++++++++
+ gi/gimodule.c		    |  20 +++++++
+ gi/overrides/GLib.py	    | 131
+ ++++++++++++++++++++++++++++++++++++++++++---
+ gi/pygi-foreign-gvariant.c |	2 +-
+ tests/test_everything.py   |  16 ------
+ tests/test_overrides.py    |  25 +++++++++
  5 files changed, 170 insertions(+), 24 deletions(-)
 
 commit fc45abdd9b55ab63556798ab0f04715be79dba08
@@ -14656,7 +16700,7 @@ Date:	Thu Sep 23 10:49:36 2010 -0400
 
     * https://bugzilla.gnome.org/show_bug.cgi?id=627449
 
- glib/option.py |    2 +-
+ glib/option.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 4ed100f3183c6325dd04461484e877bb7d4131b1
@@ -14671,9 +16715,9 @@ Date:	Fri Sep 17 12:08:09 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=615872
 
- configure.ac	   |   32 +++++++++++++++++++++++++++++---
- tests/Makefile.am |   35 ++++++++++++++++++++---------------
- tests/runtests.py |	4 ++++
+ configure.ac	   | 32 +++++++++++++++++++++++++++++---
+ tests/Makefile.am | 35 ++++++++++++++++++++---------------
+ tests/runtests.py |  4 ++++
  3 files changed, 53 insertions(+), 18 deletions(-)
 
 commit 269ff8564eeb597dc06c27e293354b7ff7a71a82
@@ -14687,7 +16731,7 @@ Date:	Fri Sep 17 15:50:47 2010 +0200
     releases it's planned to become static methods again but for now
     let's fix the tests.
 
- tests/test_gi.py |   14 +++++++-------
+ tests/test_gi.py | 14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)
 
 commit 2da8da589644d6125101210712defb1272a8abb1
@@ -14698,9 +16742,9 @@ Date:	Thu Sep 9 13:52:14 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=629199
 
- gi/pygi-argument.c	 |    4 ++--
- gi/pygi-struct.c	 |    2 +-
- gobject/gobjectmodule.c |    2 +-
+ gi/pygi-argument.c	 | 4 ++--
+ gi/pygi-struct.c	 | 2 +-
+ gobject/gobjectmodule.c | 2 +-
  3 files changed, 4 insertions(+), 4 deletions(-)
 
 commit 6769a4704f0876ac3baacd4da03ff16d9f0906be
@@ -14713,7 +16757,7 @@ Date:	Thu Sep 9 13:55:17 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=629198
 
- gobject/pygtype.c |	9 ---------
+ gobject/pygtype.c | 9 ---------
  1 file changed, 9 deletions(-)
 
 commit 98f54f9d33996baeaa8c8c1240310f5396d03a1d
@@ -14742,10 +16786,10 @@ Date:	Tue Sep 14 14:10:49 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=615872
 
- gi/pygi-argument.c |  182
- +++++++++++++++++++++++++++-------------------------
- gi/pygi-argument.h |	 2 +
- gi/pygi-invoke.c   |	14 ++++
+ gi/pygi-argument.c | 182
+ ++++++++++++++++++++++++++++-------------------------
+ gi/pygi-argument.h |	2 +
+ gi/pygi-invoke.c   |  14 +++++
  3 files changed, 112 insertions(+), 86 deletions(-)
 
 commit 5d79498d38b147b66ae72c1481e397160491e8d6
@@ -14756,7 +16800,7 @@ Date:	Wed Sep 15 10:26:20 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=615872
 
- gi/pygi-foreign-cairo.c |    6 ++++++
+ gi/pygi-foreign-cairo.c | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit b855562e5c0019cd7e4982fe00c467ede9e3926d
@@ -14772,7 +16816,7 @@ Date:	Thu Sep 9 22:16:58 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=615872
 
- gi/pygi-argument.c |	10 +++-------
+ gi/pygi-argument.c | 10 +++-------
  1 file changed, 3 insertions(+), 7 deletions(-)
 
 commit 0e72e28c6c5502c7db5103cf1299c9f0e6689fdd
@@ -14785,7 +16829,7 @@ Date:	Thu Sep 9 18:44:11 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=615872
 
- gi/pygi-argument.c |	20 ++++++++++++--------
+ gi/pygi-argument.c | 20 ++++++++++++--------
  1 file changed, 12 insertions(+), 8 deletions(-)
 
 commit d5666d99a1c0396b7da0cb14f9f4ff8892da7e2e
@@ -14798,7 +16842,7 @@ Date:	Thu Sep 9 17:35:10 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=615872
 
- gobject/pygtype.c |   29 ++++++++++++++++-------------
+ gobject/pygtype.c | 29 ++++++++++++++++-------------
  1 file changed, 16 insertions(+), 13 deletions(-)
 
 commit 3d431c7dd0de97db10cb0c00c39d9c1837bed2f2
@@ -14807,7 +16851,7 @@ Date:	Fri Sep 17 12:14:56 2010 +0200
 
     Specify encoding of tests/test_gi.py
 
- tests/test_gi.py |    3 ++-
+ tests/test_gi.py | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit a808bdabb9fa6f4a9b9ce42e1cce05fb37403f0f
@@ -14818,7 +16862,7 @@ Date:	Thu Sep 9 13:24:30 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=615872
 
- tests/test_gi.py |    6 +++++-
+ tests/test_gi.py | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit 928f4485041d80d0c36ff2daeae4bcd09bd0bde4
@@ -14834,9 +16878,9 @@ Date:	Thu Sep 9 12:45:21 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=615872
 
- glib/pygiochannel.c |	 30 +++++++++++++++---------------
- glib/pygsource.c    |	  4 ++--
- gobject/pygobject.c |	  2 +-
+ glib/pygiochannel.c | 30 +++++++++++++++---------------
+ glib/pygsource.c    |	4 ++--
+ gobject/pygobject.c |	2 +-
  3 files changed, 18 insertions(+), 18 deletions(-)
 
 commit b5ee20afa4399c7689fbec8939fa20b927eeb782
@@ -14847,7 +16891,7 @@ Date:	Thu Sep 9 08:04:40 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=615872
 
- glib/pygspawn.c |    4 ++--
+ glib/pygspawn.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit a499b2f0d622b671bd154544f66b73f1278e66ed
@@ -14863,8 +16907,8 @@ Date:	Thu Sep 9 07:56:44 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=615872
 
- gi/overrides/Gtk.py |	 24 ++++++++++++++++--------
- glib/option.py      |	 16 ++++++++++++----
+ gi/overrides/Gtk.py | 24 ++++++++++++++++--------
+ glib/option.py      | 16 ++++++++++++----
  2 files changed, 28 insertions(+), 12 deletions(-)
 
 commit dec9001d26c97949e7b3578086cb35e98075c047
@@ -14887,12 +16931,12 @@ Date:	Thu Sep 9 07:36:04 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=615872
 
- tests/compathelper.py	  |   18 ++++++++++++++++++
- tests/test_everything.py |    5 +++--
- tests/test_mainloop.py   |    3 ++-
- tests/test_option.py	  |    6 ++++--
- tests/test_overrides.py  |    4 ++--
- tests/test_properties.py |    6 +++---
+ tests/compathelper.py	  | 18 ++++++++++++++++++
+ tests/test_everything.py |  5 +++--
+ tests/test_mainloop.py   |  3 ++-
+ tests/test_option.py	  |  6 ++++--
+ tests/test_overrides.py  |  4 ++--
+ tests/test_properties.py |  6 +++---
  6 files changed, 32 insertions(+), 10 deletions(-)
 
 commit 09a0daeedf49eaf376c1288be5743b57fbc76d51
@@ -14901,7 +16945,7 @@ Date:	Thu Sep 9 16:25:51 2010 -0400
 
     compilation: Fix syntax error
 
- gi/pygi-info.c |    2 +-
+ gi/pygi-info.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 9f7afd6d5afd8c1a5f36bf1295814757b71c8cbc
@@ -14910,7 +16954,7 @@ Date:	Thu Sep 9 22:17:00 2010 +0200
 
     Add missing file
 
- gi/overrides/GLib.py |   48
+ gi/overrides/GLib.py | 48
  ++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 48 insertions(+)
 
@@ -14930,12 +16974,12 @@ Date:	Thu Jul 22 13:48:51 2010 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=625050
 
- gi/gimodule.c		  |   38 ++++++++++++++++++++++++++++++++++++++
- gi/overrides/Makefile.am |    1 +
- gi/pygi-type.c		  |   15 +++++++++------
- gi/pygi-type.h		  |    2 ++
- gi/types.py		  |    1 +
- tests/test_everything.py |    9 +++++++++
+ gi/gimodule.c		  | 38 ++++++++++++++++++++++++++++++++++++++
+ gi/overrides/Makefile.am |  1 +
+ gi/pygi-type.c		  | 15 +++++++++------
+ gi/pygi-type.h		  |  2 ++
+ gi/types.py		  |  1 +
+ tests/test_everything.py |  9 +++++++++
  6 files changed, 60 insertions(+), 6 deletions(-)
 
 commit 22e53aa2ed9cf6173a877b0af6928d5ab8da2f4f
@@ -14944,7 +16988,7 @@ Date:	Wed Sep 8 13:08:48 2010 -0400
 
     fix for changes in the gi test libraries
 
- tests/test_everything.py |    2 +-
+ tests/test_everything.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 246877074617b0e9c3b2ba2a5395a73e0ed9cd5d
@@ -14953,7 +16997,7 @@ Date:	Wed Sep 8 13:08:07 2010 -0400
 
     Gtk.DialogFlags.NO_SEPARATOR has been removed in Gtk 3.0
 
- gi/overrides/Gtk.py |	 10 ++++++++--
+ gi/overrides/Gtk.py | 10 ++++++++--
  1 file changed, 8 insertions(+), 2 deletions(-)
 
 commit f92fc48e7e2ec50996e994ccb7d08a61e7374f22
@@ -14970,7 +17014,7 @@ Date:	Wed Sep 8 12:35:09 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=629087
 
- gi/pygi-callbacks.c |	  5 +----
+ gi/pygi-callbacks.c | 5 +----
  1 file changed, 1 insertion(+), 4 deletions(-)
 
 commit 8c517de2d278bdef641c72b8f2919a3924290ec1
@@ -14981,9 +17025,9 @@ Date:	Fri Aug 20 14:54:35 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=627494
 
- gi/pygi-property.c	  |  156
- +++++++++++++++++++++++++++++++++++-----------
- tests/test_everything.py |   34 ++++++++++
+ gi/pygi-property.c	  | 156
+ ++++++++++++++++++++++++++++++++++++-----------
+ tests/test_everything.py |  34 +++++++++++
  2 files changed, 154 insertions(+), 36 deletions(-)
 
 commit 6d183d1fff55d54569ba3e1f90a10284df74fd40
@@ -15014,7 +17058,7 @@ Date:	Fri Sep 3 12:04:16 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=615872
 
- gobject/gobjectmodule.c |    2 +-
+ gobject/gobjectmodule.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit b7bf4269682a3335f5e0a52b46fa721af134d09a
@@ -15023,19 +17067,19 @@ Date:	Wed Sep 1 11:03:40 2010 +0200
 
     Rename GArgument to GIArgument
 
- gi/pygi-argument.c	    |	52
- ++++++++++++++++++++++----------------------
- gi/pygi-argument.h	    |	10 ++++-----
- gi/pygi-closure.c	    |	34 ++++++++++++++---------------
- gi/pygi-foreign-cairo.c    |	 8 +++----
- gi/pygi-foreign-gvariant.c |	 4 ++--
- gi/pygi-foreign-gvariant.h |	 4 ++--
- gi/pygi-foreign.c	    |	12 +++++-----
- gi/pygi-foreign.h	    |	 8 +++----
- gi/pygi-info.c		    |	 8 +++----
- gi/pygi-invoke.c	    |	28 ++++++++++++------------
- gi/pygi-property.c	    |	 4 ++--
- gi/pygi.h		    |	16 +++++++-------
+ gi/pygi-argument.c	    | 52
+ +++++++++++++++++++++++-----------------------
+ gi/pygi-argument.h	    | 10 ++++-----
+ gi/pygi-closure.c	    | 34 +++++++++++++++---------------
+ gi/pygi-foreign-cairo.c    |  8 +++----
+ gi/pygi-foreign-gvariant.c |  4 ++--
+ gi/pygi-foreign-gvariant.h |  4 ++--
+ gi/pygi-foreign.c	    | 12 +++++------
+ gi/pygi-foreign.h	    |  8 +++----
+ gi/pygi-info.c		    |  8 +++----
+ gi/pygi-invoke.c	    | 28 ++++++++++++-------------
+ gi/pygi-property.c	    |  4 ++--
+ gi/pygi.h		    | 16 +++++++-------
  12 files changed, 94 insertions(+), 94 deletions(-)
 
 commit 7197f85c9be2b03636639ac909ca2c3170653509
@@ -15051,12 +17095,12 @@ Date:	Wed Aug 18 10:29:19 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=615872
 
- gobject/propertyhelper.py |   16 +++++++++++-----
- tests/compathelper.py	   |   32 ++++++++++++++++++++++++++++++++
- tests/test_option.py	   |	7 ++++++-
- tests/test_properties.py  |   24 ++++++++++++++----------
- tests/test_signal.py	   |   14 +++++++-------
- tests/test_source.py	   |	4 ++--
+ gobject/propertyhelper.py | 16 +++++++++++-----
+ tests/compathelper.py	   | 32 ++++++++++++++++++++++++++++++++
+ tests/test_option.py	   |  7 ++++++-
+ tests/test_properties.py  | 24 ++++++++++++++----------
+ tests/test_signal.py	   | 14 +++++++-------
+ tests/test_source.py	   |  4 ++--
  6 files changed, 72 insertions(+), 25 deletions(-)
 
 commit 720e614acdbcf734d4bcccc403e639b5a5bcae24
@@ -15080,14 +17124,14 @@ Date:	Fri Aug 20 10:58:48 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=627878
 
- configure.ac		  |    5 +-
- gi/pygi-argument.c	  |    9 +--
- gi/pygi-invoke.c	  |  147
- +++++---------------------------------------
- tests/Makefile.am	  |   42 ++++++++++++-
- tests/test_everything.py |    6 +-
- tests/test_gi.py	  |  151
- +++++++++-------------------------------------
+ configure.ac		  |   5 +-
+ gi/pygi-argument.c	  |   9 +--
+ gi/pygi-invoke.c	  | 147
+ +++++----------------------------------------
+ tests/Makefile.am	  |  42 ++++++++++++-
+ tests/test_everything.py |   6 +-
+ tests/test_gi.py	  | 151
+ +++++++++--------------------------------------
  6 files changed, 93 insertions(+), 267 deletions(-)
 
 commit f6c4d9e58c8f05cb2d82e158c9eb8480308565bd
@@ -15098,8 +17142,8 @@ Date:	Fri Aug 20 10:43:58 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=615872
 
- gobject/pygenum.c  |	 1 +
- gobject/pygflags.c |	 1 +
+ gobject/pygenum.c  | 1 +
+ gobject/pygflags.c | 1 +
  2 files changed, 2 insertions(+)
 
 commit c03e6b482548aee99362356807c804f8834fad2b
@@ -15110,10 +17154,10 @@ Date:	Thu Apr 15 17:11:30 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=615872
 
- glib/pygspawn.c    |	 7 ++---
- gobject/pygenum.c  |	61 +++++++++++++++++++++++------------------
- gobject/pygflags.c |	76
- ++++++++++++++++++++++------------------------------
+ glib/pygspawn.c    |  7 ++---
+ gobject/pygenum.c  | 61 ++++++++++++++++++++++++-------------------
+ gobject/pygflags.c | 76
+ +++++++++++++++++++++++-------------------------------
  3 files changed, 71 insertions(+), 73 deletions(-)
 
 commit 0db676fd2296750a46ba0fb069e472da06ecc53a
@@ -15133,7 +17177,7 @@ Date:	Wed Aug 18 11:03:32 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=615872
 
- gi/types.py |	 12 ++++++++----
+ gi/types.py | 12 ++++++++----
  1 file changed, 8 insertions(+), 4 deletions(-)
 
 commit 286dcd0c6455961d818ac7f05f80f82435abc1dc
@@ -15144,8 +17188,8 @@ Date:	Tue Aug 17 15:43:42 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=615872
 
- gi/Makefile.am		 |    2 +-
- gi/pygi-foreign-cairo.c |   17 +++++++----------
+ gi/Makefile.am		 |  2 +-
+ gi/pygi-foreign-cairo.c | 17 +++++++----------
  2 files changed, 8 insertions(+), 11 deletions(-)
 
 commit bda58ec34fc443fe1108afc8532bec50f6fd0b44
@@ -15156,8 +17200,8 @@ Date:	Tue Aug 17 02:33:45 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=615872
 
- gi/module.py |    2 +-
- gi/types.py  |    2 +-
+ gi/module.py | 2 +-
+ gi/types.py  | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 427a3c8053feca35ccd746575760ac8a0ed50a12
@@ -15172,8 +17216,8 @@ Date:	Tue Aug 17 02:24:44 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=615872
 
- gi/Makefile.am |    2 +-
- gi/gimodule.c	|   24 +++++++++---------------
+ gi/Makefile.am |  2 +-
+ gi/gimodule.c	| 24 +++++++++---------------
  2 files changed, 10 insertions(+), 16 deletions(-)
 
 commit 1dee5dcd2b1747b4a4af438c0443d7930e4802db
@@ -15189,9 +17233,9 @@ Date:	Tue Aug 17 02:14:14 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=615872
 
- tests/Makefile.am	  |    2 +-
- tests/testhelpermodule.c |  221
- ++++++----------------------------------------
+ tests/Makefile.am	  |   2 +-
+ tests/testhelpermodule.c | 221
+ ++++++-----------------------------------------
  2 files changed, 28 insertions(+), 195 deletions(-)
 
 commit 1ff83a2ccb7301c8f675913f1c4f6118ea50b9c7
@@ -15202,11 +17246,11 @@ Date:	Mon Aug 16 21:14:27 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=615872
 
- gi/pygi-boxed.c      |   43 ++-----------
- gi/pygi-info.c       |  171
- ++++++++++++++++++++------------------------------
- gi/pygi-repository.c |   39 +++---------
- gi/pygi-struct.c     |   45 +++----------
+ gi/pygi-boxed.c      |  43 ++-----------
+ gi/pygi-info.c       | 171
+ ++++++++++++++++++++-------------------------------
+ gi/pygi-repository.c |  39 +++---------
+ gi/pygi-struct.c     |  45 +++-----------
  4 files changed, 88 insertions(+), 210 deletions(-)
 
 commit 1efa2b12913b194d433c17014bc1077271a6ca32
@@ -15223,15 +17267,15 @@ Date:	Mon Aug 16 13:51:05 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=615872
 
- gi/Makefile.am		     |	  2 +-
- gi/pygi-argument.c	     |	 96
- ++++++++++++++++++++++++++-----------------
- gi/pygi-boxed.c	     |	  1 +
- gi/pygi-info.c		     |	 13 +++---
- gi/pygi-private.h	     |	 23 +++++++++++
- gi/pygi-repository.c	     |	  8 ++--
- gi/pygi-struct.c	     |	  1 +
- glib/pyglib-python-compat.h |	  6 +++
+ gi/Makefile.am		     |	2 +-
+ gi/pygi-argument.c	     | 96
+ +++++++++++++++++++++++++++------------------
+ gi/pygi-boxed.c	     |	1 +
+ gi/pygi-info.c		     | 13 +++---
+ gi/pygi-private.h	     | 23 +++++++++++
+ gi/pygi-repository.c	     |	8 ++--
+ gi/pygi-struct.c	     |	1 +
+ glib/pyglib-python-compat.h |	6 +++
  8 files changed, 103 insertions(+), 47 deletions(-)
 
 commit 6b902c66200c1684513a9ef31bdef3f2ff64e4fa
@@ -15242,7 +17286,7 @@ Date:	Fri Aug 20 09:28:57 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=627408
 
- glib/option.py |    4 ++--
+ glib/option.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 3cefffecc1317b6ad77a5ed936bfb990d16bf9d3
@@ -15256,7 +17300,7 @@ Date:	Thu Aug 19 18:45:05 2010 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=627440
 
- glib/pyglib-python-compat.h |	  2 ++
+ glib/pyglib-python-compat.h | 2 ++
  1 file changed, 2 insertions(+)
 
 commit d45c7031876f355e15409f00f3e50e77d18f8f4b
@@ -15265,7 +17309,7 @@ Date:	Thu Aug 19 17:50:35 2010 -0400
 
     pyglib: Fix a compiler warning
 
- glib/pyglib.c |    1 +
+ glib/pyglib.c | 1 +
  1 file changed, 1 insertion(+)
 
 commit 0fe6828ddce187ac1897a1f02ca1c5480796d5b9
@@ -15274,7 +17318,7 @@ Date:	Wed Aug 18 20:36:51 2010 +0200
 
     Don't force gtk 2.0
 
- pygi-convert.sh |   11 +++++++----
+ pygi-convert.sh | 11 +++++++----
  1 file changed, 7 insertions(+), 4 deletions(-)
 
 commit ac59c18a4f2bfff47c862b763aaf1d1cf136a4f5
@@ -15285,7 +17329,7 @@ Date:	Tue Aug 17 14:49:30 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=627143
 
- gi/gimodule.c |    9 +++++++--
+ gi/gimodule.c | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 commit 18ee0db673c2fa42244ab85950bbf4840edb674b
@@ -15294,8 +17338,8 @@ Date:	Thu Aug 12 12:16:31 2010 -0400
 
     handle strings correctly in gio
 
- gio/gappinfo.override |    5 +++++
- gio/pygio-utils.c     |   42 +++++++++++++++++++++++++++++++++++-------
+ gio/gappinfo.override |  5 +++++
+ gio/pygio-utils.c     | 42 +++++++++++++++++++++++++++++++++++-------
  2 files changed, 40 insertions(+), 7 deletions(-)
 
 commit 45ab0c03110c911b47519941dfd753326891b5e0
@@ -15306,8 +17350,8 @@ Date:	Wed Aug 11 16:13:59 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=615872
 
- gio/giomodule.c |  153
- ++++++++++++++++++++++++++++---------------------------
+ gio/giomodule.c | 153
+ +++++++++++++++++++++++++++++---------------------------
  1 file changed, 78 insertions(+), 75 deletions(-)
 
 commit c52f8ed3ae8cb66a03b5695e980770c3f467f755
@@ -15319,7 +17363,7 @@ Date:	Wed Aug 11 16:04:48 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=615872
 
- gi/pygi-argument.c |	31 +++++++++++++++++++++++++++----
+ gi/pygi-argument.c | 31 +++++++++++++++++++++++++++----
  1 file changed, 27 insertions(+), 4 deletions(-)
 
 commit de9eae4dfcce856a42cc5c569a5b9683c28d0eeb
@@ -15330,7 +17374,7 @@ Date:	Wed Aug 11 15:03:55 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=615872
 
- glib/pygiochannel.c |	 30 ++++++++++++++++++++++++------
+ glib/pygiochannel.c | 30 ++++++++++++++++++++++++------
  1 file changed, 24 insertions(+), 6 deletions(-)
 
 commit 5824ff98175b749dbcfa72d24b994230b6e05377
@@ -15348,25 +17392,25 @@ Date:	Mon Aug 9 15:16:51 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=615872
 
- glib/glibmodule.c	     |	 48 +++++-----
- glib/pygiochannel.c	     |	 46 ++++-----
- glib/pyglib-python-compat.h |	153 ++++++++++++++++++++++--------
- glib/pyglib.c		     |	 22 ++---
- glib/pyglib.h		     |	 14 ---
- glib/pygoptioncontext.c     |	  4 +-
- glib/pygsource.c	     |	 16 ++--
- glib/pygspawn.c	     |	 32 +++----
- gobject/gobjectmodule.c     |	216
- +++++++++++++++++++++----------------------
- gobject/pygboxed.c	     |	  2 +-
- gobject/pygenum.c	     |	 84 ++++++++---------
- gobject/pygflags.c	     |	122 ++++++++++++------------
- gobject/pygobject-private.h |	 12 +--
- gobject/pygobject.c	     |	 46 ++++-----
- gobject/pygobject.h	     |	 23 +++++
- gobject/pygparamspec.c      |	 24 ++---
- gobject/pygpointer.c	     |	  2 +-
- gobject/pygtype.c	     |	170 +++++++++++++++++-----------------
+ glib/glibmodule.c	     |	48 +++++-----
+ glib/pygiochannel.c	     |	46 +++++-----
+ glib/pyglib-python-compat.h | 153 +++++++++++++++++++++++--------
+ glib/pyglib.c		     |	22 ++---
+ glib/pyglib.h		     |	14 ---
+ glib/pygoptioncontext.c     |	 4 +-
+ glib/pygsource.c	     |	16 ++--
+ glib/pygspawn.c	     |	32 +++----
+ gobject/gobjectmodule.c     | 216
+ ++++++++++++++++++++++----------------------
+ gobject/pygboxed.c	     |	 2 +-
+ gobject/pygenum.c	     |	84 ++++++++---------
+ gobject/pygflags.c	     | 122 ++++++++++++-------------
+ gobject/pygobject-private.h |	12 +--
+ gobject/pygobject.c	     |	46 +++++-----
+ gobject/pygobject.h	     |	23 +++++
+ gobject/pygparamspec.c      |	24 ++---
+ gobject/pygpointer.c	     |	 2 +-
+ gobject/pygtype.c	     | 170 +++++++++++++++++-----------------
  18 files changed, 563 insertions(+), 473 deletions(-)
 
 commit 231e934cc01d061e81bb60d35127a133cd0e1793
@@ -15377,7 +17421,7 @@ Date:	Mon Aug 16 10:14:04 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=622606
 
- tests/test_overrides.py |   10 ++++++++++
+ tests/test_overrides.py | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
 commit f07cfde377e42686c6b80f56cac62338ee333e61
@@ -15388,7 +17432,7 @@ Date:	Mon Aug 16 10:08:38 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=622606
 
- gi/overrides/Gtk.py |	 13 +++++++++++++
+ gi/overrides/Gtk.py | 13 +++++++++++++
  1 file changed, 13 insertions(+)
 
 commit 65a06a7216163c7e65b32c5b5f3388faa7fda5d6
@@ -15401,8 +17445,8 @@ Date:	Thu Aug 12 16:18:58 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=616732
 
- configure.ac	|   15 ++++++++++++---
- gi/Makefile.am |   20 ++++++++++++--------
+ configure.ac	| 15 ++++++++++++---
+ gi/Makefile.am | 20 ++++++++++++--------
  2 files changed, 24 insertions(+), 11 deletions(-)
 
 commit b83507263231d9bf47f6c8450583e3d03f0a3b5b
@@ -15413,7 +17457,7 @@ Date:	Mon Aug 16 09:55:35 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=626996
 
- gi/pygi.h |	1 +
+ gi/pygi.h | 1 +
  1 file changed, 1 insertion(+)
 
 commit 0dc3656070f496431829c6e8441ca17129c569f8
@@ -15424,19 +17468,19 @@ Date:	Mon Aug 9 16:11:55 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=615872
 
- glib/pygiochannel.c	 |   18 ++++++----
- glib/pyglib.c		 |   85
- +++++++++++++++++++++++++++++++++++++++++++++++
- glib/pyglib.h		 |    3 ++
- glib/pygmaincontext.c	 |   17 ++++++----
- glib/pygmainloop.c	 |   17 ++++++----
- glib/pygoptioncontext.c |   18 ++++++----
- glib/pygoptiongroup.c	 |   22 ++++++------
- gobject/pygboxed.c	 |   18 ++++++----
- gobject/pygobject.c	 |   44 +++++++++++++++++-------
- gobject/pygparamspec.c  |   19 +++++++----
- gobject/pygpointer.c	 |   17 ++++++----
- gobject/pygtype.c	 |   26 +++++++++++----
+ glib/pygiochannel.c	 | 18 +++++++----
+ glib/pyglib.c		 | 85
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/pyglib.h		 |  3 ++
+ glib/pygmaincontext.c	 | 17 ++++++----
+ glib/pygmainloop.c	 | 17 ++++++----
+ glib/pygoptioncontext.c | 18 +++++++----
+ glib/pygoptiongroup.c	 | 22 +++++++------
+ gobject/pygboxed.c	 | 18 +++++++----
+ gobject/pygobject.c	 | 44 ++++++++++++++++++-------
+ gobject/pygparamspec.c  | 19 +++++++----
+ gobject/pygpointer.c	 | 17 ++++++----
+ gobject/pygtype.c	 | 26 +++++++++++----
  12 files changed, 233 insertions(+), 71 deletions(-)
 
 commit b426e531dc53d4b50e572a2da19733479635e662
@@ -15450,8 +17494,8 @@ Date:	Thu Aug 12 18:09:33 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=625661
 
- autogen.sh |  506
- +++++++-----------------------------------------------------
+ autogen.sh | 506
+ +++++++------------------------------------------------------
  1 file changed, 58 insertions(+), 448 deletions(-)
 
 commit 769645e00d6d055a4cd802454dbfc1bbfcbee691
@@ -15473,8 +17517,8 @@ Date:	Thu Aug 12 14:11:55 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=625437
 
- gio/gio.override |    2 +-
- glib/pyglib.c	  |    4 ++--
+ gio/gio.override | 2 +-
+ glib/pyglib.c	  | 4 ++--
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 commit e4c4cccb588b258dbcd21702e6cddcfe9ebe4ffc
@@ -15492,7 +17536,7 @@ Date:	Thu Aug 12 11:09:37 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=626684
 
- gi/pygi-invoke.c |    9 ++++++++-
+ gi/pygi-invoke.c | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 commit 0ab967ca40ddcffc2834d4e656bb2010c6b9bdda
@@ -15506,7 +17550,7 @@ Date:	Thu Aug 12 10:46:17 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=626684
 
- gi/pygi-invoke.c |   14 +++-----------
+ gi/pygi-invoke.c | 14 +++-----------
  1 file changed, 3 insertions(+), 11 deletions(-)
 
 commit e17be9cd288fee5d7cb174d9d577eb9279044c67
@@ -15515,7 +17559,7 @@ Date:	Tue Aug 10 17:40:16 2010 +0200
 
     Call valgrind with G_SLICE=always-malloc G_DEBUG=gc-friendly
 
- tests/Makefile.am |	2 +-
+ tests/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 8be59c37dd57acc51875c7189ca09d728b729013
@@ -15524,9 +17568,9 @@ Date:	Wed Aug 4 13:43:17 2010 +0200
 
     Fix some warnings.
 
- gi/pygi-argument.c |	 2 --
- gi/pygi-invoke.c   |	 2 +-
- gi/pygi-struct.c   |	 1 -
+ gi/pygi-argument.c | 2 --
+ gi/pygi-invoke.c   | 2 +-
+ gi/pygi-struct.c   | 1 -
  3 files changed, 1 insertion(+), 4 deletions(-)
 
 commit 529eca6054e9a7e2267f1529e317c2373932762f
@@ -15535,7 +17579,7 @@ Date:	Fri Jul 30 22:39:40 2010 +0200
 
     Add myself as a maintainer
 
- MAINTAINERS |	  4 ++++
+ MAINTAINERS | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit caac75a6ed6f671b37e38a78e71b87906a00ac1b
@@ -15551,11 +17595,11 @@ Date:	Fri Jul 30 14:14:16 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=625653
 
- gi/pygi-boxed.c	 |   50
- +++++++++++++++++++++++++++++++----------------
- gi/pygi-boxed.h	 |   10 ++++++----
- gi/pygi-invoke.c	 |   16 ++++++---------
- tests/test_overrides.py |   39 ++++++++++++++++++------------------
+ gi/pygi-boxed.c	 | 50
+ ++++++++++++++++++++++++++++++++-----------------
+ gi/pygi-boxed.h	 | 10 ++++++----
+ gi/pygi-invoke.c	 | 16 ++++++----------
+ tests/test_overrides.py | 39 +++++++++++++++++++-------------------
  4 files changed, 64 insertions(+), 51 deletions(-)
 
 commit 99c7322898c00a576c7319ea0a7c808446253133
@@ -15566,10 +17610,10 @@ Date:	Fri Jul 30 15:44:21 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=620593
 
- gi/overrides/Gdk.py	 |   48
- +++++++++++++++++++++++++++++++++++++++++++++++
- gi/pygi-invoke.c	 |    4 ----
- tests/test_overrides.py |   10 ++++++++++
+ gi/overrides/Gdk.py	 | 48
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ gi/pygi-invoke.c	 |  4 ----
+ tests/test_overrides.py | 10 ++++++++++
  3 files changed, 58 insertions(+), 4 deletions(-)
 
 commit 55814e722c2ae11310f346790c9221e4fad92b50
@@ -15580,7 +17624,7 @@ Date:	Fri Jul 30 06:30:48 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=625438
 
- gio/gio.override |    5 +++++
+ gio/gio.override | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 477315465d0a6d84b51e146e86e254873bc564ff
@@ -15595,7 +17639,7 @@ Date:	Fri Jul 30 06:43:06 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=625438
 
- gio/gfile.override |	 8 ++++----
+ gio/gfile.override | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit faa7d4eece7ddb698725098970c2478a3b45c4d5
@@ -15611,8 +17655,8 @@ Date:	Fri Jul 30 10:56:01 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=625638
 
- demos/gtk-demo/gtk-demo.py |	 2 ++
- examples/cairo-demo.py     |	 2 ++
+ demos/gtk-demo/gtk-demo.py | 2 ++
+ examples/cairo-demo.py     | 2 ++
  2 files changed, 4 insertions(+)
 
 commit c9da5782e6c633d9af43ee85075e9ee65db09780
@@ -15634,8 +17678,8 @@ Date:	Fri Jul 9 13:14:42 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=623969
 
- gi/pygi-argument.c |	13 +++++--------
- gi/pygi-invoke.c   |	46 ++++++++++++++++++++++++++++++++++++++++------
+ gi/pygi-argument.c | 13 +++++--------
+ gi/pygi-invoke.c   | 46 ++++++++++++++++++++++++++++++++++++++++------
  2 files changed, 45 insertions(+), 14 deletions(-)
 
 commit e0a85305cd107aae5902e524afd074cd8c329927
@@ -15649,7 +17693,7 @@ Date:	Fri Jul 30 10:35:33 2010 +0200
 
     This reverts commit e7bb3954880568884ca66e7751ede689dc2f24f6.
 
- gi/overrides/Gdk.py |	 44 --------------------------------------------
+ gi/overrides/Gdk.py | 44 --------------------------------------------
  1 file changed, 44 deletions(-)
 
 commit 61ffb8d6d08fcfe638f71ea97ceac3a366e5536d
@@ -15662,7 +17706,7 @@ Date:	Thu Jul 29 22:55:28 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=625619
 
- examples/cairo-demo.py |    2 +-
+ examples/cairo-demo.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e7bb3954880568884ca66e7751ede689dc2f24f6
@@ -15673,7 +17717,7 @@ Date:	Tue Jul 27 21:37:16 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=620593
 
- gi/overrides/Gdk.py |	 44 ++++++++++++++++++++++++++++++++++++++++++++
+ gi/overrides/Gdk.py | 44 ++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 44 insertions(+)
 
 commit 0a9f1da052fd33dcef81d0e267fc7972f02c7888
@@ -15689,25 +17733,25 @@ Date:	Wed Jul 28 14:56:00 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=625488
 
- Makefile.am		    |	 5 ----
- tests/Makefile.am	    |	65
- ++++++++++++++++++++------------------------
- tests/common.py	    |	47 --------------------------------
- tests/runtests.py	    |	43 +++++++++++------------------
- tests/test_gcancellable.py |	 4 +--
- tests/test_gi.py	    |	 3 --
- tests/test_gicon.py	    |	 3 +-
- tests/test_gio.py	    |	 3 +-
- tests/test_gobject.py	    |	 3 +-
- tests/test_gresolver.py    |	 4 +--
- tests/test_gsocket.py	    |	 4 ++-
- tests/test_interface.py    |	 6 +++-
- tests/test_mainloop.py     |	11 +++-----
- tests/test_signal.py	    |	 4 ++-
- tests/test_source.py	    |	 4 +--
- tests/test_subprocess.py   |	 5 +---
- tests/test_thread.py	    |	 5 +++-
- tests/test_unknown.py	    |	 5 +++-
+ Makefile.am		    |  5 ----
+ tests/Makefile.am	    | 65
+ +++++++++++++++++++++-------------------------
+ tests/common.py	    | 47 ---------------------------------
+ tests/runtests.py	    | 43 ++++++++++++------------------
+ tests/test_gcancellable.py |  4 +--
+ tests/test_gi.py	    |  3 ---
+ tests/test_gicon.py	    |  3 ++-
+ tests/test_gio.py	    |  3 ++-
+ tests/test_gobject.py	    |  3 ++-
+ tests/test_gresolver.py    |  4 +--
+ tests/test_gsocket.py	    |  4 ++-
+ tests/test_interface.py    |  6 ++++-
+ tests/test_mainloop.py     | 11 +++-----
+ tests/test_signal.py	    |  4 ++-
+ tests/test_source.py	    |  4 +--
+ tests/test_subprocess.py   |  5 +---
+ tests/test_thread.py	    |  5 +++-
+ tests/test_unknown.py	    |  5 +++-
  18 files changed, 82 insertions(+), 142 deletions(-)
 
 commit 82f4cb5ebf5d992493b7a2f74cfd5f175e19eb76
@@ -15716,7 +17760,7 @@ Date:	Thu Jul 29 12:34:19 2010 +0200
 
     Add some more transformations to pygi-convert.sh
 
- pygi-convert.sh |   37 +++++++++++++++++++++++++++++--------
+ pygi-convert.sh | 37 +++++++++++++++++++++++++++++--------
  1 file changed, 29 insertions(+), 8 deletions(-)
 
 commit de519adcd21947a0aef7932cdecb78cef200c85e
@@ -15725,8 +17769,8 @@ Date:	Wed Jul 28 14:42:36 2010 +0200
 
     Adapt to API changes: g_irepository_enumerate_versions
 
- gi/importer.py       |    2 +-
- gi/pygi-repository.c |   12 ++++++------
+ gi/importer.py       |  2 +-
+ gi/pygi-repository.c | 12 ++++++------
  2 files changed, 7 insertions(+), 7 deletions(-)
 
 commit 01cd9abb43f93f9a57a5a05b6dc9560614e666e3
@@ -15735,7 +17779,7 @@ Date:	Wed Jul 28 12:26:48 2010 +0200
 
     Add GValue<->GArgument marshalling for some more types
 
- gi/pygi-property.c |	37 ++++++++++++++++++++++++++++++++++++-
+ gi/pygi-property.c | 37 ++++++++++++++++++++++++++++++++++++-
  1 file changed, 36 insertions(+), 1 deletion(-)
 
 commit ddffa70c3ee0e837070f390632bc692430f79171
@@ -15745,7 +17789,7 @@ Date:	Wed Jul 28 11:10:42 2010 +0200
     Chain up with the non-introspection implementation for properties
     if needed
 
- gobject/pygobject.c |	  7 ++++++-
+ gobject/pygobject.c | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 commit 045433a1f8167205dc8eae613dcb8835d02c8916
@@ -15755,7 +17799,7 @@ Date:	Wed Jul 28 10:59:49 2010 +0200
     Improve error reporting for missing attributes in introspection
     modules
 
- gi/module.py |    4 ++--
+ gi/module.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 6655a79b2f13fe417aefdf6aebab0f2d6162ba00
@@ -15770,16 +17814,16 @@ Date:	Tue Jul 27 21:52:49 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=620808
 
- gi/Makefile.am		  |    2 +
- gi/gimodule.c		  |    2 +
- gi/pygi-argument.c	  |    2 +
- gi/pygi-private.h	  |    1 +
- gi/pygi-property.c	  |  226
- ++++++++++++++++++++++++++++++++++++++++++++++
- gi/pygi-property.h	  |   39 ++++++++
- gi/pygi.h		  |   41 +++++++++
- gobject/pygobject.c	  |    9 ++
- tests/test_everything.py |   19 ++++
+ gi/Makefile.am		  |   2 +
+ gi/gimodule.c		  |   2 +
+ gi/pygi-argument.c	  |   2 +
+ gi/pygi-private.h	  |   1 +
+ gi/pygi-property.c	  | 226
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ gi/pygi-property.h	  |  39 ++++++++
+ gi/pygi.h		  |  41 +++++++++
+ gobject/pygobject.c	  |   9 ++
+ tests/test_everything.py |  19 ++++
  9 files changed, 341 insertions(+)
 
 commit 85f4572b3ffbfa364ebb2e470eab759edc557b36
@@ -15788,7 +17832,7 @@ Date:	Tue Jul 27 21:32:41 2010 +0200
 
     Readd Gdk.Rectangle override for Gtk-2.0
 
- gi/overrides/Gdk.py |	 19 +++++++++++++++++++
+ gi/overrides/Gdk.py | 19 +++++++++++++++++++
  1 file changed, 19 insertions(+)
 
 commit 2082ee35e2a33f52bf1e8ec49cb4a43398e91989
@@ -15803,14 +17847,14 @@ Date:	Tue Jul 27 18:25:27 2010 +0200
     * gi/pygi-repository.c: Add wrappers for g_irepository_enumerate and
       g_irepository_get_version.
 
- gi/importer.py			    |	26 ++++++----------
- gi/module.py			    |	58
- +++++++++++++++++++++++-------------
- gi/overrides/GIMarshallingTests.py |	 2 +-
- gi/overrides/Gdk.py		    |	 2 +-
- gi/overrides/Gtk.py		    |	 2 +-
- gi/pygi-repository.c		    |	56
- +++++++++++++++++++++++++++++++++-
+ gi/importer.py			    | 26 ++++++-----------
+ gi/module.py			    | 58
+ +++++++++++++++++++++++++-------------
+ gi/overrides/GIMarshallingTests.py |  2 +-
+ gi/overrides/Gdk.py		    |  2 +-
+ gi/overrides/Gtk.py		    |  2 +-
+ gi/pygi-repository.c		    | 56
+ +++++++++++++++++++++++++++++++++++-
  6 files changed, 105 insertions(+), 41 deletions(-)
 
 commit 6d7ed6c322234c240b1063a1dfaadd17157432a9
@@ -15822,7 +17866,7 @@ Date:	Tue Jul 13 20:27:28 2010 +1000
 
     https://bugzilla.gnome.org/show_bug.cgi?id=624232
 
- gi/pygi-callbacks.c |	  3 ++-
+ gi/pygi-callbacks.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 7e9cbd5601ad548b78d106bac1a1576d33b91c65
@@ -15835,7 +17879,7 @@ Date:	Mon Jul 26 17:00:23 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=625326
 
- tests/testhelpermodule.c |    2 +-
+ tests/testhelpermodule.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 5ca2a41f16f4a5fcc3ab4d00bec46b077c7eb384
@@ -15846,8 +17890,8 @@ Date:	Thu Jul 8 11:36:12 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=622584
 
- gi/pygi-argument.c |	23 +++++++++++++++++++++--
- tests/test_gi.py   |	 6 ++++--
+ gi/pygi-argument.c | 23 +++++++++++++++++++++--
+ tests/test_gi.py   |  6 ++++--
  2 files changed, 25 insertions(+), 4 deletions(-)
 
 commit 890c3233f8a9f884b045a294bf0122bb3afcd54a
@@ -15858,7 +17902,7 @@ Date:	Sun Jul 25 17:30:40 2010 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=625095
 
- gi/pygi-callbacks.c |	  3 ++-
+ gi/pygi-callbacks.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 1162e436273ff8e9e4e24bd8ba74615fd4624753
@@ -15874,9 +17918,9 @@ Date:	Thu Jun 24 10:07:12 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=622605
 
- gi/pygi-argument.c	  |    8 +-------
- tests/test_everything.py |   27 +++++++++++++++++++++++++++
- tests/test_overrides.py  |    6 ++----
+ gi/pygi-argument.c	  |  8 +-------
+ tests/test_everything.py | 27 +++++++++++++++++++++++++++
+ tests/test_overrides.py  |  6 ++----
  3 files changed, 30 insertions(+), 11 deletions(-)
 
 commit 8becd32fc042445d62b885bac12dac326b2dc1fa
@@ -15885,7 +17929,7 @@ Date:	Mon Jul 26 11:54:47 2010 +0200
 
     Increase a bit verbosity of tests so people know which test failed
 
- tests/runtests.py |	2 +-
+ tests/runtests.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 3b3c63514f311592e6769a373d37a2bde7ea6b38
@@ -15894,9 +17938,9 @@ Date:	Thu Jul 15 15:17:53 2010 +0200
 
     Actually add the files for GVariant foreign structs
 
- gi/pygi-foreign-gvariant.c |	63
- ++++++++++++++++++++++++++++++++++++++++++++
- gi/pygi-foreign-gvariant.h |	41 ++++++++++++++++++++++++++++
+ gi/pygi-foreign-gvariant.c | 63
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ gi/pygi-foreign-gvariant.h | 41 ++++++++++++++++++++++++++++++
  2 files changed, 104 insertions(+)
 
 commit e65275bc57f345c111eb12a6b4476ff1ddc3bc24
@@ -15914,16 +17958,16 @@ Date:	Thu Jul 15 13:31:33 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=619501
 
- gi/Makefile.am		  |    2 +
- gi/pygi-argument.c	  |    2 +-
- gi/pygi-foreign-cairo.c  |   16 +++----
- gi/pygi-foreign.c	  |  107
- ++++++++++++++++++++++++++++------------------
- gi/pygi-foreign.h	  |    7 ++-
- gi/pygi-invoke.c	  |   18 ++++----
- gi/pygi-struct.c	  |   10 ++++-
- gi/pygi.h		  |    9 ++--
- tests/test_everything.py |    8 ++++
+ gi/Makefile.am		  |   2 +
+ gi/pygi-argument.c	  |   2 +-
+ gi/pygi-foreign-cairo.c  |  16 +++----
+ gi/pygi-foreign.c	  | 107
+ +++++++++++++++++++++++++++++------------------
+ gi/pygi-foreign.h	  |   7 ++--
+ gi/pygi-invoke.c	  |  18 ++++----
+ gi/pygi-struct.c	  |  10 ++++-
+ gi/pygi.h		  |   9 ++--
+ tests/test_everything.py |   8 ++++
  9 files changed, 110 insertions(+), 69 deletions(-)
 
 commit 3b3bd4da3fbc993fa7f7cfb46ed4e67671c94cc0
@@ -15932,7 +17976,7 @@ Date:	Mon Jul 12 11:19:06 2010 +0200
 
     Add HACKING to MANIFEST.in
 
- MANIFEST.in |	  2 +-
+ MANIFEST.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 40bf08ff001b119c7daf709197005ef6480216c5
@@ -15941,7 +17985,7 @@ Date:	Mon Jul 12 11:18:04 2010 +0200
 
     Add HACKING file with instructions for releasing
 
- HACKING |   14 ++++++++++++++
+ HACKING | 14 ++++++++++++++
  1 file changed, 14 insertions(+)
 
 commit 3b9dffe7cc3820dfb84fd968fc604899601c5dc4
@@ -15950,7 +17994,7 @@ Date:	Mon Jul 12 11:09:58 2010 +0200
 
     Post release version bump to 2.21.6
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 42a5a0897b38156ae010c396ea254abf502f35de
@@ -15959,7 +18003,7 @@ Date:	Mon Jul 12 11:00:29 2010 +0200
 
     Update NEWS and release PyGObject-2.21.5
 
- NEWS |   17 +++++++++++++++++
+ NEWS | 17 +++++++++++++++++
  1 file changed, 17 insertions(+)
 
 commit 5857f25c1c6e25b79e6134558bd7151bc6c30ef7
@@ -15968,7 +18012,7 @@ Date:	Mon Jul 12 11:00:20 2010 +0200
 
     Pre-release version bump to 2.21.5
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e500adc3ac19ef6f436809e5a8828ac7e8db28f6
@@ -15981,9 +18025,9 @@ Date:	Sat Jul 10 22:35:13 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=624066
 
- gi/pygi-callbacks.c |	  1 -
- gi/pygi-closure.c   |	  2 +-
- gi/pygi-invoke.c    |	  1 -
+ gi/pygi-callbacks.c | 1 -
+ gi/pygi-closure.c   | 2 +-
+ gi/pygi-invoke.c    | 1 -
  3 files changed, 1 insertion(+), 3 deletions(-)
 
 commit 2efa18afbcc2fac1c90958535b2f80e6e730ee56
@@ -16004,13 +18048,13 @@ Date:	Mon Jul 12 10:31:42 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=624065
 
- configure.ac	    |	 2 +-
- gi/importer.py     |	 7 +--
- gi/pygi-argument.c |  146
- ----------------------------------------------------
- gi/pygi-closure.c  |	10 ----
- gi/pygi-info.c     |	37 -------------
- tests/test_gi.py   |	21 --------
+ configure.ac	    |	2 +-
+ gi/importer.py     |	7 +--
+ gi/pygi-argument.c | 146
+ -----------------------------------------------------
+ gi/pygi-closure.c  |  10 ----
+ gi/pygi-info.c     |  37 --------------
+ tests/test_gi.py   |  21 --------
  6 files changed, 5 insertions(+), 218 deletions(-)
 
 commit 27a417c71f8c122e46c7472663bb25c17413f103
@@ -16020,18 +18064,18 @@ Date:	Thu Jul 8 16:01:25 2010 -0400
     pass in the demo app so demos can use utility methods like requesting
     file paths
 
- demos/gtk-demo/demos/Entry/entry_buffer.py	|    2 +-
- demos/gtk-demo/demos/Entry/entry_completion.py |    2 +-
- demos/gtk-demo/demos/appwindow.py		|   13 +++++++++++--
- demos/gtk-demo/demos/assistant.py		|    2 +-
- demos/gtk-demo/demos/builder.py		|   14 ++++++++++----
- demos/gtk-demo/demos/button_box.py		|    2 +-
- demos/gtk-demo/demos/clipboard.py		|    8 +-------
- demos/gtk-demo/demos/colorselector.py		|    2 +-
- demos/gtk-demo/demos/combobox.py		|    8 +++++---
- demos/gtk-demo/demos/drawingarea.py		|    2 +-
- demos/gtk-demo/demos/test.py			|    2 +-
- demos/gtk-demo/gtk-demo.py			|    6 +++---
+ demos/gtk-demo/demos/Entry/entry_buffer.py	|  2 +-
+ demos/gtk-demo/demos/Entry/entry_completion.py |  2 +-
+ demos/gtk-demo/demos/appwindow.py		| 13 +++++++++++--
+ demos/gtk-demo/demos/assistant.py		|  2 +-
+ demos/gtk-demo/demos/builder.py		| 14 ++++++++++----
+ demos/gtk-demo/demos/button_box.py		|  2 +-
+ demos/gtk-demo/demos/clipboard.py		|  8 +-------
+ demos/gtk-demo/demos/colorselector.py		|  2 +-
+ demos/gtk-demo/demos/combobox.py		|  8 +++++---
+ demos/gtk-demo/demos/drawingarea.py		|  2 +-
+ demos/gtk-demo/demos/test.py			|  2 +-
+ demos/gtk-demo/gtk-demo.py			|  6 +++---
  12 files changed, 37 insertions(+), 26 deletions(-)
 
 commit e7daae919c2c6ae35d3927f0006252aacd49ea86
@@ -16044,9 +18088,9 @@ Date:	Thu Jul 8 15:38:07 2010 -0400
     * fix some flag handling
     * use get_indicies_with_depth instead of get_indices for paths
 
- demos/gtk-demo/demos/appwindow.py |   10 +++++++---
- demos/gtk-demo/demos/combobox.py  |   24 ++++++++++++------------
- demos/gtk-demo/gtk-demo.py	   |   13 +++++--------
+ demos/gtk-demo/demos/appwindow.py | 10 +++++++---
+ demos/gtk-demo/demos/combobox.py  | 24 ++++++++++++------------
+ demos/gtk-demo/gtk-demo.py	   | 13 +++++--------
  3 files changed, 24 insertions(+), 23 deletions(-)
 
 commit 3d9fd6391710cc33058394d6821e4d4e11f09b22
@@ -16055,7 +18099,7 @@ Date:	Thu Jul 8 12:54:43 2010 -0400
 
     override test fixes for new GTK+ annotations
 
- tests/test_overrides.py |   23 +++++++++++++----------
+ tests/test_overrides.py | 23 +++++++++++++----------
  1 file changed, 13 insertions(+), 10 deletions(-)
 
 commit 7a400f8139b70ddfe7c949035e0851689951c647
@@ -16064,7 +18108,7 @@ Date:	Thu Jul 8 12:42:25 2010 +0200
 
     Fix warning.
 
- gi/pygi-argument.c |	 4 ++--
+ gi/pygi-argument.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 39fd0a85a3de06b1b877d1125f91036409886373
@@ -16078,8 +18122,8 @@ Date:	Wed Jul 7 15:48:36 2010 -0400
       handle the case where the parameter is followed by a regular
       in parameter
 
- gi/overrides/Gtk.py	 |    7 +++----
- tests/test_overrides.py |   21 +++++++++++----------
+ gi/overrides/Gtk.py	 |  7 +++----
+ tests/test_overrides.py | 21 +++++++++++----------
  2 files changed, 14 insertions(+), 14 deletions(-)
 
 commit 4d970b75dc5c75c1bec04cb2954c9985b476070c
@@ -16088,8 +18132,8 @@ Date:	Tue Jul 6 17:50:10 2010 -0400
 
     add entry completion demo
 
- demos/gtk-demo/demos/Entry/entry_completion.py |   87
- ++++++++++++++++++++++++
+ demos/gtk-demo/demos/Entry/entry_completion.py | 87
+ ++++++++++++++++++++++++++
  1 file changed, 87 insertions(+)
 
 commit f3531eaa1bfa4e01651d35cd587384d30a398ba8
@@ -16098,7 +18142,7 @@ Date:	Tue Jul 6 17:49:18 2010 -0400
 
     string changes
 
- demos/gtk-demo/demos/Entry/entry_buffer.py |	 4 ++--
+ demos/gtk-demo/demos/Entry/entry_buffer.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit baf1e9bb550c7bf45e2ac0b70ba29c434ef1ccc6
@@ -16107,8 +18151,8 @@ Date:	Tue Jul 6 17:27:04 2010 -0400
 
     add the Entry demo directory and the entry_buffer demo
 
- demos/gtk-demo/demos/Entry/entry_buffer.py |	73
- ++++++++++++++++++++++++++++
+ demos/gtk-demo/demos/Entry/entry_buffer.py | 73
+ ++++++++++++++++++++++++++++++
  1 file changed, 73 insertions(+)
 
 commit f2b1d222120f055bec9339cca55c9cc90f538c00
@@ -16117,7 +18161,7 @@ Date:	Tue Jul 6 17:26:03 2010 -0400
 
     fix loading of demo modules to support sub modules
 
- demos/gtk-demo/gtk-demo.py |	 9 +++++++--
+ demos/gtk-demo/gtk-demo.py | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 commit 4f9390fb1892b13ab2ea00ed66c5000a40f09029
@@ -16126,8 +18170,8 @@ Date:	Tue Jul 6 15:56:34 2010 -0400
 
     add the ability to have demos in sub catagories
 
- demos/gtk-demo/gtk-demo.py |	76
- +++++++++++++++++++++++++++++++-------------
+ demos/gtk-demo/gtk-demo.py | 76
+ ++++++++++++++++++++++++++++++++--------------
  1 file changed, 54 insertions(+), 22 deletions(-)
 
 commit dc2249a3ecf339008351316217191d0551ccc588
@@ -16138,7 +18182,7 @@ Date:	Mon Jul 5 14:36:59 2010 -0400
 
     Fixes bug #623486.
 
- gi/module.py |    1 +
+ gi/module.py | 1 +
  1 file changed, 1 insertion(+)
 
 commit 2357bca8d14539894b6bd0acfdc18d30b4bb4db6
@@ -16151,7 +18195,7 @@ Date:	Mon Jul 5 16:11:07 2010 +0200
     to override
     it anymore.
 
- gi/overrides/Gdk.py |	 19 -------------------
+ gi/overrides/Gdk.py | 19 -------------------
  1 file changed, 19 deletions(-)
 
 commit daca09dc2c2306d4fa82a68bbdd147d4b170a1e7
@@ -16162,8 +18206,8 @@ Date:	Tue Jun 29 16:37:36 2010 +0100
 
     Closes: bgo#622882
 
- gi/overrides/Gtk.py	 |   11 +++++++++--
- tests/test_overrides.py |    5 +++++
+ gi/overrides/Gtk.py	 | 11 +++++++++--
+ tests/test_overrides.py |  5 +++++
  2 files changed, 14 insertions(+), 2 deletions(-)
 
 commit bb8adb7f02f0c5494df2cb6e535e44d23902e8f5
@@ -16172,7 +18216,7 @@ Date:	Tue Jun 29 11:27:13 2010 +0200
 
     Update NEWS and release PyGObject-2.21.4
 
- NEWS |   27 +++++++++++++++++++++++++--
+ NEWS | 27 +++++++++++++++++++++++++--
  1 file changed, 25 insertions(+), 2 deletions(-)
 
 commit 2d473ee17be4671244bb4a2a0953a21ccf2a0df6
@@ -16181,8 +18225,8 @@ Date:	Tue Jun 29 10:55:03 2010 +0200
 
     Remove files from the makefiles
 
- gi/Makefile.am      |	  4 +---
- gobject/Makefile.am |	  3 +--
+ gi/Makefile.am      | 4 +---
+ gobject/Makefile.am | 3 +--
  2 files changed, 2 insertions(+), 5 deletions(-)
 
 commit 89827314fd183eac07443c8e9d275ca9d4ce59df
@@ -16194,16 +18238,16 @@ Date:	Tue Jun 29 10:27:39 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=623021
 
- configure.ac		 |    2 +
- gi/Makefile.am		 |   38 +++++++++-----
- gi/gimodule.c		 |    8 +--
- gi/pygi-argument.c	 |   10 +---
- gi/pygi-foreign-cairo.c |   56 +++++++++++++++------
- gi/pygi-foreign-cairo.h |   55 ---------------------
- gi/pygi-foreign.c	 |  125
- ++++++++++++++++++++++++++++-------------------
- gi/pygi-foreign.h	 |   31 ++++++------
- gi/pygi.h		 |   40 +++++++++++++--
+ configure.ac		 |   2 +
+ gi/Makefile.am		 |  38 ++++++++++-----
+ gi/gimodule.c		 |   8 +---
+ gi/pygi-argument.c	 |  10 +---
+ gi/pygi-foreign-cairo.c |  56 ++++++++++++++++------
+ gi/pygi-foreign-cairo.h |  55 ---------------------
+ gi/pygi-foreign.c	 | 125
+ ++++++++++++++++++++++++++++--------------------
+ gi/pygi-foreign.h	 |  31 ++++++------
+ gi/pygi.h		 |  40 ++++++++++++++--
  9 files changed, 196 insertions(+), 169 deletions(-)
 
 commit a6a90551311bc64f037cbd442e13f70c30060871
@@ -16214,18 +18258,18 @@ Date:	Mon Jun 28 14:20:43 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=623021
 
- gi/gimodule.c		 |    8 +++---
- gi/pygi-type.c		 |    4 +--
- gi/pygi-type.h		 |    2 +-
- gi/pygi.h		 |   54 ++++++++++++++++----------------------
- gobject/Makefile.am	 |    6 +++++
- gobject/pygboxed.c	 |    2 +-
- gobject/pygenum.c	 |    2 +-
- gobject/pygflags.c	 |    2 +-
- gobject/pygi-external.h |   67
- -----------------------------------------------
- gobject/pygobject.c	 |    2 +-
- gobject/pygpointer.c	 |    2 +-
+ gi/gimodule.c		 |  8 +++---
+ gi/pygi-type.c		 |  4 +--
+ gi/pygi-type.h		 |  2 +-
+ gi/pygi.h		 | 54 ++++++++++++++++-----------------------
+ gobject/Makefile.am	 |  6 +++++
+ gobject/pygboxed.c	 |  2 +-
+ gobject/pygenum.c	 |  2 +-
+ gobject/pygflags.c	 |  2 +-
+ gobject/pygi-external.h | 67
+ -------------------------------------------------
+ gobject/pygobject.c	 |  2 +-
+ gobject/pygpointer.c	 |  2 +-
  11 files changed, 40 insertions(+), 111 deletions(-)
 
 commit 8b3a3baacb45cb3f9112f7597607602fa89c6634
@@ -16241,8 +18285,8 @@ Date:	Fri Jun 25 13:54:57 2010 +0200
 	gi/gimodule.c
 	tests/test_everything.py
 
- gi/gimodule.c		  |   13 -------------
- tests/test_everything.py |    3 ++-
+ gi/gimodule.c		  | 13 -------------
+ tests/test_everything.py |  3 ++-
  2 files changed, 2 insertions(+), 14 deletions(-)
 
 commit 0f2a09d7eae63abb71723b7cd8fb290dcba33426
@@ -16254,9 +18298,9 @@ Date:	Fri Jun 25 13:49:04 2010 +0200
     * gi/pygi-argument.c, gi/pygi-info.c: Zero two GArgument instances.
     * gi/pygi-invoke.c: workaround bgo#622711 and zero invocation_state.
 
- gi/pygi-argument.c |	 1 +
- gi/pygi-info.c     |	 2 ++
- gi/pygi-invoke.c   |	 8 ++++++--
+ gi/pygi-argument.c | 1 +
+ gi/pygi-info.c     | 2 ++
+ gi/pygi-invoke.c   | 8 ++++++--
  3 files changed, 9 insertions(+), 2 deletions(-)
 
 commit 63afe55906c8637e913783e65b82b540b81bed65
@@ -16265,8 +18309,8 @@ Date:	Thu Jun 24 16:13:37 2010 -0400
 
     add drawing area demo
 
- demos/gtk-demo/demos/drawingarea.py |	249
- +++++++++++++++++++++++++++++++++++
+ demos/gtk-demo/demos/drawingarea.py | 249
+ ++++++++++++++++++++++++++++++++++++
  1 file changed, 249 insertions(+)
 
 commit 8bba5f842393a284367cdd15f3d32a8c7745516a
@@ -16275,7 +18319,7 @@ Date:	Thu Jun 24 14:11:00 2010 -0400
 
     sort the demo list
 
- demos/gtk-demo/gtk-demo.py |	 2 ++
+ demos/gtk-demo/gtk-demo.py | 2 ++
  1 file changed, 2 insertions(+)
 
 commit b9da82742701ed276b01dee39626cd71cbef8556
@@ -16284,7 +18328,7 @@ Date:	Thu Jun 24 13:56:18 2010 -0400
 
     rename iter to treeiter so we aren't using a python reserved word
 
- demos/gtk-demo/gtk-demo.py |	12 ++++++------
+ demos/gtk-demo/gtk-demo.py | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 commit c93935621f2fb1ff5e8c424ae884bd684ea68e50
@@ -16296,7 +18340,7 @@ Date:	Thu Jun 24 13:47:54 2010 -0400
     * Part of buffer API dealing with TextIter now marked (out
     caller-allocates)
 
- demos/gtk-demo/gtk-demo.py |	10 ++++------
+ demos/gtk-demo/gtk-demo.py | 10 ++++------
  1 file changed, 4 insertions(+), 6 deletions(-)
 
 commit 8d9516a593a515290109401a9db7aa259b5aa35c
@@ -16320,9 +18364,9 @@ Date:	Wed Jun 23 17:04:33 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=620405
 
- gi/overrides/Gtk.py	 |   59 ++++++++++++++++++++++++++++++++++++++++
- tests/test_overrides.py |   69
- +++++++++++++++++++++++++++++++++++++++++++++++
+ gi/overrides/Gtk.py	 | 59 ++++++++++++++++++++++++++++++++++++++++++
+ tests/test_overrides.py | 69
+ +++++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 128 insertions(+)
 
 commit c305fbeb7bdb44623d5198f4a8f0a374d529fdf4
@@ -16334,7 +18378,7 @@ Date:	Wed Jun 23 14:34:28 2010 -0300
     Since we're no longer pulling in pygobject cflags,
     add this to be able to include pygobject.h
 
- gi/Makefile.am |    3 +++
+ gi/Makefile.am | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 53a093198851e3ba5abd1f6c3314737decd401d8
@@ -16343,7 +18387,7 @@ Date:	Wed Jun 23 18:09:19 2010 +0200
 
     Add unit test for add_actions user data.
 
- tests/test_overrides.py |   20 +++++++++++++++-----
+ tests/test_overrides.py | 20 +++++++++++++++-----
  1 file changed, 15 insertions(+), 5 deletions(-)
 
 commit 7f829af620cba768de619dd9f228d5d2ebf7fee4
@@ -16352,7 +18396,7 @@ Date:	Wed Jun 23 18:06:46 2010 +0200
 
     Pass user_data param when adding actions
 
- gi/overrides/Gtk.py |	 12 ++++++------
+ gi/overrides/Gtk.py | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 commit 8f537ccd62f41ebe0db3853e2ae08080666f598f
@@ -16363,7 +18407,7 @@ Date:	Wed Jun 23 12:02:04 2010 -0400
 
     * we should always specify what exception types we are expecting
 
- gi/overrides/Gtk.py |	  6 +++---
+ gi/overrides/Gtk.py | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit f140a8ebf59347162b67b550bd6f62d2eafad29a
@@ -16377,7 +18421,7 @@ Date:	Wed Jun 23 12:31:51 2010 -0300
 
     https://bugzilla.gnome.org/show_bug.cgi?id=622503
 
- configure.ac |    9 +++++----
+ configure.ac | 9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)
 
 commit e8bd25355fbe7de38a28b7a0583167a2c0ffc31f
@@ -16392,10 +18436,10 @@ Date:	Tue Jun 22 15:03:08 2010 -0400
     * test the ability to send in both None and empty list for arrays
     and lists
 
- gi/pygi-argument.c	  |    7 ++--
- tests/test_everything.py |    5 ++-
- tests/test_gi.py	  |   84
- +++++++++++++++++++++++-----------------------
+ gi/pygi-argument.c	  |  7 ++--
+ tests/test_everything.py |  5 ++-
+ tests/test_gi.py	  | 84
+ ++++++++++++++++++++++++------------------------
  3 files changed, 49 insertions(+), 47 deletions(-)
 
 commit f312e6a49505eca07815146cfbdb0e48e5b3b8a8
@@ -16411,14 +18455,14 @@ Date:	Wed Jun 23 15:42:29 2010 +0200
      * tests/common.py: Don't add the src dir to the python path
      * tests/runtests.py: Don't pass the src dir to common.py
 
- Makefile.am	     |	  4 +++-
- gi/Makefile.am      |	  1 +
- gio/Makefile.am     |	  1 +
- glib/Makefile.am    |	  2 +-
- gobject/Makefile.am |	  1 +
- tests/Makefile.am   |	 17 ++---------------
- tests/common.py     |	  3 +--
- tests/runtests.py   |	 12 +++++-------
+ Makefile.am	     |	4 +++-
+ gi/Makefile.am      |	1 +
+ gio/Makefile.am     |	1 +
+ glib/Makefile.am    |	2 +-
+ gobject/Makefile.am |	1 +
+ tests/Makefile.am   | 17 ++---------------
+ tests/common.py     |	3 +--
+ tests/runtests.py   | 12 +++++-------
  8 files changed, 15 insertions(+), 26 deletions(-)
 
 commit 5f82e7d2909cbbbecbf5dbee2342f516c0d1f371
@@ -16428,11 +18472,11 @@ Date:	Wed Jun 23 13:59:14 2010 +0200
     Allow building pygobject without introspection support by providing
     --disable-introspection to configure.
 
- Makefile.am		 |    6 +++++-
- configure.ac		 |   15 ++++++++-------
- gobject/pygi-external.h |    4 ++--
- tests/Makefile.am	 |    8 ++++++--
- tests/runtests.py	 |   21 +++++++--------------
+ Makefile.am		 |  6 +++++-
+ configure.ac		 | 15 ++++++++-------
+ gobject/pygi-external.h |  4 ++--
+ tests/Makefile.am	 |  8 ++++++--
+ tests/runtests.py	 | 21 +++++++--------------
  5 files changed, 28 insertions(+), 26 deletions(-)
 
 commit cc3ea77318ee572673d2a044deca9001366b0f08
@@ -16444,7 +18488,7 @@ Date:	Wed Jun 23 12:26:51 2010 +0200
     Because Python's optparse will try to do things on it that can
     only be done with list.
 
- gi/overrides/Gtk.py |	  2 +-
+ gi/overrides/Gtk.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 3d72b8248cc534a689dee5679a729b2fba56c528
@@ -16454,7 +18498,7 @@ Date:	Wed Jun 23 12:26:02 2010 +0200
     Force loading the GObject typelib so we have available the wrappers
     for base classes such as GInitiallyUnowned.
 
- gi/__init__.py |    3 +++
+ gi/__init__.py | 3 +++
  1 file changed, 3 insertions(+)
 
 commit c7c94ef349c30597f2f10d90f74718d678ec7add
@@ -16465,7 +18509,7 @@ Date:	Tue Jun 22 14:45:48 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=622425
 
- gi/pygi-info.c |    5 +++--
+ gi/pygi-info.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit fb1ee243493616d7a7e4f6924c574db39f5a423d
@@ -16481,7 +18525,7 @@ Date:	Tue Jun 22 15:39:46 2010 -0400
 
     remove unneeded TextIter creation in the tests
 
- tests/test_overrides.py |    3 ---
+ tests/test_overrides.py | 3 ---
  1 file changed, 3 deletions(-)
 
 commit 53c355d2cc0894e7f551e9b4eb719b89188a978e
@@ -16499,9 +18543,9 @@ Date:	Mon Jun 21 11:42:12 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=620583
 
- gi/overrides/Gtk.py	 |   51
- +++++++++++++++++++++++++++++++++++++++++++++++
- tests/test_overrides.py |   25 +++++++++++++++++++++++
+ gi/overrides/Gtk.py	 | 51
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ tests/test_overrides.py | 25 ++++++++++++++++++++++++
  2 files changed, 76 insertions(+)
 
 commit 1d89a88b212c7411ad28e74eda80ae751de92e50
@@ -16517,8 +18561,8 @@ Date:	Tue Jun 22 12:46:39 2010 -0400
     targets like
       make check.gdb work
 
- configure.ac	   |	2 +-
- tests/Makefile.am |	2 +-
+ configure.ac	   | 2 +-
+ tests/Makefile.am | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 4fe0d94c219deb69a2309693202309c53a0e5e69
@@ -16541,9 +18585,9 @@ Date:	Tue Jun 22 11:50:30 2010 -0400
       after each override.  This creates distinct blocks of changed text
       which will not conflict
 
- gi/overrides/GIMarshallingTests.py |	10 ++++------
- gi/overrides/Gdk.py		    |	 8 ++++----
- gi/overrides/Gtk.py		    |	 7 +++++--
+ gi/overrides/GIMarshallingTests.py | 10 ++++------
+ gi/overrides/Gdk.py		    |  8 ++++----
+ gi/overrides/Gtk.py		    |  7 +++++--
  3 files changed, 13 insertions(+), 12 deletions(-)
 
 commit 49321b934603e1ec69fb04082c63902970907d2b
@@ -16552,9 +18596,9 @@ Date:	Sun Jun 20 13:27:34 2010 +0200
 
     Override Dialog constructor and add_buttons method
 
- gi/overrides/Gtk.py	 |   46
+ gi/overrides/Gtk.py	 | 46
  +++++++++++++++++++++++++++++++++++++++++++++-
- tests/test_overrides.py |   16 ++++++++++++++++
+ tests/test_overrides.py | 16 ++++++++++++++++
  2 files changed, 61 insertions(+), 1 deletion(-)
 
 commit acf7b43a41ce814f0c57ce609a090826f04771db
@@ -16563,7 +18607,7 @@ Date:	Mon Jun 21 18:17:38 2010 +0200
 
     Post release version bump to 2.21.4
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a7fa8b80406227a06cf18f8675dbc1f471283829
@@ -16572,7 +18616,7 @@ Date:	Mon Jun 21 18:10:32 2010 +0200
 
     Update NEWS and release PyGObject-2.21.3
 
- NEWS |    7 +++++++
+ NEWS | 7 +++++++
  1 file changed, 7 insertions(+)
 
 commit 79acac7b86ec52cd3681d94d7f116314c3f00167
@@ -16583,8 +18627,8 @@ Date:	Tue Jul 21 16:28:34 2009 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=589253
 
- codegen/codegen.py	   |	2 ++
- codegen/reversewrapper.py |   18 +++++++++++++++---
+ codegen/codegen.py	   |  2 ++
+ codegen/reversewrapper.py | 18 +++++++++++++++---
  2 files changed, 17 insertions(+), 3 deletions(-)
 
 commit 259a4b08f009aa01451caed20dbb6e68b402da2a
@@ -16593,7 +18637,7 @@ Date:	Mon Jun 21 17:34:54 2010 +0200
 
     Add *~ and *.orig to .gitignore
 
- .gitignore |	 5 ++++-
+ .gitignore | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit 00a85f6a844714d1715e2f67431747d1a4cdacb1
@@ -16611,15 +18655,15 @@ Date:	Mon Jun 21 17:33:56 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=583909
 
- gobject/gobjectmodule.c  |    2 -
- gobject/pygobject.c	  |   50 ++++++++++++---------
- gobject/pygobject.h	  |    1 +
- tests/Makefile.am	  |    2 +
- tests/test-floating.c	  |   95 ++++++++++++++++++++++++++++++++++++++++
- tests/test-floating.h	  |   60 +++++++++++++++++++++++++
- tests/test_gobject.py	  |   19 +++++++-
- tests/testhelpermodule.c |  109
- ++++++++++++++++++++++++++++++++++++++++++++++
+ gobject/gobjectmodule.c  |   2 -
+ gobject/pygobject.c	  |  50 +++++++++++++---------
+ gobject/pygobject.h	  |   1 +
+ tests/Makefile.am	  |   2 +
+ tests/test-floating.c	  |  95 +++++++++++++++++++++++++++++++++++++++++
+ tests/test-floating.h	  |  60 ++++++++++++++++++++++++++
+ tests/test_gobject.py	  |  19 ++++++++-
+ tests/testhelpermodule.c | 109
+ +++++++++++++++++++++++++++++++++++++++++++++++
  8 files changed, 315 insertions(+), 23 deletions(-)
 
 commit e71238a699ae783fd1a59c8a76e3555d8066cf82
@@ -16630,9 +18674,9 @@ Date:	Mon Jun 21 13:06:13 2010 +0200
 
     This reverts commit 04627488220b4f2a16e11f8982af7866fea9f7eb.
 
- gobject/gobjectmodule.c |    3 ++-
- gobject/pygobject.c	 |   42 ++++++++++++++++++++++++++++++++++--------
- gobject/pygobject.h	 |    1 -
+ gobject/gobjectmodule.c |  3 ++-
+ gobject/pygobject.c	 | 42 ++++++++++++++++++++++++++++++++++--------
+ gobject/pygobject.h	 |  1 -
  3 files changed, 36 insertions(+), 10 deletions(-)
 
 commit b2661054d6bde673484eab472e69ca021124528d
@@ -16816,7 +18860,7 @@ Date:	Sun Jun 20 10:49:55 2010 -0300
 
     [giounix] Make it possible to compile on glib 2.20
 
- gio/unix.override |	2 ++
+ gio/unix.override | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 606018a2c551d890fc2bb987d99683f777598bda
@@ -16836,8 +18880,8 @@ Date:	Mon Jun 7 16:32:29 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=620898
 
- gi/pygi-argument.c |	 9 ++++++++-
- gi/pygi-invoke.c   |	11 +++++++++--
+ gi/pygi-argument.c |  9 ++++++++-
+ gi/pygi-invoke.c   | 11 +++++++++--
  2 files changed, 17 insertions(+), 3 deletions(-)
 
 commit 433ee2aa029a1482961f478252a06492bd3498e6
@@ -16851,7 +18895,7 @@ Date:	Tue Jun 15 11:42:28 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=530935
 
- gobject/pygobject.c |	 11 ++++++++++-
+ gobject/pygobject.c | 11 ++++++++++-
  1 file changed, 10 insertions(+), 1 deletion(-)
 
 commit aa1e82c7eb87620bd73e1edb486f5b9e0d49aa96
@@ -16860,8 +18904,8 @@ Date:	Mon Jun 14 18:36:57 2010 -0400
 
     add combobox example
 
- demos/gtk-demo/demos/combobox.py |  282
- ++++++++++++++++++++++++++++++++++++++
+ demos/gtk-demo/demos/combobox.py | 282
+ +++++++++++++++++++++++++++++++++++++++
  1 file changed, 282 insertions(+)
 
 commit a8668694da59c2dd959c875f13337e64ca22f7e9
@@ -16870,7 +18914,7 @@ Date:	Mon Jun 14 13:43:53 2010 -0400
 
     fix leak in the allow None callbacks patch
 
- gi/pygi-callbacks.c |	  4 ++--
+ gi/pygi-callbacks.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 729072e73d65e7fd5b5197ebe5a8c53a449d0ec0
@@ -16892,9 +18936,9 @@ Date:	Mon Jun 7 17:12:09 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=620906
 
- gi/pygi-callbacks.c	  |    7 +++++++
- gi/pygi-invoke.c	  |   14 +++++++++++---
- tests/test_everything.py |    4 ++++
+ gi/pygi-callbacks.c	  |  7 +++++++
+ gi/pygi-invoke.c	  | 14 +++++++++++---
+ tests/test_everything.py |  4 ++++
  3 files changed, 22 insertions(+), 3 deletions(-)
 
 commit a3eb5c7de5836c37aa7ae01dbe98996ec2632c17
@@ -16903,7 +18947,7 @@ Date:	Mon Jun 14 19:06:45 2010 +0200
 
     Fix to match latest gtk annotations
 
- demos/gtk-demo/demos/appwindow.py |	3 +--
+ demos/gtk-demo/demos/appwindow.py | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit 6306dd73cc74aa9202569eac0eaaa5f825c8dc59
@@ -16918,8 +18962,8 @@ Date:	Tue Jun 8 15:03:49 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=621007
 
- gi/overrides/Gdk.py	 |   10 +++++-----
- tests/test_overrides.py |    6 +++---
+ gi/overrides/Gdk.py	 | 10 +++++-----
+ tests/test_overrides.py |  6 +++---
  2 files changed, 8 insertions(+), 8 deletions(-)
 
 commit d182630e1128fef6f1c2aea28ccd8da4bddd2c8f
@@ -16928,7 +18972,7 @@ Date:	Thu Jun 10 20:23:13 2010 +0200
 
     Post release version bump to 2.21.3
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit c4e64d5d264593051b9a3131e4985a58e8e76f8b
@@ -16937,7 +18981,7 @@ Date:	Thu Jun 10 20:21:13 2010 +0200
 
     Update NEWS and release PyGObject-2.21.2
 
- NEWS |   26 ++++++++++++++++++++++++++
+ NEWS | 26 ++++++++++++++++++++++++++
  1 file changed, 26 insertions(+)
 
 commit e0fe844d5fe8f7e26316f197444fd4143ed36adf
@@ -16951,7 +18995,7 @@ Date:	Thu Jun 10 20:09:07 2010 +0200
 	   test_gtype.py
 	   test_subtype.py
 
- tests/Makefile.am |	4 ----
+ tests/Makefile.am | 4 ----
  1 file changed, 4 deletions(-)
 
 commit 495a301cb81c5e914bcef905999265604faa27fc
@@ -16960,7 +19004,7 @@ Date:	Thu Jun 10 19:39:09 2010 +0200
 
     Add myself to the maintainers list in the README
 
- README |    1 +
+ README | 1 +
  1 file changed, 1 insertion(+)
 
 commit 04627488220b4f2a16e11f8982af7866fea9f7eb
@@ -16981,9 +19025,9 @@ Date:	Thu Jun 10 19:24:31 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=583909
 
- gobject/gobjectmodule.c |    3 +--
- gobject/pygobject.c	 |   42 ++++++++----------------------------------
- gobject/pygobject.h	 |    1 +
+ gobject/gobjectmodule.c |  3 +--
+ gobject/pygobject.c	 | 42 ++++++++----------------------------------
+ gobject/pygobject.h	 |  1 +
  3 files changed, 10 insertions(+), 36 deletions(-)
 
 commit 07df124dc06cf506634e95d08397f50a2d07fce2
@@ -17003,8 +19047,8 @@ Date:	Mon Jun 7 09:47:23 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=620804
 
- gi/pygi-invoke.c	  |    3 ++-
- tests/test_everything.py |    6 ++++++
+ gi/pygi-invoke.c	  | 3 ++-
+ tests/test_everything.py | 6 ++++++
  2 files changed, 8 insertions(+), 1 deletion(-)
 
 commit b435319fe830a909cc4d414533b3b66574931e24
@@ -17019,7 +19063,7 @@ Date:	Mon Jun 7 09:54:06 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=620805
 
- pre-commit.hook |    2 +-
+ pre-commit.hook | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e9ee2916494eb7654004925c1ee1e94f99b14f1a
@@ -17028,8 +19072,8 @@ Date:	Tue Jun 8 16:55:26 2010 -0400
 
     colorselector demo
 
- demos/gtk-demo/demos/colorselector.py |  121
- +++++++++++++++++++++++++++++++++
+ demos/gtk-demo/demos/colorselector.py | 121
+ ++++++++++++++++++++++++++++++++++
  1 file changed, 121 insertions(+)
 
 commit ec598128de9e90dccab662ed2f5511c8d659e156
@@ -17038,7 +19082,7 @@ Date:	Tue Jun 8 15:48:33 2010 +0200
 
     Update PyGObject dependency to 2.21.1
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 87774a17bd607724a56e18c2eb1ac71b04b7079d
@@ -17047,8 +19091,8 @@ Date:	Tue Jun 8 10:40:39 2010 +0200
 
     Add myself to maintainers
 
- MAINTAINERS	|    4 ++++
- pygobject.doap |    7 +++++++
+ MAINTAINERS	| 4 ++++
+ pygobject.doap | 7 +++++++
  2 files changed, 11 insertions(+)
 
 commit 46c91a11d448e5e11d142d3362aff1483226bca4
@@ -17064,7 +19108,7 @@ Date:	Wed May 5 13:54:27 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=617796
 
- gobject/pygi-external.h |    2 ++
+ gobject/pygi-external.h | 2 ++
  1 file changed, 2 insertions(+)
 
 commit c1c41576d053cc1cdd8366d8cd1e59fff1c3a9c6
@@ -17073,7 +19117,7 @@ Date:	Mon Jun 7 17:19:30 2010 -0400
 
     fix some typos and add a link to a patch which fixes a FIXME
 
- demos/gtk-demo/demos/clipboard.py |	7 +++++--
+ demos/gtk-demo/demos/clipboard.py | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 commit e7fabb5024d94a3166766e5fca740741bc50380a
@@ -17082,8 +19126,8 @@ Date:	Mon Jun 7 16:21:42 2010 -0400
 
     clipboard demo
 
- demos/gtk-demo/demos/clipboard.py |  235
- +++++++++++++++++++++++++++++++++++++
+ demos/gtk-demo/demos/clipboard.py | 235
+ ++++++++++++++++++++++++++++++++++++++
  1 file changed, 235 insertions(+)
 
 commit e0f1dce5ec58d071759f886697501da6eeea549d
@@ -17092,7 +19136,7 @@ Date:	Sun Jun 6 13:27:46 2010 -0400
 
     set is_fully_bound to false
 
- demos/gtk-demo/demos/button_box.py |	 2 +-
+ demos/gtk-demo/demos/button_box.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 986db1c73746d3a8ad7d8d5141c7eed194e7b948
@@ -17101,8 +19145,8 @@ Date:	Sat Jun 5 23:53:36 2010 -0400
 
     new button box demo
 
- demos/gtk-demo/demos/button_box.py |  121
- ++++++++++++++++++++++++++++++++++++
+ demos/gtk-demo/demos/button_box.py | 121
+ +++++++++++++++++++++++++++++++++++++
  1 file changed, 121 insertions(+)
 
 commit e9f5f8a829121e59367bae690442150f144946ad
@@ -17111,7 +19155,7 @@ Date:	Sat Jun 5 23:26:03 2010 -0400
 
     set is_fully_bound to True fro builder example
 
- demos/gtk-demo/demos/builder.py |    2 +-
+ demos/gtk-demo/demos/builder.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d9968c3a4dea1d4a73a9376009cf486c80ea3da6
@@ -17120,9 +19164,9 @@ Date:	Sat Jun 5 23:24:36 2010 -0400
 
     fix up formatting in demos
 
- demos/gtk-demo/demos/appwindow.py |   16 ++++++++--------
- demos/gtk-demo/demos/assistant.py |   24 ++++++++++++------------
- demos/gtk-demo/demos/builder.py   |	2 +-
+ demos/gtk-demo/demos/appwindow.py | 16 ++++++++--------
+ demos/gtk-demo/demos/assistant.py | 24 ++++++++++++------------
+ demos/gtk-demo/demos/builder.py   |  2 +-
  3 files changed, 21 insertions(+), 21 deletions(-)
 
 commit ffca02536bafb55e8c3bce31cd992365207429f6
@@ -17131,8 +19175,8 @@ Date:	Sat Jun 5 14:54:47 2010 -0400
 
     add the builder demo
 
- demos/gtk-demo/demos/builder.py |   57
- +++++++++++++++++++++++++++++++++++++++
+ demos/gtk-demo/demos/builder.py | 57
+ +++++++++++++++++++++++++++++++++++++++++
  1 file changed, 57 insertions(+)
 
 commit a96dbafdf562a2ac6bde4df27919d3628689dbdb
@@ -17141,8 +19185,8 @@ Date:	Fri Jun 4 17:48:24 2010 -0400
 
     add assistant demo
 
- demos/gtk-demo/demos/assistant.py |  134
- +++++++++++++++++++++++++++++++++++++
+ demos/gtk-demo/demos/assistant.py | 134
+ ++++++++++++++++++++++++++++++++++++++
  1 file changed, 134 insertions(+)
 
 commit 7e1b8cf32f33d45603aaec76afb0d14be84ffd94
@@ -17151,7 +19195,7 @@ Date:	Fri Jun 4 16:56:46 2010 -0400
 
     add formatting rules and copyright notice
 
- demos/gtk-demo/demos/appwindow.py |   19 +++++++++++++++++++
+ demos/gtk-demo/demos/appwindow.py | 19 +++++++++++++++++++
  1 file changed, 19 insertions(+)
 
 commit 03b99692b81631d397ab62dcd263341465bcee88
@@ -17166,25 +19210,25 @@ Date:	Fri Jun 4 16:26:54 2010 -0400
 	- http://bugzilla-attachments.gnome.org/attachment.cgi?id=162682
 	- http://bugzilla-attachments.gnome.org/attachment.cgi?id=162764
 
- demos/gtk-demo/demos/appwindow.py		  |  393
- ++++++++++++++++++++++
- demos/gtk-demo/demos/data/alphatest.png	  |  Bin 0 -> 26529 bytes
- demos/gtk-demo/demos/data/apple-red.png	  |  Bin 0 -> 3545 bytes
- demos/gtk-demo/demos/data/background.jpg	  |  Bin 0 -> 22219 bytes
- demos/gtk-demo/demos/data/demo.ui		  |  258 ++++++++++++++
- demos/gtk-demo/demos/data/floppybuddy.gif	  |  Bin 0 -> 5216 bytes
- demos/gtk-demo/demos/data/gnome-applets.png	  |  Bin 0 -> 3090 bytes
- demos/gtk-demo/demos/data/gnome-calendar.png	  |  Bin 0 -> 2755 bytes
- demos/gtk-demo/demos/data/gnome-foot.png	  |  Bin 0 -> 2916 bytes
- demos/gtk-demo/demos/data/gnome-fs-directory.png |  Bin 0 -> 2044 bytes
- demos/gtk-demo/demos/data/gnome-fs-regular.png   |  Bin 0 -> 1795 bytes
- demos/gtk-demo/demos/data/gnome-gimp.png	  |  Bin 0 -> 3410 bytes
- demos/gtk-demo/demos/data/gnome-gmush.png	  |  Bin 0 -> 3244 bytes
- demos/gtk-demo/demos/data/gnome-gsame.png	  |  Bin 0 -> 4263 bytes
- demos/gtk-demo/demos/data/gnu-keys.png		  |  Bin 0 -> 3852 bytes
- demos/gtk-demo/demos/data/gtk-logo-rgb.gif	  |  Bin 0 -> 6427 bytes
- demos/gtk-demo/demos/test.py			  |   14 +
- demos/gtk-demo/gtk-demo.py			  |  266 +++++++++++++++
+ demos/gtk-demo/demos/appwindow.py		  | 393
+ +++++++++++++++++++++++
+ demos/gtk-demo/demos/data/alphatest.png	  | Bin 0 -> 26529 bytes
+ demos/gtk-demo/demos/data/apple-red.png	  | Bin 0 -> 3545 bytes
+ demos/gtk-demo/demos/data/background.jpg	  | Bin 0 -> 22219 bytes
+ demos/gtk-demo/demos/data/demo.ui		  | 258 +++++++++++++++
+ demos/gtk-demo/demos/data/floppybuddy.gif	  | Bin 0 -> 5216 bytes
+ demos/gtk-demo/demos/data/gnome-applets.png	  | Bin 0 -> 3090 bytes
+ demos/gtk-demo/demos/data/gnome-calendar.png	  | Bin 0 -> 2755 bytes
+ demos/gtk-demo/demos/data/gnome-foot.png	  | Bin 0 -> 2916 bytes
+ demos/gtk-demo/demos/data/gnome-fs-directory.png | Bin 0 -> 2044 bytes
+ demos/gtk-demo/demos/data/gnome-fs-regular.png   | Bin 0 -> 1795 bytes
+ demos/gtk-demo/demos/data/gnome-gimp.png	  | Bin 0 -> 3410 bytes
+ demos/gtk-demo/demos/data/gnome-gmush.png	  | Bin 0 -> 3244 bytes
+ demos/gtk-demo/demos/data/gnome-gsame.png	  | Bin 0 -> 4263 bytes
+ demos/gtk-demo/demos/data/gnu-keys.png		  | Bin 0 -> 3852 bytes
+ demos/gtk-demo/demos/data/gtk-logo-rgb.gif	  | Bin 0 -> 6427 bytes
+ demos/gtk-demo/demos/test.py			  |  14 +
+ demos/gtk-demo/gtk-demo.py			  | 266 +++++++++++++++
  18 files changed, 931 insertions(+)
 
 commit b3b1f029d8d16cf9bd74160009808147d07e3b3f
@@ -17193,7 +19237,7 @@ Date:	Fri Jun 4 11:25:08 2010 +0200
 
     Update gobject-introspection dependency to 0.6.14
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 45c4e46ae93bd83a0e3f3550df6c64ce96bbedb4
@@ -17202,7 +19246,7 @@ Date:	Fri Jun 4 11:23:41 2010 +0200
 
     Post-release version bump to 0.6.1
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 7a94270dac48b67aabc7dbad156cf1180db9cb5e
@@ -17211,7 +19255,7 @@ Date:	Fri Jun 4 08:29:42 2010 +0200
 
     Pre-release version bump 0.6.0
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 1e42ee6eb25a07a5201f24ffeac18d298a98477e
@@ -17239,9 +19283,9 @@ Date:	Fri May 28 10:03:11 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=620406
 
- gi/pygi-invoke.c	  |   73
- +++++++++++++++++++++++++++++++++++++++++++---
- tests/test_everything.py |   28 ++++++++++++++++++
+ gi/pygi-invoke.c	  | 73
+ +++++++++++++++++++++++++++++++++++++++++++++---
+ tests/test_everything.py | 28 +++++++++++++++++++
  2 files changed, 97 insertions(+), 4 deletions(-)
 
 commit c3f467e0ae99aa78c2fdb91b973a272d2fe970bd
@@ -17252,7 +19296,7 @@ Date:	Wed Jun 2 14:14:16 2010 -0400
 
     * use from gi.repository import GObject
 
- tests/test_overrides.py |    5 ++---
+ tests/test_overrides.py | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
 
 commit 46b5133fea4cd5db57a360b3cbe9ee923e27560c
@@ -17263,8 +19307,8 @@ Date:	Tue Jun 1 14:28:57 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=620247
 
- gi/pygi-info.c   |   11 +++++++++++
- tests/test_gi.py |   17 +++++++++++++++++
+ gi/pygi-info.c   | 11 +++++++++++
+ tests/test_gi.py | 17 +++++++++++++++++
  2 files changed, 28 insertions(+)
 
 commit 5f0f9a9c9145a129a063b041424c3109a24d9ead
@@ -17274,8 +19318,8 @@ Date:	Wed May 26 13:20:27 2010 +0200
     Install pre-commit hook that checks the code changes for style
     conformance
 
- autogen.sh	 |    7 +++++++
- pre-commit.hook |   39 +++++++++++++++++++++++++++++++++++++++
+ autogen.sh	 |  7 +++++++
+ pre-commit.hook | 39 +++++++++++++++++++++++++++++++++++++++
  2 files changed, 46 insertions(+)
 
 commit 1319da5b7f483e48a90b0b7489f77236ba26f479
@@ -17288,25 +19332,25 @@ Date:	Wed May 26 12:19:17 2010 +0200
 
     This won't affect git blame nor git diff if the switch -w is used.
 
- gi/gimodule.c		 |  138 +++----
- gi/pygi-argument.c	 |  960
- +++++++++++++++++++++++------------------------
- gi/pygi-boxed.c	 |  108 +++---
- gi/pygi-callbacks.c	 |  154 ++++----
- gi/pygi-callbacks.h	 |    8 +-
- gi/pygi-closure.c	 |  270 ++++++-------
- gi/pygi-closure.h	 |   18 +-
- gi/pygi-foreign-cairo.c |   36 +-
- gi/pygi-foreign-cairo.h |   36 +-
- gi/pygi-foreign.c	 |   54 +--
- gi/pygi-foreign.h	 |   10 +-
- gi/pygi-info.c		 |  646 +++++++++++++++----------------
- gi/pygi-invoke.c	 |  380 +++++++++----------
- gi/pygi-repository.c	 |  114 +++---
- gi/pygi-struct.c	 |   88 ++---
- gi/pygi-type.c		 |   32 +-
- gi/pygi.h		 |   20 +-
- gi/pygobject-external.h |   14 +-
+ gi/gimodule.c		 | 138 +++----
+ gi/pygi-argument.c	 | 960
+ ++++++++++++++++++++++++------------------------
+ gi/pygi-boxed.c	 | 108 +++---
+ gi/pygi-callbacks.c	 | 154 ++++----
+ gi/pygi-callbacks.h	 |   8 +-
+ gi/pygi-closure.c	 | 270 +++++++-------
+ gi/pygi-closure.h	 |  18 +-
+ gi/pygi-foreign-cairo.c |  36 +-
+ gi/pygi-foreign-cairo.h |  36 +-
+ gi/pygi-foreign.c	 |  54 +--
+ gi/pygi-foreign.h	 |  10 +-
+ gi/pygi-info.c		 | 646 ++++++++++++++++----------------
+ gi/pygi-invoke.c	 | 380 +++++++++----------
+ gi/pygi-repository.c	 | 114 +++---
+ gi/pygi-struct.c	 |  88 ++---
+ gi/pygi-type.c		 |  32 +-
+ gi/pygi.h		 |  20 +-
+ gi/pygobject-external.h |  14 +-
  18 files changed, 1544 insertions(+), 1542 deletions(-)
 
 commit 6156f15cb15b4c20e975527227135d49207c520a
@@ -17317,8 +19361,8 @@ Date:	Tue May 25 14:08:51 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=619597
 
- gi/module.py	  |    4 ++--
- tests/test_gi.py |    4 +++-
+ gi/module.py	  | 4 ++--
+ tests/test_gi.py | 4 +++-
  2 files changed, 5 insertions(+), 3 deletions(-)
 
 commit 097b92983b7a322c58fecb1e691ba6ddf5035548
@@ -17333,7 +19377,7 @@ Date:	Tue May 25 14:17:13 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=619604
 
- gi/types.py |	 15 +++++++++++----
+ gi/types.py | 15 +++++++++++----
  1 file changed, 11 insertions(+), 4 deletions(-)
 
 commit 686e10fcdb108af9758eb025a3447813c3513a93
@@ -17344,7 +19388,7 @@ Date:	Thu Apr 29 10:55:13 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=617153
 
- gi/types.py |	  3 ++-
+ gi/types.py | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 9f34d120845d936b04546a5cea599ec67e9181a7
@@ -17361,9 +19405,9 @@ Date:	Mon May 24 16:16:50 2010 -0400
     * add test that loads objects from strings and connects them to
     signals
 
- gi/overrides/Gtk.py	 |   19 +++++++++++--
- tests/test_overrides.py |   72
- +++++++++++++++++++++++++++++++++++++++++++++--
+ gi/overrides/Gtk.py	 | 19 +++++++++++--
+ tests/test_overrides.py | 72
+ ++++++++++++++++++++++++++++++++++++++++++++++---
  2 files changed, 86 insertions(+), 5 deletions(-)
 
 commit 1561d2977691f1cb8684f183a2e274c47960d931
@@ -17376,8 +19420,8 @@ Date:	Mon May 24 18:48:10 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=616849
 
- gi/gimodule.c	  |    9 +++++++++
- tests/test_gi.py |   13 ++++++++++++-
+ gi/gimodule.c	  |  9 +++++++++
+ tests/test_gi.py | 13 ++++++++++++-
  2 files changed, 21 insertions(+), 1 deletion(-)
 
 commit c9d44d4d46c3da3a445000b1db592baa9c378a92
@@ -17388,9 +19432,8 @@ Date:	Fri Apr 30 18:17:50 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=617054
 
- gi/pygi-invoke.c |   11 +++++++----
- tests/test_gi.py |   50
- ++++++++++++++++++++++++++++++++++++++++++++++++++
+ gi/pygi-invoke.c | 11 +++++++----
+ tests/test_gi.py | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 57 insertions(+), 4 deletions(-)
 
 commit c171579ee22681e1ee4ad33441c89f1053bdc3d1
@@ -17399,7 +19442,7 @@ Date:	Mon May 24 11:48:16 2010 -0400
 
     check refcounting of callback userdata in unit tests
 
- tests/test_everything.py |   18 ++++++++++++++++++
+ tests/test_everything.py | 18 ++++++++++++++++++
  1 file changed, 18 insertions(+)
 
 commit 8eb809468fe3e1f8e4f92bd7f25d96f9cf802cd4
@@ -17415,9 +19458,9 @@ Date:	Sat May 22 15:12:37 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=617780
 
- gi/pygi-closure.c |  335
- +++++++++++++++++++++++++++++++++++++++++------------
- tests/test_gi.py  |	4 +
+ gi/pygi-closure.c | 335
+ +++++++++++++++++++++++++++++++++++++++++-------------
+ tests/test_gi.py  |   4 +
  2 files changed, 263 insertions(+), 76 deletions(-)
 
 commit 0df0c956bb2476392c9d81f0a243a7e84c067166
@@ -17436,8 +19479,8 @@ Date:	Sun May 23 10:59:27 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=617880
 
- gi/pygi-argument.c	  |    5 +++++
- tests/test_everything.py |    6 ++++++
+ gi/pygi-argument.c	  | 5 +++++
+ tests/test_everything.py | 6 ++++++
  2 files changed, 11 insertions(+)
 
 commit 60fdf4b8f738dd0f5c190bc18ddf010032d3c5ca
@@ -17456,8 +19499,8 @@ Date:	Sat May 22 14:06:37 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=619007
 
- gi/gimodule.c		  |   12 ++++++++++++
- tests/test_everything.py |    3 +++
+ gi/gimodule.c		  | 12 ++++++++++++
+ tests/test_everything.py |  3 +++
  2 files changed, 15 insertions(+)
 
 commit 4b369f8aca980fc6a582094d6648f40fe4af5e9f
@@ -17482,8 +19525,8 @@ Date:	Sat May 22 13:21:30 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=619232
 
- gi/pygi-argument.c	  |    6 ------
- tests/test_everything.py |    4 ++--
+ gi/pygi-argument.c	  | 6 ------
+ tests/test_everything.py | 4 ++--
  2 files changed, 2 insertions(+), 8 deletions(-)
 
 commit 71a2148b00dfdda99e0d961ae39b901608724e59
@@ -17497,7 +19540,7 @@ Date:	Fri May 21 19:05:03 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=619311
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit aa0357e468eb91e0f3707346e9b32f312fbf51d3
@@ -17508,7 +19551,7 @@ Date:	Thu Apr 29 13:06:15 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=617159
 
- gi/gimodule.c |    4 +++-
+ gi/gimodule.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit ab1aaff108d23aabd28c3634edfb67236eb55460
@@ -17549,8 +19592,8 @@ Date:	Sat May 22 13:09:48 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=619235
 
- gi/pygi-invoke.c	  |    6 +++++-
- tests/test_everything.py |    4 ++--
+ gi/pygi-invoke.c	  | 6 +++++-
+ tests/test_everything.py | 4 ++--
  2 files changed, 7 insertions(+), 3 deletions(-)
 
 commit e928ea9b1df9d87314ff8e93479530e26be9bd87
@@ -17566,7 +19609,7 @@ Date:	Fri May 14 14:57:27 2010 -0400
       API such as this doesn't need to be used anymore and is a result of
       early GTK development
 
- gi/pygi-argument.c |	14 +++++++++++---
+ gi/pygi-argument.c | 14 +++++++++++---
  1 file changed, 11 insertions(+), 3 deletions(-)
 
 commit d963007aab123f4e53a944a66a935db2d22907c2
@@ -17585,7 +19628,7 @@ Date:	Mon May 17 11:54:34 2010 -0400
       new modified argument list
     * fixes https://bugzilla.gnome.org/show_bug.cgi?id=618889
 
- gi/overrides/Gtk.py |	  1 +
+ gi/overrides/Gtk.py | 1 +
  1 file changed, 1 insertion(+)
 
 commit 897420ed97cc4a7b8a806894df5e76ed72617614
@@ -17596,9 +19639,9 @@ Date:	Wed May 12 14:25:32 2010 -0400
 
     * fixes bug https://bugzilla.gnome.org/show_bug.cgi?id=618476
 
- gi/overrides/Gtk.py	 |  167
- ++++++++++++++++++++++++++++++++++++++++++++++-
- tests/test_overrides.py |   45 +++++++++++++
+ gi/overrides/Gtk.py	 | 167
+ +++++++++++++++++++++++++++++++++++++++++++++++-
+ tests/test_overrides.py |  45 +++++++++++++
  2 files changed, 211 insertions(+), 1 deletion(-)
 
 commit 865939d29c1e9d69dbe6b9cf89477b5516dbff1f
@@ -17607,7 +19650,7 @@ Date:	Thu May 13 01:02:24 2010 -0400
 
     Bump version for development to 0.5.2 (hopefully 0.6)
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2674a9546b0246d4a75d71cf1708df77dc0173f9
@@ -17618,9 +19661,9 @@ Date:	Wed May 5 15:54:39 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=617757
 
- gi/overrides/Gdk.py	 |    2 +-
- tests/Makefile.am	 |    3 ++-
- tests/test_overrides.py |   22 ++++++++++++++++++++++
+ gi/overrides/Gdk.py	 |  2 +-
+ tests/Makefile.am	 |  3 ++-
+ tests/test_overrides.py | 22 ++++++++++++++++++++++
  3 files changed, 25 insertions(+), 2 deletions(-)
 
 commit c20b9f632a35bada1320ccc10fb7d5b2c06b9a88
@@ -17641,11 +19684,11 @@ Date:	Thu Apr 29 14:55:33 2010 -0400
     * add DynamicGObjectModule tests and make tests use the new module
       - change import gobject to from gi.repository import GObject
 
- gi/importer.py		  |    6 +--
- gi/module.py		  |   30 +++++++++++++++
- tests/test_everything.py |    6 +--
- tests/test_gi.py	  |   93
- +++++++++++++++++++++++++---------------------
+ gi/importer.py		  |  6 ++--
+ gi/module.py		  | 30 ++++++++++++++++
+ tests/test_everything.py |  6 ++--
+ tests/test_gi.py	  | 93
+ ++++++++++++++++++++++++++----------------------
  4 files changed, 87 insertions(+), 48 deletions(-)
 
 commit 64324a4c629432b2e688299b6edbfd5da4439a2a
@@ -17654,7 +19697,7 @@ Date:	Fri Apr 30 14:11:55 2010 -0400
 
     override Gdk.Drawable to add cairo_create convinience method
 
- gi/overrides/Gdk.py |	  7 ++++++-
+ gi/overrides/Gdk.py | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 commit 17fa1289b1e2ed841dd5de09a2ec7c25d401886e
@@ -17665,10 +19708,10 @@ Date:	Mon May 3 19:13:46 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=617551
 
- gi/pygi-callbacks.c	  |    3 ++-
- gi/pygi-callbacks.h	  |    1 +
- gi/pygi-invoke.c	  |    7 +++++--
- tests/test_everything.py |   21 +++++++++++++++++++++
+ gi/pygi-callbacks.c	  |  3 ++-
+ gi/pygi-callbacks.h	  |  1 +
+ gi/pygi-invoke.c	  |  7 +++++--
+ tests/test_everything.py | 21 +++++++++++++++++++++
  4 files changed, 29 insertions(+), 3 deletions(-)
 
 commit f9fff978d56ddf2c012b906169ae16abb7fdc2a5
@@ -17677,7 +19720,7 @@ Date:	Wed May 5 08:06:03 2010 +0200
 
     Avoid freeing garbage
 
- gi/pygi-invoke.c |    6 ++++--
+ gi/pygi-invoke.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit 5e20c018ae09a936f5ff140df5d1c133c98e98ba
@@ -17688,8 +19731,8 @@ Date:	Thu Apr 29 13:09:03 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=617160
 
- gi/types.py	  |   10 +++++++++-
- tests/test_gi.py |   10 ++++++++++
+ gi/types.py	  | 10 +++++++++-
+ tests/test_gi.py | 10 ++++++++++
  2 files changed, 19 insertions(+), 1 deletion(-)
 
 commit 3e61e7d4450a2bb133c7f3862e0962a35339ce8d
@@ -17700,8 +19743,8 @@ Date:	Mon May 3 18:35:13 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=617542
 
- gi/pygi-invoke.c	  |    3 ++-
- tests/test_everything.py |   10 ++++++++++
+ gi/pygi-invoke.c	  |  3 ++-
+ tests/test_everything.py | 10 ++++++++++
  2 files changed, 12 insertions(+), 1 deletion(-)
 
 commit 9669acd0fad193013ef3505ae231588307f9834c
@@ -17712,13 +19755,13 @@ Date:	Mon May 3 12:23:58 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=617107
 
- gi/Makefile.am    |	2 +
- gi/pygi-info.c    |  884
- ---------------------------------------------------
- gi/pygi-invoke.c  |  909
- +++++++++++++++++++++++++++++++++++++++++++++++++++++
- gi/pygi-invoke.h  |   37 +++
- gi/pygi-private.h |	1 +
+ gi/Makefile.am    |   2 +
+ gi/pygi-info.c    | 884
+ ----------------------------------------------------
+ gi/pygi-invoke.c  | 909
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ gi/pygi-invoke.h  |  37 +++
+ gi/pygi-private.h |   1 +
  5 files changed, 949 insertions(+), 884 deletions(-)
 
 commit 9b923a68dfde06fc2df6321b3f1e53f1c57b3666
@@ -17727,7 +19770,7 @@ Date:	Tue Apr 27 19:13:08 2010 -0400
 
     Add the Gtk.Builder override
 
- gi/overrides/Gtk.py |	 37 ++++++++++++++++++++++++++++++++++++-
+ gi/overrides/Gtk.py | 37 ++++++++++++++++++++++++++++++++++++-
  1 file changed, 36 insertions(+), 1 deletion(-)
 
 commit 9fc6783406b8263ebd67ceae2730b4e86689b43e
@@ -17738,8 +19781,8 @@ Date:	Fri Apr 30 15:00:52 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=616236
 
- gi/pygi-closure.c	  |    8 +++++++-
- tests/test_everything.py |   16 ++++++++++++++++
+ gi/pygi-closure.c	  |  8 +++++++-
+ tests/test_everything.py | 16 ++++++++++++++++
  2 files changed, 23 insertions(+), 1 deletion(-)
 
 commit 5657ccaaec09e2a3194ea2e9a923724bcc66759e
@@ -17750,7 +19793,7 @@ Date:	Thu Apr 29 18:32:50 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=617162
 
- gi/overrides/Gdk.py |	 20 +++++++++++++++++++-
+ gi/overrides/Gdk.py | 20 +++++++++++++++++++-
  1 file changed, 19 insertions(+), 1 deletion(-)
 
 commit 4410abd589a2f64cfbd7bbcb4013fae9e4aa734f
@@ -17767,9 +19810,9 @@ Date:	Wed Apr 28 13:19:48 2010 -0400
       against None as well as in __all__
     * went through all the overrides and made __all__ be a list of strings
 
- gi/module.py			    |	 9 ++++-----
- gi/overrides/GIMarshallingTests.py |	 2 +-
- gi/overrides/Gdk.py		    |	 2 +-
+ gi/module.py			    | 9 ++++-----
+ gi/overrides/GIMarshallingTests.py | 2 +-
+ gi/overrides/Gdk.py		    | 2 +-
  3 files changed, 6 insertions(+), 7 deletions(-)
 
 commit 64fa8f936bad9a90628df446e690d67d947a0a22
@@ -17780,10 +19823,10 @@ Date:	Mon Apr 26 11:41:06 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=616357
 
- gi/pygi-callbacks.c |	 22 +-
- gi/pygi-callbacks.h |	  4 +-
- gi/pygi-info.c      |	582
- +++++++++++++++++++++++++++++----------------------
+ gi/pygi-callbacks.c |	22 +-
+ gi/pygi-callbacks.h |	 4 +-
+ gi/pygi-info.c      | 582
+ ++++++++++++++++++++++++++++++----------------------
  3 files changed, 346 insertions(+), 262 deletions(-)
 
 commit 7fc5528273edae5ecdd5d8bdf0e5b898eec7a624
@@ -17798,8 +19841,8 @@ Date:	Tue Apr 20 23:23:38 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=616357
 
- gi/pygi-info.c |  417
- +++++++++++++++++++++++++++++---------------------------
+ gi/pygi-info.c | 417
+ +++++++++++++++++++++++++++++----------------------------
  1 file changed, 214 insertions(+), 203 deletions(-)
 
 commit 1d9c6b6d76a3e27f66e6f0cfc7b16c5191e4fc22
@@ -17810,8 +19853,8 @@ Date:	Tue Apr 27 10:24:35 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=616674
 
- gi/types.py	  |    4 ++--
- tests/test_gi.py |   15 +++++++++++++++
+ gi/types.py	  |  4 ++--
+ tests/test_gi.py | 15 +++++++++++++++
  2 files changed, 17 insertions(+), 2 deletions(-)
 
 commit 8a0c48f4dd512797e5cf132f8ec6fb6d4d1e7aaa
@@ -17826,8 +19869,8 @@ Date:	Sun Apr 25 15:09:08 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=616786
 
- gi/pygi-closure.c	  |    3 +++
- tests/test_everything.py |   13 +++++++++++++
+ gi/pygi-closure.c	  |  3 +++
+ tests/test_everything.py | 13 +++++++++++++
  2 files changed, 16 insertions(+)
 
 commit 2b12049306bf57513c43d08017185468bf897a4a
@@ -17841,7 +19884,7 @@ Date:	Tue Apr 20 22:57:14 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=616356
 
- gi/pygi-closure.c |	4 ++--
+ gi/pygi-closure.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 8240320d0b67074ce91bdf7aadcf5951c5a8c45a
@@ -17861,8 +19904,8 @@ Date:	Tue Apr 20 23:53:57 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=616043
 
- gi/pygi-info.c   |    1 +
- tests/test_gi.py |    3 +++
+ gi/pygi-info.c   | 1 +
+ tests/test_gi.py | 3 +++
  2 files changed, 4 insertions(+)
 
 commit 10e558ca283cdd06725bb0d24b5071ccbecc7d13
@@ -17879,7 +19922,7 @@ Date:	Tue Apr 20 22:57:14 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=616356
 
- gi/pygi-closure.c |	3 ++-
+ gi/pygi-closure.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit d3b5fae9d609dbcd83deb0fa9102b24faf76787c
@@ -17891,9 +19934,9 @@ Date:	Tue Apr 20 22:43:20 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=616343
 
- gi/pygi-closure.c	  |   10 +++++-----
- gi/pygi-info.c		  |    9 +++++++--
- tests/test_everything.py |    9 +++++++++
+ gi/pygi-closure.c	  | 10 +++++-----
+ gi/pygi-info.c		  |  9 +++++++--
+ tests/test_everything.py |  9 +++++++++
  3 files changed, 21 insertions(+), 7 deletions(-)
 
 commit 3ba666b7ab9c393963922c272e7d87bff50a93f9
@@ -17904,13 +19947,13 @@ Date:	Sat Jan 2 16:31:55 2010 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=603598
 
- gi/module.py	    |	 3 +-
- gi/pygi-argument.c |	24 +++-----------
- gi/pygi-boxed.c    |	18 ++++++++--
- gi/pygi-info.c     |	94
- +++++++++++++++++++++++++++++++++++++++++++++++-----
- gi/pygi-info.h     |	 1 +
- tests/test_gi.py   |	56 +++++++++++++++++++++++++++++++
+ gi/module.py	    |  3 +-
+ gi/pygi-argument.c | 24 +++-----------
+ gi/pygi-boxed.c    | 18 +++++++++--
+ gi/pygi-info.c     | 94
+ ++++++++++++++++++++++++++++++++++++++++++++++++------
+ gi/pygi-info.h     |  1 +
+ tests/test_gi.py   | 56 ++++++++++++++++++++++++++++++++
  6 files changed, 165 insertions(+), 31 deletions(-)
 
 commit af9e4e086d160fe7fb24758ed81753e784b198a8
@@ -17923,8 +19966,8 @@ Date:	Fri Jan 22 22:16:32 2010 +0100
     keep PyGI
     backward-compatible.
 
- configure.ac	   |	2 +-
- gi/pygi-private.h |   20 --------------------
+ configure.ac	   |  2 +-
+ gi/pygi-private.h | 20 --------------------
  2 files changed, 1 insertion(+), 21 deletions(-)
 
 commit c0f40de5648e2ebc556c449342a0025ffce2e33b
@@ -17935,8 +19978,8 @@ Date:	Sun Apr 18 11:50:14 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=616108
 
- gi/pygi-info.c |  360
- ++++++++++++++++++++++++++------------------------------
+ gi/pygi-info.c | 360
+ +++++++++++++++++++++++++++------------------------------
  1 file changed, 168 insertions(+), 192 deletions(-)
 
 commit 24bb89f1310dc2fc8ee6ddaf945342ebf80055cd
@@ -17947,7 +19990,7 @@ Date:	Tue Apr 20 15:12:47 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=616279
 
- gi/pygi-closure.c |	9 +++++----
+ gi/pygi-closure.c | 9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)
 
 commit d1ba23cdd05686ea721425f233371d573a2e9cce
@@ -17956,7 +19999,7 @@ Date:	Thu Apr 22 19:57:17 2010 +0200
 
     Rename variable with a very generic name
 
- gi/module.py |   28 ++++++++++++++--------------
+ gi/module.py | 28 ++++++++++++++--------------
  1 file changed, 14 insertions(+), 14 deletions(-)
 
 commit 391640b30ede50af3667b1019edb72bd79f2c68c
@@ -17967,10 +20010,10 @@ Date:	Thu Apr 22 19:53:06 2010 +0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=616520
 
- gi/module.py	    |	 6 +++++-
- gi/pygi-argument.c |	22 +++++++++++++++++++++-
- gi/types.py	    |	14 ++++++++++++++
- tests/test_gi.py   |	30 ++++++++++++++++++++++++++++--
+ gi/module.py	    |  6 +++++-
+ gi/pygi-argument.c | 22 +++++++++++++++++++++-
+ gi/types.py	    | 14 ++++++++++++++
+ tests/test_gi.py   | 30 ++++++++++++++++++++++++++++--
  4 files changed, 68 insertions(+), 4 deletions(-)
 
 commit 89704f60ddae0c81f1383d86491ef2785590a353
@@ -17985,7 +20028,7 @@ Date:	Tue Apr 20 22:20:42 2010 -0400
     not the version after.  Thus after a release you make a new commit
     bumping to the next development version.
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e203dc7c8f524c16aa52e15758dc3a2b09fbac75
@@ -17994,7 +20037,7 @@ Date:	Tue Apr 20 20:40:02 2010 -0400
 
     Added missing , to keyword list of gio.GFile.set_attribute
 
- gio/gresolver.override |    2 +-
+ gio/gresolver.override | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 0b222f01ac9ceea1d127083623ad532ecc75bf7e
@@ -18003,8 +20046,8 @@ Date:	Tue Apr 20 20:37:12 2010 -0400
 
     Fix arg conversion in gio.GFile.set_attribute
 
- gio/gfile.override |  232
- ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ gio/gfile.override | 232
+ +++++++++++++++++++++++++++++++++++++++++++++++++++--
  1 file changed, 227 insertions(+), 5 deletions(-)
 
 commit a579ccc8bea90937bf970be3d461e2b650b0c7d6
@@ -18013,7 +20056,7 @@ Date:	Tue Apr 20 20:01:53 2010 -0400
 
     Set constants under python 2.5 or before
 
- gobject/gobjectmodule.c |    8 ++++++++
+ gobject/gobjectmodule.c | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 commit 11fa39a861abf679e01b5f0da97be93ae0adf0f0
@@ -18029,7 +20072,7 @@ Date:	Sun Apr 18 20:22:21 2010 -0400
 	and will
 	not make the parsing crash.
 
- codegen/docextract_to_xml.py |    4 ++--
+ codegen/docextract_to_xml.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 8dbc2cb016acef7b364804cd9bc8f0b1da37e84b
@@ -18038,8 +20081,8 @@ Date:	Sun Apr 18 14:32:06 2010 -0400
 
     Bump version for release 0.5.0
 
- HACKING      |    7 +++++++
- configure.ac |    4 ++--
+ HACKING      | 7 +++++++
+ configure.ac | 4 ++--
  2 files changed, 9 insertions(+), 2 deletions(-)
 
 commit 3293c91d90c5c497b45e42a527d7f79f7435823e
@@ -18048,7 +20091,7 @@ Date:	Sun Apr 18 14:28:13 2010 -0400
 
     One more missing file...
 
- examples/Makefile.am |    2 ++
+ examples/Makefile.am | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 1dc575af19fe985cc3fa3ec0cf18aeab1f43c16d
@@ -18057,8 +20100,8 @@ Date:	Sun Apr 18 14:18:44 2010 -0400
 
     Add more stuff to the tarballs
 
- Makefile.am  |    8 +++++++-
- configure.ac |    1 +
+ Makefile.am  | 8 +++++++-
+ configure.ac | 1 +
  2 files changed, 8 insertions(+), 1 deletion(-)
 
 commit 8a9bb04755057e934b7f46c917af6ef281a2fedd
@@ -18067,7 +20110,7 @@ Date:	Sun Apr 18 13:48:45 2010 -0400
 
     Add one more missing file to tarballs
 
- gi/overrides/Makefile.am |    1 +
+ gi/overrides/Makefile.am | 1 +
  1 file changed, 1 insertion(+)
 
 commit 979e01852fc7f830ee91093accdc387fa535075f
@@ -18076,7 +20119,7 @@ Date:	Sun Apr 18 13:45:29 2010 -0400
 
     Add missing file to tarballs
 
- tests/Makefile.am |	1 +
+ tests/Makefile.am | 1 +
  1 file changed, 1 insertion(+)
 
 commit 8b70faa7a9a32b9ea8862f28a503e38f496cfd89
@@ -18087,17 +20130,17 @@ Date:	Sun Apr 18 13:11:11 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=602736
 
- gi/gimodule.c	     |	 89
- +++++++++++++++++++++++++++++++++++++++++++++++++++
- gi/pygi-argument.c  |	  1 +
- gi/pygi-callbacks.c |	  3 +-
- gi/pygi-closure.c   |	  4 +--
- gi/pygi-closure.h   |	  2 +-
- gi/pygi-info.c      |	 86
- +++++++++++++++++++++++++++++++++++++++++++++++--
- gi/pygi-info.h      |	  1 +
- gi/types.py	     |	 44 +++++++++++++++++--------
- tests/test_gi.py    |	 18 +++++++++++
+ gi/gimodule.c	     | 89
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ gi/pygi-argument.c  |	1 +
+ gi/pygi-callbacks.c |	3 +-
+ gi/pygi-closure.c   |	4 +--
+ gi/pygi-closure.h   |	2 +-
+ gi/pygi-info.c      | 86
+ +++++++++++++++++++++++++++++++++++++++++++++++++--
+ gi/pygi-info.h      |	1 +
+ gi/types.py	     | 44 +++++++++++++++++---------
+ tests/test_gi.py    | 18 +++++++++++
  9 files changed, 227 insertions(+), 21 deletions(-)
 
 commit e239faacb4798fe2d166233ca1a19a843a6225e3
@@ -18106,7 +20149,7 @@ Date:	Sun Apr 18 11:59:06 2010 -0400
 
     Fix a typo in pygi-callbacks.c header
 
- gi/pygi-callbacks.c |	  2 +-
+ gi/pygi-callbacks.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 79aa416ae8632b123da61d79fb820d9e2704209c
@@ -18117,11 +20160,10 @@ Date:	Sat Apr 17 12:00:05 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=616035
 
- gi/pygi-argument.c	  |   43
- +++++++++++++++++++++++++++++++++++++------
- gi/pygi-argument.h	  |    3 ++-
- gi/pygi-info.c		  |   19 +++++++++++++------
- tests/test_everything.py |   28 ++++++++++++++++++++++++++++
+ gi/pygi-argument.c	  | 43 +++++++++++++++++++++++++++++++++++++------
+ gi/pygi-argument.h	  |  3 ++-
+ gi/pygi-info.c		  | 19 +++++++++++++------
+ tests/test_everything.py | 28 ++++++++++++++++++++++++++++
  4 files changed, 80 insertions(+), 13 deletions(-)
 
 commit 7d533b8893bc4a8a82fd9708278fa1dce5d3551e
@@ -18130,10 +20172,10 @@ Date:	Sat Apr 17 12:56:19 2010 -0400
 
     Move some tests from test_gi to test_everything
 
- tests/test_everything.py |   60
- ++++++++++++++++++++++++++++++++++++++++++++
- tests/test_gi.py	  |   62
- +---------------------------------------------
+ tests/test_everything.py | 60
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ tests/test_gi.py	  | 62
+ +-----------------------------------------------
  2 files changed, 61 insertions(+), 61 deletions(-)
 
 commit a90298cc9e6c0f336f887a71d80b1efd07ec2811
@@ -18142,8 +20184,8 @@ Date:	Sun Apr 18 10:44:35 2010 -0400
 
     Update to latest version of the pygi-convert.sh script
 
- pygi-convert.sh |  193
- +++++++++++++++++++++++++++++++++++++++----------------
+ pygi-convert.sh | 193
+ ++++++++++++++++++++++++++++++++++++++++----------------
  1 file changed, 137 insertions(+), 56 deletions(-)
 
 commit 34a39318c674737c6d64f2430456daef86ba1626
@@ -18152,8 +20194,8 @@ Date:	Sun Apr 18 10:40:44 2010 -0400
 
     Add Tomeu's prototype script for converting pygtk to pygi
 
- pygi-convert.sh |   71
- +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ pygi-convert.sh | 71
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 71 insertions(+)
 
 commit a3afdb5fd33de0bf11d63857a245a8f5edec242c
@@ -18162,7 +20204,7 @@ Date:	Sun Apr 18 13:01:58 2010 +0200
 
     Fix doap file
 
- pygi.doap |	4 ++++
+ pygi.doap | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 0de73d0bba79f92af22f43693f3575c596712416
@@ -18171,7 +20213,7 @@ Date:	Sat Apr 17 16:01:31 2010 -0400
 
     Add Zach Goldberg as a pygi maintainer
 
- pygi.doap |	5 +++++
+ pygi.doap | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit a0e22e36e8cf0c1e0da3c0ec48c821fdb5a07ccd
@@ -18180,7 +20222,7 @@ Date:	Sat Apr 17 11:47:54 2010 -0400
 
     Require PyCairo
 
- configure.ac |    7 +------
+ configure.ac | 7 +------
  1 file changed, 1 insertion(+), 6 deletions(-)
 
 commit 2778f8a1bf6379a46beec6546c8efcb0fec2d7ad
@@ -18189,8 +20231,8 @@ Date:	Sat Apr 17 11:40:14 2010 -0400
 
     Add examples/cairo-demo.py
 
- examples/cairo-demo.py |  121
- ++++++++++++++++++++++++++++++++++++++++++++++++
+ examples/cairo-demo.py | 121
+ +++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 121 insertions(+)
 
 commit 610dd1eec87fab5c8c3badb4d104cba74477c745
@@ -18213,18 +20255,18 @@ Date:	Sat Apr 17 09:17:14 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=603095
 
- configure.ac	     |	  2 +
- gi/Makefile.am      |	  4 +
- gi/pygi-argument.c  |	 12 ++-
- gi/pygi-callbacks.c |	216
- +++++++++++++++++++++++++++++++++++++++++++++++++++
- gi/pygi-callbacks.h |	 47 +++++++++++
- gi/pygi-closure.c   |	205
- ++++++++++++++++++++++++++++++++++++++++++++++++
- gi/pygi-closure.h   |	 57 ++++++++++++++
- gi/pygi-info.c      |	 49 ++++++++++--
- gi/pygi-private.h   |	  2 +
- tests/test_gi.py    |	 64 ++++++++++++++-
+ configure.ac	     |	 2 +
+ gi/Makefile.am      |	 4 +
+ gi/pygi-argument.c  |	12 ++-
+ gi/pygi-callbacks.c | 216
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ gi/pygi-callbacks.h |	47 ++++++++++++
+ gi/pygi-closure.c   | 205
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ gi/pygi-closure.h   |	57 ++++++++++++++
+ gi/pygi-info.c      |	49 ++++++++++--
+ gi/pygi-private.h   |	 2 +
+ tests/test_gi.py    |	64 +++++++++++++++-
  10 files changed, 648 insertions(+), 10 deletions(-)
 
 commit a34cb9f0038a6c89e5e6c5f7761d48a5a833044f
@@ -18235,17 +20277,17 @@ Date:	Sat Apr 17 10:54:45 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=603712
 
- configure.ac		  |    6 +++
- gi/Makefile.am		  |   10 +++-
- gi/gimodule.c		  |    7 +++
- gi/pygi-argument.c	  |   27 +++++++++-
- gi/pygi-foreign-cairo.c  |  103 ++++++++++++++++++++++++++++++++++++++
- gi/pygi-foreign-cairo.h  |   55 +++++++++++++++++++++
- gi/pygi-foreign.c	  |  123
- ++++++++++++++++++++++++++++++++++++++++++++++
- gi/pygi-foreign.h	  |   52 ++++++++++++++++++++
- gi/pygi-private.h	  |    1 +
- tests/test_everything.py |   48 ++++++++++++++++++
+ configure.ac		  |   6 +++
+ gi/Makefile.am		  |  10 +++-
+ gi/gimodule.c		  |   7 +++
+ gi/pygi-argument.c	  |  27 ++++++++++-
+ gi/pygi-foreign-cairo.c  | 103 +++++++++++++++++++++++++++++++++++++++
+ gi/pygi-foreign-cairo.h  |  55 +++++++++++++++++++++
+ gi/pygi-foreign.c	  | 123
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ gi/pygi-foreign.h	  |  52 ++++++++++++++++++++
+ gi/pygi-private.h	  |   1 +
+ tests/test_everything.py |  48 ++++++++++++++++++
  10 files changed, 428 insertions(+), 4 deletions(-)
 
 commit e73b6f6fe8b5f23a2a390ae0a6bbced593ded155
@@ -18256,8 +20298,8 @@ Date:	Fri Apr 16 14:35:13 2010 -0400
 
     https://bugzilla.gnome.org/show_bug.cgi?id=603537
 
- gi/pygi-struct.c |    6 ------
- tests/test_gi.py |    3 ++-
+ gi/pygi-struct.c | 6 ------
+ tests/test_gi.py | 3 ++-
  2 files changed, 2 insertions(+), 7 deletions(-)
 
 commit fc9ff02e53aacf9e77625c70985e99813544912a
@@ -18266,9 +20308,9 @@ Date:	Fri Apr 16 10:40:40 2010 -0400
 
     Add gdb and valgrind variants for the tests
 
- HACKING	   |   19 +++++++++++++++++++
- Makefile.am	   |   12 ++++++++++++
- tests/Makefile.am |   14 +++++++++++++-
+ HACKING	   | 19 +++++++++++++++++++
+ Makefile.am	   | 12 ++++++++++++
+ tests/Makefile.am | 14 +++++++++++++-
  3 files changed, 44 insertions(+), 1 deletion(-)
 
 commit 695ac7bc5c60371a32538d690c7a15509f3c9637
@@ -18277,8 +20319,8 @@ Date:	Fri Apr 16 14:36:11 2010 +1200
 
     Add build docs for windows
 
- Makefile.am  |    1 +
- README.win32 |   24 ++++++++++++++++++++++++
+ Makefile.am  |  1 +
+ README.win32 | 24 ++++++++++++++++++++++++
  2 files changed, 25 insertions(+)
 
 commit e580da87f0b2fd36cb5d8008fb2fb0c3b01f456a
@@ -18290,9 +20332,8 @@ Date:	Thu Apr 15 13:40:39 2010 +1200
      * Remove local doc install, point to website instead
      * link to versioned docs
 
- pygobject_postinstall.py |   43
- ++++++++++++++++++++++++++-----------------
- setup.py		  |   39 ++++++++++++++-------------------------
+ pygobject_postinstall.py | 43 ++++++++++++++++++++++++++-----------------
+ setup.py		  | 39 ++++++++++++++-------------------------
  2 files changed, 40 insertions(+), 42 deletions(-)
 
 commit 69ecd506c83ddf180c6cc9a2a8dc753a02543959
@@ -18305,7 +20346,7 @@ Date:	Sat Jul 25 14:12:30 2009 +1200
     no harm on linux as multiple calls to init
     are OK
 
- gio/giomodule.c |    3 +++
+ gio/giomodule.c | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 5d159a13d89587cba189a0ca3203ac003e2f1f2b
@@ -18318,14 +20359,14 @@ Date:	Thu Apr 15 22:52:48 2010 +1200
     largely unneeded. Just add the G_XXX constants
     to the module directly
 
- gobject/Makefile.am	      |   16 +-------
- gobject/constants.py	      |   83
- ++++++++++++++++++++++++++++++++++++++++++
- gobject/constants.py.in      |   50 -------------------------
- gobject/generate-constants.c |   44 ----------------------
- gobject/gobjectmodule.c      |   35 ++++++++++++++++++
- setup.py		      |    2 +-
- tests/runtests.py	      |    3 +-
+ gobject/Makefile.am	      | 16 +--------
+ gobject/constants.py	      | 83
+ ++++++++++++++++++++++++++++++++++++++++++++
+ gobject/constants.py.in      | 50 --------------------------
+ gobject/generate-constants.c | 44 -----------------------
+ gobject/gobjectmodule.c      | 35 +++++++++++++++++++
+ setup.py		      |  2 +-
+ tests/runtests.py	      |  3 +-
  7 files changed, 121 insertions(+), 112 deletions(-)
 
 commit 6d7a3ab9ce352692d0faccbf106974d264fa953d
@@ -18339,9 +20380,9 @@ Date:	Thu Apr 15 22:49:17 2010 +1200
     * Modernise setup.py and add more util functions
       to dsextras
 
- dsextras.py |	 32 ++++++++++++++++---
- setup.py    |	102
- +++++++++++++++++++++++++++++++++++++++++++++++++++--------
+ dsextras.py |	32 ++++++++++++++++---
+ setup.py    | 102
+ +++++++++++++++++++++++++++++++++++++++++++++++++++---------
  2 files changed, 116 insertions(+), 18 deletions(-)
 
 commit d11ef47072acae5801ce25c68d1289e425eb9fc2
@@ -18350,7 +20391,7 @@ Date:	Thu Apr 15 22:48:28 2010 +1200
 
     Include pygsource.h
 
- glib/pygiochannel.c |	  1 +
+ glib/pygiochannel.c | 1 +
  1 file changed, 1 insertion(+)
 
 commit c5f6af4844c74354abc508d17969d9d45153acf2
@@ -18359,7 +20400,7 @@ Date:	Thu Apr 15 14:25:59 2010 -0400
 
     Add metadata to the .doap file
 
- pygi.doap |	3 +++
+ pygi.doap | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 81796cb77cbe6b9598a652bd63c047af93e747ee
@@ -18368,8 +20409,8 @@ Date:	Wed Apr 14 12:01:43 2010 -0400
 
     override that wasn't checked in - fixes some test cases
 
- gi/overrides/GIMarshallingTests.py |	69
- ++++++++++++++++++++++++++++++++++++
+ gi/overrides/GIMarshallingTests.py | 69
+ ++++++++++++++++++++++++++++++++++++++
  1 file changed, 69 insertions(+)
 
 commit de5d2ea1584b01af809346316c7fbd4955a9db1d
@@ -18386,7 +20427,7 @@ Date:	Wed Apr 14 10:06:07 2010 -0400
     owned by Automake.	Use all-local instead to append things to
     the end of the normal build.
 
- gi/Makefile.am |   15 +++++++++------
+ gi/Makefile.am | 15 +++++++++------
  1 file changed, 9 insertions(+), 6 deletions(-)
 
 commit 5a47e96e3f580c973e6880dafa747f54c144c760
@@ -18412,7 +20453,7 @@ Date:	Tue Apr 13 13:33:12 2010 -0400
 	* codegen/docextract_to_xml.py: Replace &nbsp; which also causes
 	errors with a regular space.
 
- codegen/docextract_to_xml.py |    1 +
+ codegen/docextract_to_xml.py | 1 +
  1 file changed, 1 insertion(+)
 
 commit bd4e7f2459e34957aaae59b9be807d6dff5ec1eb
@@ -18424,7 +20465,7 @@ Date:	Tue Apr 13 12:28:10 2010 -0400
 	* codegen/docextract_to_xml.py (escape_text): Replace some &..;
 	expressions that cause errors with more appropriate output.
 
- codegen/docextract_to_xml.py |    4 ++++
+ codegen/docextract_to_xml.py | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit f00b9ce91fc9c3aabd4af4132fc112d9e415e12e
@@ -18440,7 +20481,7 @@ Date:	Sun Apr 11 17:46:40 2010 -0400
 	show up when the descriptions that include C++ code with C++
 	multi-line comments are used in Doxygen blocks.
 
- codegen/docextract_to_xml.py |    9 +++++++++
+ codegen/docextract_to_xml.py | 9 +++++++++
  1 file changed, 9 insertions(+)
 
 commit a2fcdecbb5e109da5568084d7acb2332af83b6f5
@@ -18457,7 +20498,7 @@ Date:	Sun Apr 11 16:15:01 2010 -0400
 	return ('Returns ...') which leads to annotation extraction
 	errors.
 
- codegen/docextract.py |    4 ++++
+ codegen/docextract.py | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 825fd305f03b726665edca34963978ce27448182
@@ -18551,9 +20592,9 @@ Date:	Sun Apr 11 15:45:09 2010 -0400
 	annotations but this would only be exhibited if annotation xml is
 	requested.
 
- codegen/docextract.py	      |  439
- +++++++++++++++++++++++++++++++++---------
- codegen/docextract_to_xml.py |   87 ++++++---
+ codegen/docextract.py	      | 439
+ ++++++++++++++++++++++++++++++++++---------
+ codegen/docextract_to_xml.py |  87 ++++++---
  2 files changed, 414 insertions(+), 112 deletions(-)
 
 commit 9fef1acb42cd900d4a814a7378f60bc189121785
@@ -18562,7 +20603,7 @@ Date:	Fri Apr 9 13:47:03 2010 +0200
 
     Always create the .so link
 
- gi/Makefile.am |    2 +-
+ gi/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e9f7fd414e94595e40eb1ba0fc471ca69136d82f
@@ -18573,10 +20614,10 @@ Date:	Thu Apr 8 11:52:25 2010 +0200
 
     Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
 
- docs/reference/pygio-file.xml	      |   58
- +++++++++++++++++-----------------
- docs/reference/pygio-inputstream.xml |   22 ++++++-------
- docs/reference/pygio-mount.xml       |   10 +++---
+ docs/reference/pygio-file.xml	      | 58
+ ++++++++++++++++++------------------
+ docs/reference/pygio-inputstream.xml | 22 +++++++-------
+ docs/reference/pygio-mount.xml       | 10 +++----
  3 files changed, 45 insertions(+), 45 deletions(-)
 
 commit 4cbd9941c5705970a9f7a429e236e1203d3155a1
@@ -18588,11 +20629,11 @@ Date:	Mon Apr 5 18:10:42 2010 +0200
 
     move tests that require pygtk to pygtk itself
 
- tests/test_conversion.py |   83 -------------
- tests/test_enum.py	  |  234 -------------------------------------
- tests/test_gtype.py	  |  112 ------------------
- tests/test_subtype.py	  |  289
- ----------------------------------------------
+ tests/test_conversion.py |  83 --------------
+ tests/test_enum.py	  | 234 --------------------------------------
+ tests/test_gtype.py	  | 112 ------------------
+ tests/test_subtype.py	  | 289
+ -----------------------------------------------
  4 files changed, 718 deletions(-)
 
 commit ef0ceb266a45715ece58642fb0042e3376416755
@@ -18601,9 +20642,9 @@ Date:	Wed Feb 3 20:33:03 2010 +0100
 
     Add modelines and copyright information to overrides modules
 
- gi/overrides/Gdk.py	|   21 +++++++++++++++++++++
- gi/overrides/Gtk.py	|   21 +++++++++++++++++++++
- gi/overrides/TestGI.py |   20 ++++++++++++++++++++
+ gi/overrides/Gdk.py	| 21 +++++++++++++++++++++
+ gi/overrides/Gtk.py	| 21 +++++++++++++++++++++
+ gi/overrides/TestGI.py | 20 ++++++++++++++++++++
  3 files changed, 62 insertions(+)
 
 commit 5106523a4b8378997a1e6cb0488398aa73e7d9d5
@@ -18616,9 +20657,9 @@ Date:	Wed Feb 3 20:29:55 2010 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=602830
 
- gi/overrides/TestGI.py |   49
- ++++++++++++++++++++++++++++++++++++++++++++++++
- tests/test_gi.py	|    8 +++++++-
+ gi/overrides/TestGI.py | 49
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ tests/test_gi.py	|  8 +++++++-
  2 files changed, 56 insertions(+), 1 deletion(-)
 
 commit 23fc0f615d87994acafd9d39e92dd92b587fc2eb
@@ -18629,10 +20670,10 @@ Date:	Thu Jan 21 17:30:51 2010 +0100
 
     http://bugzilla.gnome.org/show_bug.cgi?id=607674
 
- gobject/pygboxed.c	 |    6 +-----
- gobject/pygi-external.h |    1 -
- gobject/pygobject.c	 |    6 +-----
- gobject/pygpointer.c	 |    6 +-----
+ gobject/pygboxed.c	 | 6 +-----
+ gobject/pygi-external.h | 1 -
+ gobject/pygobject.c	 | 6 +-----
+ gobject/pygpointer.c	 | 6 +-----
  4 files changed, 3 insertions(+), 16 deletions(-)
 
 commit aefac8c5f64bf059dd6652f8a843d17b34fa0854
@@ -18648,13 +20689,13 @@ Date:	Fri Jan 22 22:22:37 2010 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=607759
 
- gi/pygi-argument.c |  586 ++++------------------------------------------
- gi/pygi-argument.h |	 1 -
- gi/pygi-info.c     |	 8 +-
- tests/libtestgi.c  |  660
- ----------------------------------------------------
- tests/libtestgi.h  |	86 -------
- tests/test_gi.py   |  144 ------------
+ gi/pygi-argument.c | 586 ++++-------------------------------------------
+ gi/pygi-argument.h |	1 -
+ gi/pygi-info.c     |	8 +-
+ tests/libtestgi.c  | 660
+ -----------------------------------------------------
+ tests/libtestgi.h  |  86 -------
+ tests/test_gi.py   | 144 ------------
  6 files changed, 47 insertions(+), 1438 deletions(-)
 
 commit eaf7cb8ebb7e34f9493ac83b2f04af4dcf45f40f
@@ -18677,15 +20718,15 @@ Date:	Fri Jan 22 13:41:21 2010 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=602830
 
- gi/importer.py      |	 40 +++++++-------------
- gi/module.py	     |	 43 ++++++++++++++-------
- gi/overrides/Gdk.py |	 42 +++++++++++++--------
- gi/overrides/Gtk.py |	 16 ++++----
- gi/types.py	     |	  6 +++
- tests/libtestgi.c   |	105
- +++++++++++++++++++++++++++++++++++++++++++++++++++
- tests/libtestgi.h   |	 49 ++++++++++++++++++++++++
- tests/test_gi.py    |	 36 ++++++++++++++++++
+ gi/importer.py      |	40 +++++++-------------
+ gi/module.py	     |	43 ++++++++++++++-------
+ gi/overrides/Gdk.py |	42 +++++++++++++--------
+ gi/overrides/Gtk.py |	16 ++++----
+ gi/types.py	     |	 6 +++
+ tests/libtestgi.c   | 105
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ tests/libtestgi.h   |	49 ++++++++++++++++++++++++
+ tests/test_gi.py    |	36 ++++++++++++++++++
  8 files changed, 273 insertions(+), 64 deletions(-)
 
 commit 289d641775d1ea52d2a5379126b70b7fcee46683
@@ -18696,7 +20737,7 @@ Date:	Sun Jan 10 21:01:59 2010 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=606582
 
- gio/gcancellable.override |	1 +
+ gio/gcancellable.override | 1 +
  1 file changed, 1 insertion(+)
 
 commit b11cf2595987c1f0fc4ffd834f07c98b92aa2355
@@ -18705,8 +20746,8 @@ Date:	Fri Jan 8 21:10:28 2010 +0100
 
     Initialize struct fields to 0 when allocating
 
- gi/pygi-struct.c |    2 +-
- tests/test_gi.py |    5 +++++
+ gi/pygi-struct.c | 2 +-
+ tests/test_gi.py | 5 +++++
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit b4189be2b2d3c350fdf33e27309bee5a72e4f72a
@@ -18725,10 +20766,10 @@ Date:	Fri Jan 8 20:33:44 2010 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=603536
 
- gi/types.py	   |   35 +++++++----------------------------
- tests/libtestgi.c |   33 ---------------------------------
- tests/libtestgi.h |	7 -------
- tests/test_gi.py  |   21 ++++++++++-----------
+ gi/types.py	   | 35 +++++++----------------------------
+ tests/libtestgi.c | 33 ---------------------------------
+ tests/libtestgi.h |  7 -------
+ tests/test_gi.py  | 21 ++++++++++-----------
  4 files changed, 17 insertions(+), 79 deletions(-)
 
 commit 4db68b958ea11bd2c3a88067cae03fd6bdd1d24b
@@ -18737,9 +20778,9 @@ Date:	Tue Jan 5 13:36:44 2010 +0100
 
     Suppress compilation warnings
 
- gi/pygi-argument.c	 |    3 ++-
- gi/pygi-boxed.c	 |    2 --
- gi/pygobject-external.h |    2 +-
+ gi/pygi-argument.c	 | 3 ++-
+ gi/pygi-boxed.c	 | 2 --
+ gi/pygobject-external.h | 2 +-
  3 files changed, 3 insertions(+), 4 deletions(-)
 
 commit 4e2efa91d101bf755739e1cca8eee41eb0ad20fd
@@ -18750,7 +20791,7 @@ Date:	Mon Jan 4 08:35:14 2010 +0100
 
     Committed a patch from Kevin Pyle
 
- Makefile.am |	 27 +++++++++++++--------------
+ Makefile.am | 27 +++++++++++++--------------
  1 file changed, 13 insertions(+), 14 deletions(-)
 
 commit 8ddcbca0e98e0b0c082170a2b2b6cfcbd7864b40
@@ -18763,8 +20804,8 @@ Date:	Fri Dec 11 22:24:30 2009 +0100
     loaded from the
     system's default site-package directory.
 
- tests/runtests.py |	1 -
- tests/test_gi.py  |	3 +++
+ tests/runtests.py | 1 -
+ tests/test_gi.py  | 3 +++
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 commit 284a1e1c0143c95d3007cf58e6c248b5d11fb4d1
@@ -18773,10 +20814,10 @@ Date:	Sun Jan 3 11:02:57 2010 +0100
 
     Wrap gio.Cancellable.make_pollfd() and add a test
 
- gio/Makefile.am	    |	 1 +
- gio/gcancellable.override  |	37 +++++++++++++++++++++++++++++++++++++
- gio/gio.override	    |	 3 +++
- tests/test_gcancellable.py |	15 +++++++++++++++
+ gio/Makefile.am	    |  1 +
+ gio/gcancellable.override  | 37 +++++++++++++++++++++++++++++++++++++
+ gio/gio.override	    |  3 +++
+ tests/test_gcancellable.py | 15 +++++++++++++++
  4 files changed, 56 insertions(+)
 
 commit 82d7bcbf37200ee2ef5892dd12bebd2f39965c56
@@ -18785,8 +20826,8 @@ Date:	Sat Jan 2 23:15:56 2010 +0100
 
     Make cancellable an optional parameter in many methods
 
- gio/gio.defs |  102
- +++++++++++++++++++++++++++++-----------------------------
+ gio/gio.defs | 102
+ +++++++++++++++++++++++++++++------------------------------
  1 file changed, 51 insertions(+), 51 deletions(-)
 
 commit 49a078cd22d55dc33a03ecfda235d63955edc741
@@ -18795,7 +20836,7 @@ Date:	Sat Jan 2 23:15:21 2010 +0100
 
     Post release version bump to 2.21.2
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 4f9f1f43ab4e2cfb204ffa0e257a34cfd95d84e2
@@ -18804,7 +20845,7 @@ Date:	Sat Jan 2 22:58:36 2010 +0100
 
     Update NEWS and release PyGObject-2.21.1
 
- NEWS |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ NEWS | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 55 insertions(+)
 
 commit c1f34be73bd186d7b4682dfef133da2c4229d213
@@ -18813,8 +20854,8 @@ Date:	Fri Jan 1 20:25:35 2010 +0100
 
     Wrap gio.Volume.eject_with_operation()
 
- gio/gvolume.override |   54
- ++++++++++++++++++++++++++++++++++++++++++++++++++
+ gio/gvolume.override | 54
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 54 insertions(+)
 
 commit 9b76fbff6f6897aaf26ed4644c1f19efc2826917
@@ -18823,7 +20864,7 @@ Date:	Fri Jan 1 20:22:21 2010 +0100
 
     gio.Mount.unmount_with_operation() fix a copy/paste leftover
 
- gio/gmount.override |	  4 ++--
+ gio/gmount.override | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 6f459786dd641cd49d81eba403d940620f961cab
@@ -18832,8 +20873,8 @@ Date:	Fri Jan 1 20:21:05 2010 +0100
 
     Wrap gio.Mount.eject_with_operation()
 
- gio/gmount.override |	 54
- +++++++++++++++++++++++++++++++++++++++++++++++++++
+ gio/gmount.override | 54
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 54 insertions(+)
 
 commit d4b5d1b4839364e5676eb2da28f1d21db7e2552d
@@ -18842,8 +20883,8 @@ Date:	Fri Jan 1 20:15:38 2010 +0100
 
     Wrap gio.Mount.unmount_mountable_with_operation()
 
- gio/gmount.override |	 54
- +++++++++++++++++++++++++++++++++++++++++++++++++++
+ gio/gmount.override | 54
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 54 insertions(+)
 
 commit e919d47c2430451b436cec955e9b99237f97028c
@@ -18852,8 +20893,8 @@ Date:	Fri Jan 1 18:22:46 2010 +0100
 
     Wrap File.unmount_mountable_with_operation()
 
- gio/gfile.override |	54
- ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ gio/gfile.override | 54
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 54 insertions(+)
 
 commit 5a614df9c5507d67f240462f7bf71b4cd411addf
@@ -18862,7 +20903,7 @@ Date:	Fri Jan 1 18:14:11 2010 +0100
 
     Wrap gio.File.stop_mountable()
 
- gio/gfile.override |	52
+ gio/gfile.override | 52
  ++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 52 insertions(+)
 
@@ -18872,7 +20913,7 @@ Date:	Fri Jan 1 18:10:49 2010 +0100
 
     Wrap gio.File.start_mountable()
 
- gio/gfile.override |	52
+ gio/gfile.override | 52
  ++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 52 insertions(+)
 
@@ -18882,8 +20923,8 @@ Date:	Fri Jan 1 18:02:46 2010 +0100
 
     Wrap gio.File.replace_readwrite_async()
 
- gio/gfile.override |	55
- ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ gio/gfile.override | 55
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 55 insertions(+)
 
 commit 92662f129fc728258fd5e34f53dcb081e3715017
@@ -18892,7 +20933,7 @@ Date:	Fri Jan 1 17:00:26 2010 +0100
 
     Wrap gio.File.poll_mountable()
 
- gio/gfile.override |	41 +++++++++++++++++++++++++++++++++++++++++
+ gio/gfile.override | 41 +++++++++++++++++++++++++++++++++++++++++
  1 file changed, 41 insertions(+)
 
 commit 99902b786500948c3278779841e4db54223b9256
@@ -18901,7 +20942,7 @@ Date:	Fri Jan 1 16:56:26 2010 +0100
 
     Wrap gio.File.open_readwrite_async()
 
- gio/gfile.override |	44 ++++++++++++++++++++++++++++++++++++++++++++
+ gio/gfile.override | 44 ++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 44 insertions(+)
 
 commit 8cff5d53183ae81364ac74a34a1d52e55e082eb4
@@ -18910,8 +20951,8 @@ Date:	Fri Jan 1 16:50:15 2010 +0100
 
     Wrap gio.File.eject_mountable_with_operation()
 
- gio/gfile.override |	54
- ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ gio/gfile.override | 54
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 54 insertions(+)
 
 commit ca436fe7785fd24b0f0e65f2f8c9fa6478277682
@@ -18920,9 +20961,9 @@ Date:	Fri Jan 1 13:30:24 2010 +0100
 
     Wrap gio.File.create_readwrite_async() and add a test
 
- gio/gfile.override |	51
+ gio/gfile.override | 51
  +++++++++++++++++++++++++++++++++++++++++++++++++++
- tests/test_gio.py  |	24 ++++++++++++++++++++++++
+ tests/test_gio.py  | 24 ++++++++++++++++++++++++
  2 files changed, 75 insertions(+)
 
 commit f72c5e451dfaeb01b3c3d9243fed2732d3620462
@@ -18931,8 +20972,8 @@ Date:	Fri Jan 1 13:20:11 2010 +0100
 
     Wrap gio.Drive.stop()
 
- gio/gdrive.override |	 52
- +++++++++++++++++++++++++++++++++++++++++++++++++++
+ gio/gdrive.override | 52
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 52 insertions(+)
 
 commit 29043bade408338cefa13fb4b0c875aabd3ef05e
@@ -18941,8 +20982,8 @@ Date:	Fri Jan 1 13:00:42 2010 +0100
 
     Wrap gio.Drive.start()
 
- gio/gdrive.override |	 52
- +++++++++++++++++++++++++++++++++++++++++++++++++++
+ gio/gdrive.override | 52
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 52 insertions(+)
 
 commit dff374287bbecc8af782bbc726fad86c6c867754
@@ -18951,7 +20992,7 @@ Date:	Fri Jan 1 12:45:29 2010 +0100
 
     Add more remainders on missing methods of gio.Socket and related types
 
- gio/gsocket.override |    3 +++
+ gio/gsocket.override | 3 +++
  1 file changed, 3 insertions(+)
 
 commit b8c7e996498bd72df551011af85ff05ef7335b4f
@@ -18960,9 +21001,9 @@ Date:	Fri Jan 1 12:41:08 2010 +0100
 
     Wrap gio.SocketListener.accept_socket_async|finish() and add a test
 
- gio/gsocket.override  |   86
- +++++++++++++++++++++++++++++++++++++++++++++++--
- tests/test_gsocket.py |   24 ++++++++++++++
+ gio/gsocket.override  | 86
+ +++++++++++++++++++++++++++++++++++++++++++++++++--
+ tests/test_gsocket.py | 24 ++++++++++++++
  2 files changed, 108 insertions(+), 2 deletions(-)
 
 commit a5ae2d5ba3db34967fe07a3cc97b75df2793988c
@@ -18971,8 +21012,8 @@ Date:	Fri Jan 1 12:28:53 2010 +0100
 
     Wrap gio.SocketListener.accept_finish() and add a test
 
- gio/gsocket.override  |   44 ++++++++++++++++++++++++++++++++++++++++++--
- tests/test_gsocket.py |   24 ++++++++++++++++++++++++
+ gio/gsocket.override  | 44 ++++++++++++++++++++++++++++++++++++++++++--
+ tests/test_gsocket.py | 24 ++++++++++++++++++++++++
  2 files changed, 66 insertions(+), 2 deletions(-)
 
 commit a5ab26cc1bb3e9dd57e2fdb26ef5c02e8066d097
@@ -18981,7 +21022,7 @@ Date:	Fri Jan 1 11:19:34 2010 +0100
 
     Wrap gio.SocketListener.accept_async()
 
- gio/gsocket.override |   42 ++++++++++++++++++++++++++++++++++++++++++
+ gio/gsocket.override | 42 ++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 42 insertions(+)
 
 commit c9496b29ef9ef232020a4044577d2947353953a5
@@ -18990,9 +21031,9 @@ Date:	Fri Jan 1 11:14:35 2010 +0100
 
     Wrap gio.SocketListener.accept_socket() and add a test
 
- gio/gsocket.override  |   48
+ gio/gsocket.override  | 48
  +++++++++++++++++++++++++++++++++++++++++++++++-
- tests/test_gsocket.py |   13 +++++++++++++
+ tests/test_gsocket.py | 13 +++++++++++++
  2 files changed, 60 insertions(+), 1 deletion(-)
 
 commit 1aa5e301c49f11e1c5ef58de44b4b03f714d1a70
@@ -19001,9 +21042,8 @@ Date:	Thu Dec 31 16:35:18 2009 +0100
 
     Wrap gio.SocketListener.accept() and add a test
 
- gio/gsocket.override  |   46
- +++++++++++++++++++++++++++++++++++++++++++++-
- tests/test_gsocket.py |   13 +++++++++++++
+ gio/gsocket.override  | 46 +++++++++++++++++++++++++++++++++++++++++++++-
+ tests/test_gsocket.py | 13 +++++++++++++
  2 files changed, 58 insertions(+), 1 deletion(-)
 
 commit aaedcf166c78baf5449ef59d0ade4a29077fedc7
@@ -19012,7 +21052,7 @@ Date:	Thu Dec 31 16:25:33 2009 +0100
 
     Make cancellable optional in gio.SocketClient.connect_to_host()
 
- gio/gio.defs |    2 +-
+ gio/gio.defs | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 3829d7667b19126fb74562b28d271e616b154c99
@@ -19021,9 +21061,9 @@ Date:	Thu Dec 31 15:25:10 2009 +0100
 
     Wrap gio.SocketListener.add_address() and add a test
 
- gio/gsocket.override  |   57
- ++++++++++++++++++++++++++++++++++++++++++++++++-
- tests/test_gsocket.py |    9 ++++++++
+ gio/gsocket.override  | 57
+ ++++++++++++++++++++++++++++++++++++++++++++++++++-
+ tests/test_gsocket.py |  9 ++++++++
  2 files changed, 65 insertions(+), 1 deletion(-)
 
 commit 5bec72f34ea75bc56158cae5c39d61a2a4e7e601
@@ -19032,7 +21072,7 @@ Date:	Thu Dec 31 10:19:47 2009 +0100
 
     Add more remainders on missing methods of gio.Socket and related types
 
- gio/gsocket.override |    8 ++++++++
+ gio/gsocket.override | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 commit b08b20f2b1a57bcbf400d6fe8e87cf052bdb719d
@@ -19041,8 +21081,7 @@ Date:	Thu Dec 31 10:16:18 2009 +0100
 
     Wrap gio.SocketClient.connect_to_service_async()
 
- gio/gsocket.override |   47
- +++++++++++++++++++++++++++++++++++++++++++++++
+ gio/gsocket.override | 47 +++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 47 insertions(+)
 
 commit 116ea1bfe32946e67aa54eb8dc7b977e57f254c2
@@ -19051,7 +21090,7 @@ Date:	Thu Dec 31 10:10:43 2009 +0100
 
     Wrap gio.SocketClient.connect_to_host_async()
 
- gio/gsocket.override |   48
+ gio/gsocket.override | 48
  ++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 48 insertions(+)
 
@@ -19061,7 +21100,7 @@ Date:	Thu Dec 31 09:59:46 2009 +0100
 
     Wrap gio.SocketClient.connect_async()
 
- gio/gsocket.override |   45 +++++++++++++++++++++++++++++++++++++++++++++
+ gio/gsocket.override | 45 +++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 45 insertions(+)
 
 commit dff024256295c15e49888ad9d5fef74a7746edd7
@@ -19070,8 +21109,8 @@ Date:	Wed Dec 30 23:44:25 2009 +0100
 
     Wrap gio.SocketAddressEnumerator.next_async() and add a test
 
- gio/gsocket.override  |   42 ++++++++++++++++++++++++++++++++++++++++++
- tests/test_gsocket.py |   16 ++++++++++++++++
+ gio/gsocket.override  | 42 ++++++++++++++++++++++++++++++++++++++++++
+ tests/test_gsocket.py | 16 ++++++++++++++++
  2 files changed, 58 insertions(+)
 
 commit e2330bd0d6cbc49b0ecb27b30e3b0593935ce229
@@ -19080,8 +21119,8 @@ Date:	Wed Dec 30 23:43:14 2009 +0100
 
     Add a missing object gio.InetSocketAddress new in GIO 2.22
 
- gio/gio-types.defs |	 7 +++++++
- gio/gio.defs	    |	31 +++++++++++++++++++++++++++++++
+ gio/gio-types.defs |  7 +++++++
+ gio/gio.defs	    | 31 +++++++++++++++++++++++++++++++
  2 files changed, 38 insertions(+)
 
 commit 6040b33467ea381c6cb02f6a5efc0745fa8fa47b
@@ -19090,7 +21129,7 @@ Date:	Wed Dec 30 22:54:47 2009 +0100
 
     Make cancellable optional for gio.SocketAddressEnumerator.next()
 
- gio/gio.defs |    2 +-
+ gio/gio.defs | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit b19f59790b9de943d69b6c5e483928e0443c3d20
@@ -19099,7 +21138,7 @@ Date:	Wed Dec 30 22:17:44 2009 +0100
 
     Add a remainder of the Socket methods that needs manual wrapping still
 
- gio/gsocket.override |    5 +++++
+ gio/gsocket.override | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 771a7c3fdef7b2e98e509293a8376a81c1282286
@@ -19108,8 +21147,8 @@ Date:	Wed Dec 30 17:20:35 2009 +0100
 
     Wrap gio.Socket.condition_wait() and add a test
 
- gio/gsocket.override  |   27 +++++++++++++++++++++++++++
- tests/test_gsocket.py |    6 +++++-
+ gio/gsocket.override  | 27 +++++++++++++++++++++++++++
+ tests/test_gsocket.py |  6 +++++-
  2 files changed, 32 insertions(+), 1 deletion(-)
 
 commit 50960656815b0897a5ebe5f011537b8dcbdc857e
@@ -19118,10 +21157,10 @@ Date:	Wed Dec 30 16:21:49 2009 +0100
 
     Wrap gio.Socket.condition_check() and add a test
 
- gio/Makefile.am       |    1 +
- gio/gio.override      |    1 +
- gio/gsocket.override  |   41 +++++++++++++++++++++++++++++++++++++++++
- tests/test_gsocket.py |   21 +++++++++++++++++++++
+ gio/Makefile.am       |  1 +
+ gio/gio.override      |  1 +
+ gio/gsocket.override  | 41 +++++++++++++++++++++++++++++++++++++++++
+ tests/test_gsocket.py | 21 +++++++++++++++++++++
  4 files changed, 64 insertions(+)
 
 commit de7a359e81792ae8573ac944455ea289985449ed
@@ -19130,8 +21169,8 @@ Date:	Wed Dec 30 14:07:52 2009 +0100
 
     Wrap gio.Resolver.lookup_service_finish() and add a test
 
- gio/gresolver.override  |   37 +++++++++++++++++++++++++++++++++++++
- tests/test_gresolver.py |   13 +++++++++++++
+ gio/gresolver.override  | 37 +++++++++++++++++++++++++++++++++++++
+ tests/test_gresolver.py | 13 +++++++++++++
  2 files changed, 50 insertions(+)
 
 commit 308421789ce849040d645077c41c80b6e2e65e83
@@ -19140,7 +21179,7 @@ Date:	Wed Dec 30 14:00:22 2009 +0100
 
     Wrap gio.Resolver.lookup_service_async()
 
- gio/gresolver.override |   48
+ gio/gresolver.override | 48
  ++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 48 insertions(+)
 
@@ -19150,8 +21189,8 @@ Date:	Wed Dec 30 11:11:32 2009 +0100
 
     Wrap gio.Resolver.lookup_service() and add a test
 
- gio/gresolver.override  |   42 ++++++++++++++++++++++++++++++++++++++++++
- tests/test_gresolver.py |    5 +++++
+ gio/gresolver.override  | 42 ++++++++++++++++++++++++++++++++++++++++++
+ tests/test_gresolver.py |  5 +++++
  2 files changed, 47 insertions(+)
 
 commit 7fc71f490494dae73a5264869a97a9d30814930e
@@ -19160,9 +21199,9 @@ Date:	Tue Dec 29 22:12:50 2009 +0100
 
     Wrap gio.Resolver.lookup_by_address_async() and add a test
 
- gio/gresolver.override  |   46
+ gio/gresolver.override  | 46
  ++++++++++++++++++++++++++++++++++++++++++++++
- tests/test_gresolver.py |   14 ++++++++++++++
+ tests/test_gresolver.py | 14 ++++++++++++++
  2 files changed, 60 insertions(+)
 
 commit c91656dbe56f07d3ebbad5113467c22427cf212a
@@ -19171,9 +21210,9 @@ Date:	Tue Dec 29 21:41:30 2009 +0100
 
     Wrap gio.Resolver.lookup_by_name_finish() and add a test
 
- gio/gresolver.override  |   82
- +++++++++++++++++++++++++++++++++++++++++++++++
- tests/test_gresolver.py |   16 +++++++--
+ gio/gresolver.override  | 82
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ tests/test_gresolver.py | 16 ++++++++--
  2 files changed, 96 insertions(+), 2 deletions(-)
 
 commit 45b477342fa1c2435917c6d97745ad57665c4734
@@ -19182,8 +21221,8 @@ Date:	Tue Dec 29 17:15:44 2009 +0100
 
     Wrap gio.Drive.eject_with_data()
 
- gio/gdrive.override |	 54
- +++++++++++++++++++++++++++++++++++++++++++++++++++
+ gio/gdrive.override | 54
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 54 insertions(+)
 
 commit 635227480f9659a1f91ab1ec12536d3ed012a976
@@ -19192,8 +21231,8 @@ Date:	Tue Dec 29 17:06:52 2009 +0100
 
     Deprecate old gio.Drive methods
 
- gio/gdrive.override |	  7 ++++++-
- gio/gio.defs	     |	  1 +
+ gio/gdrive.override | 7 ++++++-
+ gio/gio.defs	     | 1 +
  2 files changed, 7 insertions(+), 1 deletion(-)
 
 commit 3c0cbc95af29b1e192ed4b5963e96e39c70b349c
@@ -19202,7 +21241,7 @@ Date:	Tue Dec 29 13:51:54 2009 +0100
 
     Small fix in the header
 
- gio/gdrive.override |	  2 +-
+ gio/gdrive.override | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 7589128515b79d836365247dc876538c6352da23
@@ -19211,11 +21250,11 @@ Date:	Tue Dec 29 12:40:50 2009 +0100
 
     Wrap gio.Resolver.lookup_by_name() and add a couple of tests
 
- gio/Makefile.am	 |    1 +
- gio/gio.override	 |    1 +
- gio/gresolver.override  |   57
- +++++++++++++++++++++++++++++++++++++++++++++++
- tests/test_gresolver.py |   21 +++++++++++++++++
+ gio/Makefile.am	 |  1 +
+ gio/gio.override	 |  1 +
+ gio/gresolver.override  | 57
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ tests/test_gresolver.py | 21 ++++++++++++++++++
  4 files changed, 80 insertions(+)
 
 commit 604d2bf220b1fefa415baaedbdb2882dbaf9e07e
@@ -19225,7 +21264,7 @@ Date:	Tue Dec 29 12:39:13 2009 +0100
     Make cancellable an optional parameter in
     gio.Resolver.lookup_by_address()
 
- gio/gio.defs |    2 +-
+ gio/gio.defs | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 00029145f4cd10759b37b38fb9f72435bf26b28b
@@ -19234,8 +21273,8 @@ Date:	Tue Dec 29 10:15:14 2009 +0100
 
     Strip g_ prefix for many other functions
 
- gio/gio.defs |   94
- +++++++++++++++++++++++++++++-----------------------------
+ gio/gio.defs | 94
+ ++++++++++++++++++++++++++++++------------------------------
  1 file changed, 47 insertions(+), 47 deletions(-)
 
 commit 56d5dfc4fd862e32c19f944a0feb7a00a9154f06
@@ -19244,7 +21283,7 @@ Date:	Tue Dec 29 10:12:53 2009 +0100
 
     Strip g_prefix from InetAddress functions
 
- gio/gio.defs |    8 ++++----
+ gio/gio.defs | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 1d360301d51a587a36a59f5d62e354484bbd2b31
@@ -19255,7 +21294,7 @@ Date:	Tue Dec 29 10:03:59 2009 +0100
 
     Strip the g_ prefix from function name
 
- gio/gio.defs |    2 +-
+ gio/gio.defs | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 0fe00109c4f6fc27cbaae9b0a24ecfac71355d2f
@@ -19264,11 +21303,11 @@ Date:	Tue Dec 29 09:54:05 2009 +0100
 
     Wrap gio.FileIOStream.query_info_async() and add a test
 
- gio/Makefile.am	    |	 1 +
- gio/gfileiostream.override |	68
- ++++++++++++++++++++++++++++++++++++++++++++
- gio/gio.override	    |	 1 +
- tests/test_gio.py	    |	18 ++++++++++++
+ gio/Makefile.am	    |  1 +
+ gio/gfileiostream.override | 68
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ gio/gio.override	    |  1 +
+ tests/test_gio.py	    | 18 ++++++++++++
  4 files changed, 88 insertions(+)
 
 commit 86783c695f3641b9491962e8f95a4dcb91f4017c
@@ -19279,8 +21318,8 @@ Date:	Tue Dec 29 13:08:29 2009 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=603534
 
- gobject/pygenum.c  |	20 ++++++++++++++------
- gobject/pygflags.c |	19 +++++++++++++------
+ gobject/pygenum.c  | 20 ++++++++++++++------
+ gobject/pygflags.c | 19 +++++++++++++------
  2 files changed, 27 insertions(+), 12 deletions(-)
 
 commit b90c01cff5ff5cb2796182f2ffd7b5248eaeed6a
@@ -19289,11 +21328,11 @@ Date:	Mon Dec 28 22:41:54 2009 +0100
 
     Wrap GIOStream.close_async() and add a test
 
- gio/Makefile.am	|    1 +
- gio/gio.override	|    1 +
- gio/giostream.override |   68
- ++++++++++++++++++++++++++++++++++++++++++++++++
- tests/test_gio.py	|   21 +++++++++++++++
+ gio/Makefile.am	|  1 +
+ gio/gio.override	|  1 +
+ gio/giostream.override | 68
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
+ tests/test_gio.py	| 21 ++++++++++++++++
  4 files changed, 91 insertions(+)
 
 commit 0bff01bcee73a0e0d18342331136119c4e8bf151
@@ -19302,7 +21341,7 @@ Date:	Mon Dec 28 22:39:09 2009 +0100
 
     Make cancellable an optional parameter in GFile.create_readwrite()
 
- gio/gio.defs |    2 +-
+ gio/gio.defs | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 1cabd733cde269ce3164834933f4a226673ecb0b
@@ -19311,7 +21350,7 @@ Date:	Mon Dec 28 21:39:50 2009 +0100
 
     Remove a duplicate entry in gio.defs
 
- gio/gio.defs |    9 ---------
+ gio/gio.defs | 9 ---------
  1 file changed, 9 deletions(-)
 
 commit 9ac372ad0bcfdec4bb1c96bc152246542a59a9b1
@@ -19320,8 +21359,8 @@ Date:	Mon Dec 28 21:37:49 2009 +0100
 
     Wrap gio.FileInfo.set_modification_time and add a test
 
- gio/gfileinfo.override |   33 ++++++++++++++++++++++++++++++++-
- tests/test_gio.py	|    7 ++++++-
+ gio/gfileinfo.override | 33 ++++++++++++++++++++++++++++++++-
+ tests/test_gio.py	|  7 ++++++-
  2 files changed, 38 insertions(+), 2 deletions(-)
 
 commit 7bc2673f92138b1804d8eba091942d14d8884f90
@@ -19330,8 +21369,8 @@ Date:	Mon Dec 28 18:28:03 2009 +0100
 
     Wrap gio.EmblemedIcon.get_emblems() and add a test
 
- gio/gicon.override  |	 14 ++++++++++++++
- tests/test_gicon.py |	  7 +++++++
+ gio/gicon.override  | 14 ++++++++++++++
+ tests/test_gicon.py |	7 +++++++
  2 files changed, 21 insertions(+)
 
 commit 3d5056ad766d6856d8d6459fe9b377de2f0fd172
@@ -19340,8 +21379,8 @@ Date:	Sat Dec 26 22:27:48 2009 +0100
 
     Update Enums and Flags with new API
 
- gio/gio-types.defs |  153
- ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ gio/gio-types.defs | 153
+ +++++++++++++++++++++++++++++++++++++++++++++++++++--
  1 file changed, 149 insertions(+), 4 deletions(-)
 
 commit 62a9d660a4a2d5fab1d57c6c96c984ff02d25ccd
@@ -19350,7 +21389,7 @@ Date:	Fri Dec 25 18:06:39 2009 +0100
 
     Post release version bump to 2.21.1
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2bd92cba5b028f0f78c35ecb34e648e95248f9d3
@@ -19362,7 +21401,7 @@ Date:	Fri Aug 14 15:10:26 2009 +0200
     Set the value by g_value_set_uchar and allow to use integer types
     from python.
 
- gobject/pygtype.c |   15 +++++++++++----
+ gobject/pygtype.c | 15 +++++++++++----
  1 file changed, 11 insertions(+), 4 deletions(-)
 
 commit 828d0f042b59ea0319f33a23803c179af34ef2f1
@@ -19386,13 +21425,13 @@ Date:	Wed Nov 25 10:33:56 2009 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=602640
 
- gi/pygi-argument.c |	11 +++++++++-
- gi/pygi-argument.h |	 3 ++-
- gi/pygi-info.c     |	14 ++++++++++--
- tests/libtestgi.c  |	60
- ++++++++++++++++++++++++++++++++++++++++++++++++++++
- tests/libtestgi.h  |	 4 ++++
- tests/test_gi.py   |	15 +++++++++++++
+ gi/pygi-argument.c | 11 +++++++++-
+ gi/pygi-argument.h |  3 ++-
+ gi/pygi-info.c     | 14 +++++++++++--
+ tests/libtestgi.c  | 60
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ tests/libtestgi.h  |  4 ++++
+ tests/test_gi.py   | 15 ++++++++++++++
  6 files changed, 103 insertions(+), 4 deletions(-)
 
 commit 867536c6734e606d045760837ed22583da06566e
@@ -19401,8 +21440,8 @@ Date:	Fri Dec 18 10:50:09 2009 +0100
 
     Update NEWS and README, release pygobject 2.21.0
 
- NEWS	|   18 ++++++++++++++++++
- README |    6 +++---
+ NEWS	| 18 ++++++++++++++++++
+ README |  6 +++---
  2 files changed, 21 insertions(+), 3 deletions(-)
 
 commit f50fbd24fa61863aaefa4ae1e12e0b314ecd43ae
@@ -19411,7 +21450,7 @@ Date:	Fri Dec 18 10:31:48 2009 +0100
 
     Add pygi-external.h into Makefile SOURCES
 
- gobject/Makefile.am |	  3 ++-
+ gobject/Makefile.am | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 108c03b78f04b4bcfe066a6cb4d941e172bd32fe
@@ -19420,7 +21459,7 @@ Date:	Fri Dec 18 01:20:34 2009 +0100
 
     Bug 598435 - No wrapping for g_find_program_in_path ()
 
- glib/glibmodule.c |   20 ++++++++++++++++++++
+ glib/glibmodule.c | 20 ++++++++++++++++++++
  1 file changed, 20 insertions(+)
 
 commit d3d5cb3a4a2c2cb2bd0c2571304d59e19bc08452
@@ -19429,10 +21468,10 @@ Date:	Thu Dec 17 21:54:36 2009 +0100
 
     Wrap new API added in GIO-UNIX 2.22
 
- gio/unix-types.defs |	 22 ++++++++++
- gio/unix.defs	     |	115
- ++++++++++++++++++++++++++++++++++++++++++++++++++-
- gio/unix.override   |	  8 ++++
+ gio/unix-types.defs |	22 ++++++++++
+ gio/unix.defs	     | 115
+ +++++++++++++++++++++++++++++++++++++++++++++++++++-
+ gio/unix.override   |	 8 ++++
  3 files changed, 144 insertions(+), 1 deletion(-)
 
 commit c87c8a81947a68507e8f3bcaf8e0e969b3e5331b
@@ -19445,7 +21484,7 @@ Date:	Thu Dec 17 21:52:11 2009 +0100
     branch.
     Without the patch the unix module will fail, so I'm forced to bump.
 
- configure.ac |    6 +++---
+ configure.ac | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit b630c8d4b1e55938dac89729768c4a877b305215
@@ -19454,7 +21493,7 @@ Date:	Thu Dec 17 02:24:45 2009 +0100
 
     Properly define Connectable as interface type and not object type
 
- gio/gio-types.defs |	12 ++++++------
+ gio/gio-types.defs | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 commit e955b931b07113c7432f7a85f882f69f12d263ad
@@ -19467,8 +21506,8 @@ Date:	Mon Nov 30 22:01:25 2009 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=603411
 
- configure.ac	   |	2 +-
- gi/pygi-private.h |   19 +++++++++++++++++++
+ configure.ac	   |  2 +-
+ gi/pygi-private.h | 19 +++++++++++++++++++
  2 files changed, 20 insertions(+), 1 deletion(-)
 
 commit 542fdf6da4ad8f2d28d0d50152bd93cb4d8ee39a
@@ -19480,8 +21519,8 @@ Date:	Sat Nov 28 18:48:19 2009 +0000
 
     https://bugzilla.gnome.org/show_bug.cgi?id=602384
 
- gi/pygi-argument.c |	14 +++++++-------
- tests/test_gi.py   |	18 +++++++++---------
+ gi/pygi-argument.c | 14 +++++++-------
+ tests/test_gi.py   | 18 +++++++++---------
  2 files changed, 16 insertions(+), 16 deletions(-)
 
 commit 38e89942d29f2a1dba47ab4a8d5edc84322707cd
@@ -19492,7 +21531,7 @@ Date:	Mon Nov 30 00:10:56 2009 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=603355
 
- gobject/generate-constants.c |   32 ++++++++++++++++----------------
+ gobject/generate-constants.c | 32 ++++++++++++++++----------------
  1 file changed, 16 insertions(+), 16 deletions(-)
 
 commit cfa7d005487e17e8f7c1ceb14282d3a5baadb736
@@ -19502,9 +21541,9 @@ Date:	Sat Nov 28 00:22:21 2009 +0100
     Remove global checks for pointers and move them in type cases that
     need them
 
- gi/pygi-argument.c |  516
- ++++++++++++++++++++++++++++++++++++++++++----------
- gi/pygi-info.c     |  333 +++++++++++++++++----------------
+ gi/pygi-argument.c | 516
+ +++++++++++++++++++++++++++++++++++++++++++----------
+ gi/pygi-info.c     | 333 +++++++++++++++++-----------------
  2 files changed, 596 insertions(+), 253 deletions(-)
 
 commit d1ae73f3cf7cebdb74c9ec56b08928a2a53b9de6
@@ -19515,7 +21554,7 @@ Date:	Mon Nov 23 15:58:17 2009 -0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=602830
 
- gi/types.py |	  8 ++++----
+ gi/types.py | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit a8660621679c629fc81320a8ddf5bf2c7ee1f177
@@ -19526,7 +21565,7 @@ Date:	Tue Nov 24 10:36:18 2009 -0200
 
     https://bugzilla.gnome.org/show_bug.cgi?id=602830
 
- gi/module.py |    4 ++--
+ gi/module.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 66c34805223af9e63c7d61f21a3dbd7505a8f256
@@ -19537,20 +21576,20 @@ Date:	Mon Nov 30 10:03:34 2009 +0000
 
     https://bugzilla.gnome.org/show_bug.cgi?id=602735
 
- gi/Makefile.am     |	 2 +
- gi/gimodule.c	    |	 1 +
- gi/module.py	    |	 2 +-
- gi/pygi-argument.c |	14 +++-
- gi/pygi-boxed.c    |  184
- ++++++++++++++++++++++++++++++++++++++++++++++++++++
- gi/pygi-boxed.h    |	40 ++++++++++++
- gi/pygi-info.c     |	 2 +-
- gi/pygi-private.h  |	 1 +
- gi/pygi.h	    |	 6 ++
- gi/types.py	    |	18 -----
- tests/libtestgi.c  |	72 ++++++++++----------
- tests/libtestgi.h  |	18 ++---
- tests/test_gi.py   |	47 ++++++++------
+ gi/Makefile.am     |	2 +
+ gi/gimodule.c	    |	1 +
+ gi/module.py	    |	2 +-
+ gi/pygi-argument.c |  14 +++-
+ gi/pygi-boxed.c    | 184
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ gi/pygi-boxed.h    |  40 ++++++++++++
+ gi/pygi-info.c     |	2 +-
+ gi/pygi-private.h  |	1 +
+ gi/pygi.h	    |	6 ++
+ gi/types.py	    |  18 ------
+ tests/libtestgi.c  |  72 ++++++++++-----------
+ tests/libtestgi.h  |  18 +++---
+ tests/test_gi.py   |  47 ++++++++------
  13 files changed, 321 insertions(+), 86 deletions(-)
 
 commit e7e2fccae36c28c7e9f288fcd4c90a001140e307
@@ -19562,8 +21601,8 @@ Date:	Mon Nov 30 10:53:57 2009 +0000
 
     This reverts commit 05a2ed55f3e5d2620de8b3b6b0d99e928ef3b041.
 
- gi/pygi-argument.c |	14 +++++++-------
- tests/test_gi.py   |	18 +++++++++---------
+ gi/pygi-argument.c | 14 +++++++-------
+ tests/test_gi.py   | 18 +++++++++---------
  2 files changed, 16 insertions(+), 16 deletions(-)
 
 commit 05a2ed55f3e5d2620de8b3b6b0d99e928ef3b041
@@ -19575,8 +21614,8 @@ Date:	Sat Nov 28 18:48:19 2009 +0000
 
     https://bugzilla.gnome.org/show_bug.cgi?id=602384
 
- gi/pygi-argument.c |	14 +++++++-------
- tests/test_gi.py   |	18 +++++++++---------
+ gi/pygi-argument.c | 14 +++++++-------
+ tests/test_gi.py   | 18 +++++++++---------
  2 files changed, 16 insertions(+), 16 deletions(-)
 
 commit e24d155dd7b4a5b9c25c054137d1370c369d3192
@@ -19587,7 +21626,7 @@ Date:	Sat Nov 28 18:45:54 2009 +0000
 
     https://bugzilla.gnome.org/show_bug.cgi?id=603244
 
- gobject/generate-constants.c |   17 ++++++++++++++++-
+ gobject/generate-constants.c | 17 ++++++++++++++++-
  1 file changed, 16 insertions(+), 1 deletion(-)
 
 commit 3a295cb7ffaaaf29c71b8833cf0ee5ec7ceaa909
@@ -19596,7 +21635,7 @@ Date:	Sat Nov 28 18:48:49 2009 +0100
 
     Fix bad name when rebuilding the unix source module
 
- gio/Makefile.am |    2 +-
+ gio/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a8cbb6fb72dbe6630d1265b18095c9a96f496b86
@@ -19618,9 +21657,9 @@ Date:	Sat Nov 28 11:03:51 2009 +0000
 
     https://bugzilla.gnome.org/show_bug.cgi?id=601181
 
- tests/libtestgi.c |   23 +++++++++++++++++++++++
- tests/libtestgi.h |   16 ++++++++++++++++
- tests/test_gi.py  |   21 +++++++++++++++++++++
+ tests/libtestgi.c | 23 +++++++++++++++++++++++
+ tests/libtestgi.h | 16 ++++++++++++++++
+ tests/test_gi.py  | 21 +++++++++++++++++++++
  3 files changed, 60 insertions(+)
 
 commit 076ba3156c13375a75983cef7a409c8c8afea119
@@ -19644,8 +21683,8 @@ Date:	Thu Nov 26 23:50:54 2009 +0100
     notably tests
     that methods don't get overridden by the metaclass.
 
- gi/types.py	  |    5 +++--
- tests/test_gi.py |   19 +++++++++++++++++++
+ gi/types.py	  |  5 +++--
+ tests/test_gi.py | 19 +++++++++++++++++++
  2 files changed, 22 insertions(+), 2 deletions(-)
 
 commit ac80e64c9f7d257865aa820753e52d56cf2871c8
@@ -19656,10 +21695,10 @@ Date:	Fri Nov 27 12:06:59 2009 +0000
 
     https://bugzilla.gnome.org/show_bug.cgi?id=602709
 
- gi/pygi-argument.c |	29 ++++++++++++++++++++++++-----
- tests/libtestgi.c  |	23 ++++++++++++++++++++++-
- tests/libtestgi.h  |	 7 +++++--
- tests/test_gi.py   |	 8 ++++++++
+ gi/pygi-argument.c | 29 ++++++++++++++++++++++++-----
+ tests/libtestgi.c  | 23 ++++++++++++++++++++++-
+ tests/libtestgi.h  |  7 +++++--
+ tests/test_gi.py   |  8 ++++++++
  4 files changed, 59 insertions(+), 8 deletions(-)
 
 commit 4a373b8ad6ec137e911b92a3e745e0fd76541292
@@ -19668,7 +21707,7 @@ Date:	Wed Nov 25 16:53:55 2009 +0100
 
     Use the right variable when looking up in sys.modules
 
- gi/importer.py |    2 +-
+ gi/importer.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit fc3dca018e85aee34ade79d104ebd8cdd1dd5968
@@ -19679,10 +21718,10 @@ Date:	Tue Nov 24 15:52:47 2009 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=602638
 
- gi/pygi-argument.c |	19 ++++++++++++++++++-
- tests/libtestgi.c  |	 6 ++++++
- tests/libtestgi.h  |	 1 +
- tests/test_gi.py   |	 1 +
+ gi/pygi-argument.c | 19 ++++++++++++++++++-
+ tests/libtestgi.c  |  6 ++++++
+ tests/libtestgi.h  |  1 +
+ tests/test_gi.py   |  1 +
  4 files changed, 26 insertions(+), 1 deletion(-)
 
 commit 33081c29a1c2fdec2b8bfe17ae0a72b8db7a8d84
@@ -19691,7 +21730,7 @@ Date:	Tue Nov 24 13:10:11 2009 +0100
 
     Add stuff to .gitignore
 
- .gitignore |	 7 +++++++
+ .gitignore | 7 +++++++
  1 file changed, 7 insertions(+)
 
 commit 5c010fe673d9bd01c27c8d7d312064665275888c
@@ -19736,7 +21775,7 @@ Date:	Mon Nov 23 15:32:16 2009 -0200
     for the overridden modules to be able to access the auto-generated
     ones.
 
- gi/importer.py |   34 +++++++++++++++++++++-------------
+ gi/importer.py | 34 +++++++++++++++++++++-------------
  1 file changed, 21 insertions(+), 13 deletions(-)
 
 commit fad89e12a744b57e6348968f351d25d167de8248
@@ -19747,10 +21786,10 @@ Date:	Sun Nov 22 17:56:20 2009 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=601253
 
- gi/pygi-argument.c |	20 ++++++++++++--------
- tests/libtestgi.c  |	 5 +++++
- tests/libtestgi.h  |	 5 +++++
- tests/test_gi.py   |	 5 +++++
+ gi/pygi-argument.c | 20 ++++++++++++--------
+ tests/libtestgi.c  |  5 +++++
+ tests/libtestgi.h  |  5 +++++
+ tests/test_gi.py   |  5 +++++
  4 files changed, 27 insertions(+), 8 deletions(-)
 
 commit 1dc62a998dd8d2a0a397f8309011a8d79cb56034
@@ -19761,8 +21800,8 @@ Date:	Sun Nov 22 17:25:04 2009 +0100
 
     https://bugzilla.gnome.org/show_bug.cgi?id=601181
 
- gi/gimodule.c |   33 +++++++++++++++++++++++++++++++++
- gi/types.py   |    5 ++++-
+ gi/gimodule.c | 33 +++++++++++++++++++++++++++++++++
+ gi/types.py   |  5 ++++-
  2 files changed, 37 insertions(+), 1 deletion(-)
 
 commit d67d5afb5115c1d8294415b2e1a82af2c737ba17
@@ -19771,7 +21810,7 @@ Date:	Sun Nov 22 18:23:02 2009 +0200
 
     Ignore one more file.
 
- .gitignore |	 1 +
+ .gitignore | 1 +
  1 file changed, 1 insertion(+)
 
 commit 408b2186aea58a41ec26b9d0ca29ecd42df5ef7e
@@ -19782,8 +21821,8 @@ Date:	Sun Nov 22 18:22:23 2009 +0200
 
     Bug #587637.  Test the fix.
 
- gobject/propertyhelper.py |	5 +++--
- tests/test_properties.py  |	6 ++++++
+ gobject/propertyhelper.py | 5 +++--
+ tests/test_properties.py  | 6 ++++++
  2 files changed, 9 insertions(+), 2 deletions(-)
 
 commit 6ccf58afcf58e118903ced0135f0fe69b00e09ad
@@ -19792,7 +21831,7 @@ Date:	Mon Oct 26 18:06:06 2009 +0000
 
     Treat GI_INFO_TYPE_INTERFACE same as GI_INFO_TYPE_OBJECT
 
- gi/pygi-argument.c |	 3 +++
+ gi/pygi-argument.c | 3 +++
  1 file changed, 3 insertions(+)
 
 commit e6f730d6e1431e36bd5f6b503a1038617f8d1e7d
@@ -19801,7 +21840,7 @@ Date:	Sat Nov 14 21:42:43 2009 +0100
 
     Import pygtk properly to avoid failure on some setups
 
- tests/test_gi.py |    3 +++
+ tests/test_gi.py | 3 +++
  1 file changed, 3 insertions(+)
 
 commit e604a89e9dc1a79687ef5fb94af7a2182be07dfb
@@ -19817,7 +21856,7 @@ Date:	Sat Nov 14 21:39:15 2009 +0100
 
     Signed-off-by: Simon van der Linden <svdlinden@src.gnome.org>
 
- configure.ac |    7 +++++--
+ configure.ac | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 commit 4a887cfabb326cb99dc65073d592c03f59e2f141
@@ -19826,7 +21865,7 @@ Date:	Sat Nov 14 21:36:19 2009 +0100
 
     Fix silent rules setup
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 602afea88c338a38327cd84e08703c5daa384ec6
@@ -19838,9 +21877,9 @@ Date:	Tue Nov 10 22:32:33 2009 +0200
     Retain in original place for backward compatibility, but remove it
     from the docs.
 
- docs/reference/pygobject-functions.xml |   36
- +++++++-------------------------
- glib/glibmodule.c			|   16 ++++++++++++++
+ docs/reference/pygobject-functions.xml | 36
+ +++++++---------------------------
+ glib/glibmodule.c			| 16 +++++++++++++++
  2 files changed, 23 insertions(+), 29 deletions(-)
 
 commit 734755912fff11332dc0e96317b7d6b7c4014e6a
@@ -19849,12 +21888,12 @@ Date:	Mon Nov 9 22:44:12 2009 +0100
 
     Remove PyGObject patches since they've been merged to master
 
- ...pytype-aware-of-the-interface-enum-flags-.patch |	78 --------
- patches/0002-Fix-girpository-build-setup.patch     |  186
- ------------------
- ...capabilities-to-import-wrappers-from-pygi.patch |  200
- --------------------
- ...ances-by-calling-tp_alloc-rather-than-PyO.patch |	29 ---
+ ...pytype-aware-of-the-interface-enum-flags-.patch |  78 --------
+ patches/0002-Fix-girpository-build-setup.patch     | 186
+ -------------------
+ ...capabilities-to-import-wrappers-from-pygi.patch | 200
+ ---------------------
+ ...ances-by-calling-tp_alloc-rather-than-PyO.patch |  29 ---
  4 files changed, 493 deletions(-)
 
 commit 6a69288941e65312fe82649ec72d2f21b2dc618f
@@ -19870,7 +21909,7 @@ Date:	Sat Nov 7 23:42:07 2009 +0100
     PyGBoxed subtypes, so the subtype's allocation function must be
     called instead.
 
- gobject/pygboxed.c |	 3 ++-
+ gobject/pygboxed.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 000f7c36e667c6e078e3370769ea868e56a1b4ee
@@ -19889,12 +21928,12 @@ Date:	Sat Nov 7 16:43:35 2009 +0100
     function and
     API definition had to be copied in this tree.
 
- configure.ac		 |    8 ++++++
- gobject/pygboxed.c	 |   10 +++++++
- gobject/pygi-external.h |   66
- +++++++++++++++++++++++++++++++++++++++++++++++
- gobject/pygobject.c	 |   10 +++++++
- gobject/pygpointer.c	 |   11 ++++++++
+ configure.ac		 |  8 ++++++
+ gobject/pygboxed.c	 | 10 ++++++++
+ gobject/pygi-external.h | 66
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ gobject/pygobject.c	 | 10 ++++++++
+ gobject/pygpointer.c	 | 11 +++++++++
  5 files changed, 105 insertions(+)
 
 commit fdfbc90dbc9e305646b62d73de506b5e0e99cc91
@@ -19905,9 +21944,9 @@ Date:	Sun Nov 8 20:03:58 2009 +0100
 
     A file, pygi-external.h, was missing in patch #3.
 
- ...capabilities-to-import-wrappers-from-pygi.patch |	74
- ++++++++++++++++++--
- ...ances-by-calling-tp_alloc-rather-than-PyO.patch |	 2 +-
+ ...capabilities-to-import-wrappers-from-pygi.patch | 74
+ ++++++++++++++++++++--
+ ...ances-by-calling-tp_alloc-rather-than-PyO.patch |  2 +-
  2 files changed, 69 insertions(+), 7 deletions(-)
 
 commit 8f53ca8a72f9958711765281dd5c5bdfb7042d7d
@@ -19916,7 +21955,7 @@ Date:	Sun Nov 8 16:52:18 2009 +0100
 
     Add myself to pygi.doap
 
- pygi.doap |	5 +++++
+ pygi.doap | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 6f50d5102aec9288e1851f12e9d232b9c141d524
@@ -19925,7 +21964,7 @@ Date:	Sun Nov 8 15:40:51 2009 +0100
 
     Add a doap file
 
- pygi.doap |   17 +++++++++++++++++
+ pygi.doap | 17 +++++++++++++++++
  1 file changed, 17 insertions(+)
 
 commit ce673b9027868e6add4eeb438bc707eb40bfd046
@@ -19934,11 +21973,11 @@ Date:	Sun Nov 8 13:06:54 2009 +0100
 
     Add PyGObject patches
 
- ...pytype-aware-of-the-interface-enum-flags-.patch |	78 ++++++++
- patches/0002-Fix-girpository-build-setup.patch     |  186
- ++++++++++++++++++++
- ...capabilities-to-import-wrappers-from-pygi.patch |  138 +++++++++++++++
- ...ances-by-calling-tp_alloc-rather-than-PyO.patch |	29 +++
+ ...pytype-aware-of-the-interface-enum-flags-.patch |  78 +++++++++
+ patches/0002-Fix-girpository-build-setup.patch     | 186
+ +++++++++++++++++++++
+ ...capabilities-to-import-wrappers-from-pygi.patch | 138 +++++++++++++++
+ ...ances-by-calling-tp_alloc-rather-than-PyO.patch |  29 ++++
  4 files changed, 431 insertions(+)
 
 commit b24fd9633cabe1d95cde173a04e9a49833b06a26
@@ -19989,10 +22028,10 @@ Date:	Sat Nov 7 13:23:53 2009 +0100
 
     Fix girpository build setup
 
- configure.ac		  |   21 +++++++----
- girepository/Makefile.am |   13 +++----
- m4/introspection.m4	  |   92
- ++++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac		  | 21 ++++++-----
+ girepository/Makefile.am | 13 ++++---
+ m4/introspection.m4	  | 92
+ ++++++++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 111 insertions(+), 15 deletions(-)
 
 commit 421c03b1c5b69f90c778663df901b45ca3ee8ba5
@@ -20002,7 +22041,7 @@ Date:	Fri Nov 6 19:17:36 2009 +0100
     Make GType.pytype aware of the interface, enum, flags, pointer and
     boxed wrappers
 
- gobject/pygtype.c |   39 +++++++++++++++++++++++++++++++++------
+ gobject/pygtype.c | 39 +++++++++++++++++++++++++++++++++------
  1 file changed, 33 insertions(+), 6 deletions(-)
 
 commit a9c168c58cc6a449b51653417bf3f58bdd41457c
@@ -20013,8 +22052,8 @@ Date:	Wed Oct 21 18:01:16 2009 +0200
 
     Fixes bug #481569
 
- glib/pygmainloop.c |	95
- +++++++++++++++++++++++++++-------------------------
+ glib/pygmainloop.c | 95
+ ++++++++++++++++++++++++++++--------------------------
  1 file changed, 50 insertions(+), 45 deletions(-)
 
 commit c6a5750379354c12e2599b3c73b4f9a23fd39114
@@ -20023,7 +22062,7 @@ Date:	Fri Sep 25 20:12:21 2009 +0200
 
     Post release version bump to 2.21.0
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 33920eb013628a5e22b7b32403fb965ae3210f47
@@ -20032,7 +22071,7 @@ Date:	Wed Sep 23 21:52:04 2009 +0200
 
     Update NEWS and release 2.20.0
 
- NEWS |    6 ++++++
+ NEWS | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit 66b12f7d2f54143ea80b4f8aec863b26800363d6
@@ -20041,7 +22080,7 @@ Date:	Wed Sep 23 21:51:43 2009 +0200
 
     Bump version to 2.20.0
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 7bf87338a026ac82f908aa5fddf2bfea2daf6617
@@ -20051,7 +22090,7 @@ Date:	Wed Sep 23 12:11:50 2009 -0500
     Updated uninstalled.pc file so that it contains the right paths for
     defsdir files and codegen files.  See bug #596023.
 
- pygobject-2.0-uninstalled.pc.in |    4 ++--
+ pygobject-2.0-uninstalled.pc.in | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit d042402b7c649b2bed7f20038eb82518ec7cc9b3
@@ -20062,7 +22101,7 @@ Date:	Tue Sep 22 22:02:27 2009 +0300
 
     Bug #579406, second change.
 
- glib/pygmainloop.c |	 1 +
+ glib/pygmainloop.c | 1 +
  1 file changed, 1 insertion(+)
 
 commit 640be8109d066e85ed77c810830a5f73c750415b
@@ -20075,7 +22114,7 @@ Date:	Sun Aug 30 16:46:02 2009 +0200
     .devhelp
     file that is produced when using ref-html-style.xsl.
 
- docs/xsl/devhelp.xsl |    2 +-
+ docs/xsl/devhelp.xsl | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit c888b5ca722fcad6a03de585606c677c2969ebd6
@@ -20084,7 +22123,7 @@ Date:	Thu Aug 13 21:32:07 2009 +0200
 
     Allow to use automake 1.11
 
- autogen.sh |	13 +++++++------
+ autogen.sh | 13 +++++++------
  1 file changed, 7 insertions(+), 6 deletions(-)
 
 commit 30deaba4bd1e199aab75cb346ee9237237807fbd
@@ -20093,7 +22132,7 @@ Date:	Tue Aug 11 22:19:50 2009 +0200
 
     Update README
 
- README |   10 ++++++++--
+ README | 10 ++++++++--
  1 file changed, 8 insertions(+), 2 deletions(-)
 
 commit af165d350d0d1bb493be5140bf84376d3da1e4d8
@@ -20102,7 +22141,7 @@ Date:	Tue Aug 11 22:16:52 2009 +0200
 
     Update AUTHORS
 
- AUTHORS |    8 +++++---
+ AUTHORS | 8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 commit 5f9f87f276b97964b525a501d8584ea8b4d8bfd2
@@ -20111,8 +22150,8 @@ Date:	Tue Aug 11 22:11:43 2009 +0200
 
     Add myself and Paul as maintainers
 
- MAINTAINERS	|    8 ++++++++
- pygobject.doap |   14 ++++++++++++++
+ MAINTAINERS	|  8 ++++++++
+ pygobject.doap | 14 ++++++++++++++
  2 files changed, 22 insertions(+)
 
 commit 3bfae47fbcb5523d91fb2d1ed7ea347eeddd1775
@@ -20121,7 +22160,7 @@ Date:	Tue Aug 11 20:52:44 2009 +0200
 
     Update NEWS release 2.19.0
 
- NEWS |   29 +++++++++++++++++++++++++++++
+ NEWS | 29 +++++++++++++++++++++++++++++
  1 file changed, 29 insertions(+)
 
 commit e82a1841f31ad54dd50569d0d45290713409e0bf
@@ -20130,8 +22169,8 @@ Date:	Tue Aug 11 00:04:31 2009 -0700
 
     Add macros to help with Python list to/from GList/GSList conversions.
 
- gobject/pygobject.h |	242
- ++++++++++++++++++++++++++++++++++++++++++++++++++-
+ gobject/pygobject.h | 242
+ +++++++++++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 241 insertions(+), 1 deletion(-)
 
 commit f1fad96da2c531fbd3218923baa4fe806a2942d4
@@ -20140,7 +22179,7 @@ Date:	Sat Aug 8 21:37:54 2009 +0200
 
     Bug 590063 – GFileInfo.list_attributes should accept None/NULL
 
- gio/gfileinfo.override |    4 ++--
+ gio/gfileinfo.override | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit b7907cf6ff6ccf8d38b5206f09f5c864c205e5de
@@ -20149,8 +22188,8 @@ Date:	Fri Jul 24 14:30:37 2009 -0300
 
     Remove myself as a maintainer
 
- MAINTAINERS	|    4 ----
- pygobject.doap |    7 -------
+ MAINTAINERS	| 4 ----
+ pygobject.doap | 7 -------
  2 files changed, 11 deletions(-)
 
 commit be6eb21320b4688bcfcd8cbea33f7be29a76f2a2
@@ -20160,7 +22199,7 @@ Date:	Wed Jul 8 15:47:44 2009 -0700
 	    * codegen/defsgen.py (clean_patterns): Strip out Windows
 	    DLL API macros.
 
- codegen/defsgen.py |	 6 +++---
+ codegen/defsgen.py | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 2214cad3529979e29342a7e1fdc2915b90ce9c10
@@ -20169,14 +22208,12 @@ Date:	Tue Jun 23 21:18:23 2009 +0200
 
     Fix the gio.unix namespace in docs
 
- docs/Makefile.am			   |	2 ++
- docs/reference/pygio-classes.xml	   |	2 --
- docs/reference/pygio-unixinputstream.xml  |   26
- +++++++++++++-------------
- docs/reference/pygio-unixoutputstream.xml |   26
- +++++++++++++-------------
- docs/reference/pygiounix-classes.xml	   |   13 +++++++++++++
- docs/reference/pygobject-ref.xml	   |	1 +
+ docs/Makefile.am			   |  2 ++
+ docs/reference/pygio-classes.xml	   |  2 --
+ docs/reference/pygio-unixinputstream.xml  | 26 +++++++++++++-------------
+ docs/reference/pygio-unixoutputstream.xml | 26 +++++++++++++-------------
+ docs/reference/pygiounix-classes.xml	   | 13 +++++++++++++
+ docs/reference/pygobject-ref.xml	   |  1 +
  6 files changed, 42 insertions(+), 28 deletions(-)
 
 commit c0acaedfe7f4e488a490e07e3184f0709e1fadc2
@@ -20185,10 +22222,10 @@ Date:	Mon Jun 22 23:13:36 2009 +0200
 
     Add docs for gio functions (mostly for content types)
 
- docs/Makefile.am		    |	 2 +
- docs/reference/pygio-classes.xml   |	 1 +
- docs/reference/pygio-functions.xml |  395
- ++++++++++++++++++++++++++++++++++++
+ docs/Makefile.am		    |	2 +
+ docs/reference/pygio-classes.xml   |	1 +
+ docs/reference/pygio-functions.xml | 395
+ +++++++++++++++++++++++++++++++++++++
  3 files changed, 398 insertions(+)
 
 commit ebddee47fb7f3e06f9e0a7a14b9532d5cf8a3881
@@ -20197,12 +22234,12 @@ Date:	Sun Jun 21 18:35:56 2009 +0200
 
     Add docs for gio.Unix[In|Out]putStream classes
 
- docs/Makefile.am			   |	4 +
- docs/reference/pygio-classes.xml	   |	2 +
- docs/reference/pygio-unixinputstream.xml  |  202
- +++++++++++++++++++++++++++++
- docs/reference/pygio-unixoutputstream.xml |  202
- +++++++++++++++++++++++++++++
+ docs/Makefile.am			   |   4 +
+ docs/reference/pygio-classes.xml	   |   2 +
+ docs/reference/pygio-unixinputstream.xml  | 202
+ ++++++++++++++++++++++++++++++
+ docs/reference/pygio-unixoutputstream.xml | 202
+ ++++++++++++++++++++++++++++++
  4 files changed, 410 insertions(+)
 
 commit 5b71e58117c85634d95d08449eb54079b246e5be
@@ -20211,7 +22248,7 @@ Date:	Sun Jun 21 16:50:03 2009 +0300
 
     Document that many functions got moved gobject -> glib
 
- docs/reference/pygobject-functions.xml |    7 +++++++
+ docs/reference/pygobject-functions.xml | 7 +++++++
  1 file changed, 7 insertions(+)
 
 commit b270dc43f2cef5260b0bbc71356fd8e6a2b7f754
@@ -20220,10 +22257,10 @@ Date:	Sat Jun 20 19:23:25 2009 +0200
 
     Add docs for class gio.DataOutputStream
 
- docs/Makefile.am			   |	2 +
- docs/reference/pygio-classes.xml	   |	1 +
- docs/reference/pygio-dataoutputstream.xml |  504
- +++++++++++++++++++++++++++++
+ docs/Makefile.am			   |   2 +
+ docs/reference/pygio-classes.xml	   |   1 +
+ docs/reference/pygio-dataoutputstream.xml | 504
+ ++++++++++++++++++++++++++++++
  3 files changed, 507 insertions(+)
 
 commit 549313fc4886fa3deb31761de6f5400708165d86
@@ -20233,7 +22270,7 @@ Date:	Thu Jun 18 18:48:37 2009 +0200
     Allow h2def.py to work when there are tabs or multiple spaces after
     the struct keyword.
 
- codegen/h2def.py |    8 ++++----
+ codegen/h2def.py | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 5c36ef20dca8cd1793f2d3e88949675299097f40
@@ -20242,11 +22279,11 @@ Date:	Mon Jun 15 23:02:34 2009 +0200
 
     Add dpcs for class gio.DataInputStream
 
- docs/Makefile.am			  |    2 +
- docs/reference/pygio-classes.xml	  |    1 +
- docs/reference/pygio-constants.xml	  |   66 +++
- docs/reference/pygio-datainputstream.xml |  799
- ++++++++++++++++++++++++++++++
+ docs/Makefile.am			  |   2 +
+ docs/reference/pygio-classes.xml	  |   1 +
+ docs/reference/pygio-constants.xml	  |  66 +++
+ docs/reference/pygio-datainputstream.xml | 799
+ +++++++++++++++++++++++++++++++
  4 files changed, 868 insertions(+)
 
 commit a8b36c343c6850af929c1d5a930f923831b4e637
@@ -20257,7 +22294,7 @@ Date:	Mon Jun 15 23:25:01 2009 +0300
 
     Bug #585817.
 
- girepository/Makefile.am |    2 +-
+ girepository/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 9d9ae97b8a49836ec1f3b8d6529bafe1cc06d4d7
@@ -20269,9 +22306,9 @@ Date:	Mon Jun 15 23:19:47 2009 +0300
     Add optional 'origin' parameter.  Expand gio.Emblem documentation and
     mark gio.emblem_new_with_origin as sort-of-deprecated.
 
- docs/reference/pygio-emblem.xml |   51
- +++++++++++++++++++++++++++++++++++++--
- gio/gio.defs			 |    5 ++--
+ docs/reference/pygio-emblem.xml | 51
+ +++++++++++++++++++++++++++++++++++++++--
+ gio/gio.defs			 |  5 ++--
  2 files changed, 52 insertions(+), 4 deletions(-)
 
 commit 268e1681fd5b46e6412d3a8db84f3f1cb02fdbde
@@ -20280,10 +22317,10 @@ Date:	Sat Jun 13 14:44:47 2009 +0200
 
     Add docs for gio.BufferedOutputStream class
 
- docs/Makefile.am			       |   96 ++++-----
- docs/reference/pygio-bufferedoutputstream.xml |  275
- +++++++++++++++++++++++++
- docs/reference/pygio-classes.xml	       |    1 +
+ docs/Makefile.am			       |  96 ++++-----
+ docs/reference/pygio-bufferedoutputstream.xml | 275
+ ++++++++++++++++++++++++++
+ docs/reference/pygio-classes.xml	       |   1 +
  3 files changed, 325 insertions(+), 47 deletions(-)
 
 commit a6e25aaa7c8f27d62f2917b06728d7ccfcd46416
@@ -20294,8 +22331,8 @@ Date:	Sat Jun 13 14:38:34 2009 +0200
 
     Added the constructor reference and fixed a typo in properties header
 
- docs/reference/pygio-bufferedinputstream.xml |   34
- ++++++++++++++++++++++++--
+ docs/reference/pygio-bufferedinputstream.xml | 34
+ ++++++++++++++++++++++++++--
  1 file changed, 32 insertions(+), 2 deletions(-)
 
 commit a9b13b60a5aad726d7d7dd7fdc5153b1561fb591
@@ -20304,10 +22341,10 @@ Date:	Sat Jun 13 01:25:06 2009 +0200
 
     Add docs for gio.BufferedInputStream
 
- docs/Makefile.am			      |    2 +
- docs/reference/pygio-bufferedinputstream.xml |  431
- ++++++++++++++++++++++++++
- docs/reference/pygio-classes.xml	      |    1 +
+ docs/Makefile.am			      |   2 +
+ docs/reference/pygio-bufferedinputstream.xml | 431
+ +++++++++++++++++++++++++++
+ docs/reference/pygio-classes.xml	      |   1 +
  3 files changed, 434 insertions(+)
 
 commit 7766daa59b0e2b85413cee368bf2ebd2afe198e1
@@ -20319,13 +22356,13 @@ Date:	Sun May 31 18:25:47 2009 +0300
     Also move several gio.Mount overrides over from 'gio.override' to
     existing 'gmount.override'.  Part of bug #584289.
 
- gio/gfile.override	      |   20 ++---
- gio/gfileenumerator.override |    6 +-
- gio/ginputstream.override    |    2 +-
- gio/gio.override	      |  204
- ------------------------------------------
- gio/gmount.override	      |  204
- ++++++++++++++++++++++++++++++++++++++++++
+ gio/gfile.override	      |  20 ++---
+ gio/gfileenumerator.override |   6 +-
+ gio/ginputstream.override    |   2 +-
+ gio/gio.override	      | 204
+ -------------------------------------------
+ gio/gmount.override	      | 204
+ +++++++++++++++++++++++++++++++++++++++++++
  5 files changed, 218 insertions(+), 218 deletions(-)
 
 commit 07e9c18dc092f6546230168b6b69c1b3454e120a
@@ -20336,8 +22373,8 @@ Date:	Sun May 31 18:56:55 2009 +0300
 
     Part of bug #584289.
 
- codegen/codegen.py	|    9 +++++----
- codegen/definitions.py |   10 +++++++++-
+ codegen/codegen.py	|  9 +++++----
+ codegen/definitions.py | 10 +++++++++-
  2 files changed, 14 insertions(+), 5 deletions(-)
 
 commit 235fde85d015382f2ba38b21968e82b3ac0b6612
@@ -20346,7 +22383,7 @@ Date:	Fri Jun 12 00:12:17 2009 +0200
 
     Fix object type in gio.BufferedInputStream_fill_async
 
- gio/gbufferedinputstream.override |	2 +-
+ gio/gbufferedinputstream.override | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 407b0e909056f15960e6a4e549896d786ce0a0b2
@@ -20357,11 +22394,11 @@ Date:	Tue Jun 9 00:08:21 2009 +0200
 
     Wrap the method gio.BufferedInputStream.fill_async and add a test
 
- gio/Makefile.am		   |	1 +
- gio/gbufferedinputstream.override |   70
- +++++++++++++++++++++++++++++++++++++
- gio/gio.override		   |	1 +
- tests/test_gio.py		   |   25 +++++++++++++
+ gio/Makefile.am		   |  1 +
+ gio/gbufferedinputstream.override | 70
+ +++++++++++++++++++++++++++++++++++++++
+ gio/gio.override		   |  1 +
+ tests/test_gio.py		   | 25 ++++++++++++++
  4 files changed, 97 insertions(+)
 
 commit b7c96b41b287685fe57504e0add3a6f16e649975
@@ -20371,7 +22408,7 @@ Date:	Mon Jun 8 15:42:40 2009 +0200
     Add gio.BufferedOutputStream which was forgotten in the types
     definition
 
- gio/gio-types.defs |	 7 +++++++
+ gio/gio-types.defs | 7 +++++++
  1 file changed, 7 insertions(+)
 
 commit 3666f75af4ef2c8e038116aee5afada59d59f689
@@ -20380,10 +22417,10 @@ Date:	Mon Jun 8 14:20:02 2009 +0200
 
     Add docs for gio.MemoryOutputStream
 
- docs/Makefile.am			     |	  2 +
- docs/reference/pygio-classes.xml	     |	  1 +
- docs/reference/pygio-memoryoutputstream.xml |	175
- +++++++++++++++++++++++++++
+ docs/Makefile.am			     |	 2 +
+ docs/reference/pygio-classes.xml	     |	 1 +
+ docs/reference/pygio-memoryoutputstream.xml | 175
+ ++++++++++++++++++++++++++++
  3 files changed, 178 insertions(+)
 
 commit 6eb5e3988cbddb4afb3d5747364d6eb80370bb78
@@ -20392,11 +22429,11 @@ Date:	Mon Jun 8 13:30:15 2009 +0200
 
     Split overrides for gio.MemoryOutputStream
 
- gio/Makefile.am		  |    1 +
- gio/gio.override		  |    1 +
- gio/gmemoryoutputstream.override |   45
- ++++++++++++++++++++++++++++++++++++++
- gio/goutputstream.override	  |   24 --------------------
+ gio/Makefile.am		  |  1 +
+ gio/gio.override		  |  1 +
+ gio/gmemoryoutputstream.override | 45
+ ++++++++++++++++++++++++++++++++++++++++
+ gio/goutputstream.override	  | 24 ---------------------
  4 files changed, 47 insertions(+), 24 deletions(-)
 
 commit dfbdf23633a772e78b47b0e7b0c3e3b87855d9ff
@@ -20408,15 +22445,15 @@ Date:	Mon Jun 8 11:45:11 2009 +0200
     Add the wrapper for gio.memory_input_stream_new_from_data including
     docs and a test.
 
- docs/Makefile.am			    |	 4 +-
- docs/reference/pygio-classes.xml	    |	 1 +
- docs/reference/pygio-memoryinputstream.xml |  151
- ++++++++++++++++++++++++++++
- gio/Makefile.am			    |	 1 +
- gio/ginputstream.override		    |	34 -------
- gio/gio.override			    |	 1 +
- gio/gmemoryinputstream.override	    |	91 +++++++++++++++++
- tests/test_gio.py			    |	 4 +
+ docs/Makefile.am			    |	4 +-
+ docs/reference/pygio-classes.xml	    |	1 +
+ docs/reference/pygio-memoryinputstream.xml | 151
+ +++++++++++++++++++++++++++++
+ gio/Makefile.am			    |	1 +
+ gio/ginputstream.override		    |  34 -------
+ gio/gio.override			    |	1 +
+ gio/gmemoryinputstream.override	    |  91 +++++++++++++++++
+ tests/test_gio.py			    |	4 +
  8 files changed, 252 insertions(+), 35 deletions(-)
 
 commit fcc3cb0e167789746a1a9db0cba54ea7a97c7259
@@ -20425,12 +22462,12 @@ Date:	Mon Jun 8 19:15:24 2009 +0200
 
     Fixes whitespaces style issues with girepository.
 
- girepository/Makefile.am	|    2 +-
- girepository/bank-repository.c |   67
- ++++++++++++++++++++--------------------
- girepository/bank.h		|    2 +-
- girepository/btypes.py		|    6 ++--
- girepository/module.py		|    2 +-
+ girepository/Makefile.am	|  2 +-
+ girepository/bank-repository.c | 67
+ +++++++++++++++++++++---------------------
+ girepository/bank.h		|  2 +-
+ girepository/btypes.py		|  6 ++--
+ girepository/module.py		|  2 +-
  5 files changed, 39 insertions(+), 40 deletions(-)
 
 commit fb4b2c8cdad2853e6bfe9526529e3a3ab052c5e0
@@ -20439,7 +22476,7 @@ Date:	Fri Jun 5 19:03:59 2009 +0200
 
     Removes the header but the modeline in test_girepository.py.
 
- tests/test_girepository.py |	26 +-------------------------
+ tests/test_girepository.py | 26 +-------------------------
  1 file changed, 1 insertion(+), 25 deletions(-)
 
 commit abe4828f52c7eb3a08f5b592e7ced1e97a58ef5c
@@ -20448,10 +22485,10 @@ Date:	Wed Jun 3 10:47:58 2009 +0200
 
     Adds overrides modules from PyBank.
 
- girepository/Makefile.am      |    3 +++
- girepository/importer.py      |    3 +--
- girepository/overrides/Gdk.py |   14 ++++++++++++++
- girepository/overrides/Gtk.py |    8 ++++++++
+ girepository/Makefile.am      |  3 +++
+ girepository/importer.py      |  3 +--
+ girepository/overrides/Gdk.py | 14 ++++++++++++++
+ girepository/overrides/Gtk.py |  8 ++++++++
  4 files changed, 26 insertions(+), 2 deletions(-)
 
 commit c12964e6a3354d8063355225c94e6d21d621e08b
@@ -20460,8 +22497,8 @@ Date:	Tue Jun 2 23:40:41 2009 +0200
 
     Disables the tests that fail in tests/test_girepository.py.
 
- tests/test_girepository.py |  242
- +++++++++++++++++++++++++++++++++-----------
+ tests/test_girepository.py | 242
+ ++++++++++++++++++++++++++++++++++-----------
  1 file changed, 182 insertions(+), 60 deletions(-)
 
 commit a4469a3f7d32a25156bae5e7aef9ec4ae5f6e140
@@ -20471,8 +22508,8 @@ Date:	Tue Jun 2 23:03:26 2009 +0200
     Imports test_girepository.py from former PyBank's
     everything_unittest.py.
 
- tests/test_girepository.py |  288
- ++++++++++++++++++++++++++++++++++++++++++++
+ tests/test_girepository.py | 288
+ +++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 288 insertions(+)
 
 commit e4f2a5ef8734cf40cf8345d442612db1f6c62d5a
@@ -20504,7 +22541,7 @@ Date:	Tue Jun 2 18:28:22 2009 +0200
 
     Fix the docs for gio.FilterOutputStream
 
- docs/reference/pygio-filteroutputstream.xml |	  6 +++---
+ docs/reference/pygio-filteroutputstream.xml | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit fded60d8376fc45d19bf6cd8be6b927cc3f2e8c6
@@ -20513,10 +22550,10 @@ Date:	Tue Jun 2 18:27:00 2009 +0200
 
     Add gio.FilterOutputStream docs
 
- docs/Makefile.am			     |	  2 +
- docs/reference/pygio-classes.xml	     |	  1 +
- docs/reference/pygio-filteroutputstream.xml |	152
- +++++++++++++++++++++++++++
+ docs/Makefile.am			     |	 2 +
+ docs/reference/pygio-classes.xml	     |	 1 +
+ docs/reference/pygio-filteroutputstream.xml | 152
+ ++++++++++++++++++++++++++++
  3 files changed, 155 insertions(+)
 
 commit e2c31f916967229b6547e68013628ce0082cf875
@@ -20525,10 +22562,10 @@ Date:	Tue Jun 2 13:29:59 2009 +0200
 
     Add gio.FilterInputStream docs
 
- docs/Makefile.am			    |	 2 +
- docs/reference/pygio-classes.xml	    |	 1 +
- docs/reference/pygio-filterinputstream.xml |  152
- ++++++++++++++++++++++++++++
+ docs/Makefile.am			    |	2 +
+ docs/reference/pygio-classes.xml	    |	1 +
+ docs/reference/pygio-filterinputstream.xml | 152
+ +++++++++++++++++++++++++++++
  3 files changed, 155 insertions(+)
 
 commit 49a467eee445bc75554db0374006722ac075194b
@@ -20537,7 +22574,7 @@ Date:	Tue Jun 2 11:33:20 2009 +0200
 
     Add API appeared in 2.20 but not marked as such in gio docs
 
- gio/gio.defs |   30 ++++++++++++++++++++++++++++++
+ gio/gio.defs | 30 ++++++++++++++++++++++++++++++
  1 file changed, 30 insertions(+)
 
 commit 180c157f2a20b7d2dd9af05bfb5f515fd23870a0
@@ -20549,14 +22586,14 @@ Date:	Tue Jun 2 10:41:26 2009 +0200
     Add the wrapper for gio.FileOutputStream.query_info_async
     including docs and a test.
 
- docs/Makefile.am			   |	2 +
- docs/reference/pygio-classes.xml	   |	1 +
- docs/reference/pygio-fileoutputstream.xml |  257
- +++++++++++++++++++++++++++++
- gio/Makefile.am			   |	3 +-
- gio/gfileoutputstream.override		   |   68 ++++++++
- gio/gio.override			   |	1 +
- tests/test_gio.py			   |   27 +++
+ docs/Makefile.am			   |   2 +
+ docs/reference/pygio-classes.xml	   |   1 +
+ docs/reference/pygio-fileoutputstream.xml | 257
+ ++++++++++++++++++++++++++++++
+ gio/Makefile.am			   |   3 +-
+ gio/gfileoutputstream.override		   |  68 ++++++++
+ gio/gio.override			   |   1 +
+ tests/test_gio.py			   |  27 ++++
  7 files changed, 358 insertions(+), 1 deletion(-)
 
 commit 4673577d1f6c3d54423808dd575987092fb05ad2
@@ -20567,7 +22604,7 @@ Date:	Tue Jun 2 10:17:41 2009 +0200
 
     Add implemented interface section and remove a method description
 
- docs/reference/pygio-fileinputstream.xml |   25 +++++++++----------------
+ docs/reference/pygio-fileinputstream.xml | 25 +++++++++----------------
  1 file changed, 9 insertions(+), 16 deletions(-)
 
 commit 1e1cad02879d514745b5233658654cbe944530a5
@@ -20576,7 +22613,7 @@ Date:	Mon Jun 1 22:54:26 2009 +0200
 
     Fix the method name
 
- gio/gfileinputstream.override |   14 +++++++-------
+ gio/gfileinputstream.override | 14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)
 
 commit f605811afe8c91f121e89b6f9ec28c70b62f4110
@@ -20588,14 +22625,14 @@ Date:	Mon Jun 1 22:40:56 2009 +0200
     Add the wrapper for gio.FileInputStream.query_async including docs and
     a test.
 
- docs/Makefile.am			  |    2 +
- docs/reference/pygio-classes.xml	  |    1 +
- docs/reference/pygio-fileinputstream.xml |  221
- ++++++++++++++++++++++++++++++
- gio/Makefile.am			  |    1 +
- gio/gfileinputstream.override		  |   68 +++++++++
- gio/gio.override			  |    1 +
- tests/test_gio.py			  |   27 ++++
+ docs/Makefile.am			  |   2 +
+ docs/reference/pygio-classes.xml	  |   1 +
+ docs/reference/pygio-fileinputstream.xml | 221
+ +++++++++++++++++++++++++++++++
+ gio/Makefile.am			  |   1 +
+ gio/gfileinputstream.override		  |  68 ++++++++++
+ gio/gio.override			  |   1 +
+ tests/test_gio.py			  |  27 ++++
  7 files changed, 321 insertions(+)
 
 commit 08623e54a426377c1504b5c364aabae5a17f8ad8
@@ -20606,10 +22643,10 @@ Date:	Sun May 31 17:43:16 2009 +0300
 
     Also add shebang where it was missing.  Bug #583979.
 
- codegen/Makefile.am	  |   23 ++++++++++++-----------
- codegen/code-coverage.py |    2 ++
- codegen/codegen.py	  |    2 ++
- codegen/defsconvert.py   |    2 ++
+ codegen/Makefile.am	  | 23 ++++++++++++-----------
+ codegen/code-coverage.py |  2 ++
+ codegen/codegen.py	  |  2 ++
+ codegen/defsconvert.py   |  2 ++
  4 files changed, 18 insertions(+), 11 deletions(-)
 
 commit 833d4da202bcfcb01a414f8aec4b751ec8e1ccb2
@@ -20623,13 +22660,13 @@ Date:	Sat May 30 16:57:49 2009 +0300
     functions there.  Add unit tests.  Re-enable synchronous read_line
     unit test and adjust it for new official GIO behavior.  Bug #584285.
 
- gio/Makefile.am	       |    1 +
- gio/gdatainputstream.override |  250
- +++++++++++++++++++++++++++++++++++++++++
- gio/ginputstream.override     |   65 -----------
- gio/gio.defs		       |    4 +-
- gio/gio.override	       |    1 +
- tests/test_gio.py	       |   51 ++++++++-
+ gio/Makefile.am	       |   1 +
+ gio/gdatainputstream.override | 250
+ ++++++++++++++++++++++++++++++++++++++++++
+ gio/ginputstream.override     |  65 -----------
+ gio/gio.defs		       |   4 +-
+ gio/gio.override	       |   1 +
+ tests/test_gio.py	       |  51 ++++++++-
  6 files changed, 300 insertions(+), 72 deletions(-)
 
 commit 2cb569c0ced49f9ed5ca83292d5f15c837066688
@@ -20640,7 +22677,7 @@ Date:	Sat May 30 17:24:15 2009 +0300
 
     Bug #584290.
 
- gio/goutputstream.override |	 8 ++++----
+ gio/goutputstream.override | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit e43fa429f6b4019a432acb481bbc07c8201cc46d
@@ -20649,7 +22686,7 @@ Date:	Wed May 27 21:19:27 2009 +0300
 
     Code maintenance: ignore one more file created by unit tests
 
- tests/.gitignore |    1 +
+ tests/.gitignore | 1 +
  1 file changed, 1 insertion(+)
 
 commit 76e9dc74ac706a9207f9d31f887d6e38df2a678f
@@ -20658,10 +22695,10 @@ Date:	Mon May 25 20:20:38 2009 +0200
 
     Update the docs with new 2.20 API
 
- docs/reference/pygio-appinfo.xml |  115 ++++++++++++++++++++++++++++
- docs/reference/pygio-icon.xml	  |   99 +++++++++++++++++++++++-
- docs/reference/pygio-mount.xml   |  156
- ++++++++++++++++++++++++++++++++++++++
+ docs/reference/pygio-appinfo.xml | 115 +++++++++++++++++++++++++++++
+ docs/reference/pygio-icon.xml	  |  99 ++++++++++++++++++++++++-
+ docs/reference/pygio-mount.xml   | 156
+ +++++++++++++++++++++++++++++++++++++++
  3 files changed, 367 insertions(+), 3 deletions(-)
 
 commit 8e40d71ac23deb7d91789486ee8cad440a6be1dd
@@ -20672,9 +22709,9 @@ Date:	Mon May 25 01:33:08 2009 +0200
 
     add the new API added in gio 2.20, some needs to be wrapped manually
 
- gio/gio.defs  |  106
- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- gio/unix.defs |   48 +++++++++++++++++++++-----
+ gio/gio.defs  | 106
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ gio/unix.defs |  48 +++++++++++++++++++++-----
  2 files changed, 146 insertions(+), 8 deletions(-)
 
 commit 0d08df42514fba6abc896814abfee0d2d083c29e
@@ -20683,7 +22720,7 @@ Date:	Mon May 25 00:14:21 2009 +0200
 
     Post release version bump 2.19.0
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit edfb09e3de7baf294b3beba84b4ecb94e1f16764
@@ -20692,8 +22729,8 @@ Date:	Sun May 24 23:56:29 2009 +0200
 
     Update NEWS, release 2.18.0
 
- NEWS	      |   14 ++++++++++++++
- configure.ac |    4 ++--
+ NEWS	      | 14 ++++++++++++++
+ configure.ac |  4 ++--
  2 files changed, 16 insertions(+), 2 deletions(-)
 
 commit e0648ea435e0b309cdd5bb0ebe56d4534efd26e4
@@ -20708,10 +22745,10 @@ Date:	Sun May 24 22:18:40 2009 +0200
     classes
     are in place so we can ship a (almost) complete reference.
 
- docs/Makefile.am		       |    2 +
- docs/reference/pygio-classes.xml      |    3 +-
- docs/reference/pygio-outputstream.xml |  140
- +++++++++++++++++++++++++++++++++
+ docs/Makefile.am		       |   2 +
+ docs/reference/pygio-classes.xml      |   3 +-
+ docs/reference/pygio-outputstream.xml | 140
+ ++++++++++++++++++++++++++++++++++
  3 files changed, 144 insertions(+), 1 deletion(-)
 
 commit 11524cdf6472d9115a812ce431f6767aec5627bc
@@ -20722,9 +22759,9 @@ Date:	Sun May 24 22:12:04 2009 +0200
 
     wrap gio.OutputStream.splice_async() and add a test.
 
- gio/goutputstream.override |	58
- +++++++++++++++++++++++++++++++++++++++++++-
- tests/test_gio.py	    |	20 +++++++++++++++
+ gio/goutputstream.override | 58
+ +++++++++++++++++++++++++++++++++++++++++++++-
+ tests/test_gio.py	    | 20 ++++++++++++++++
  2 files changed, 77 insertions(+), 1 deletion(-)
 
 commit 82ad6b8c8ea4d6694126f5e0e67b826717e38f19
@@ -20736,10 +22773,10 @@ Date:	Sun May 24 22:55:16 2009 +0300
     Do this now, while no-one (as far as we know) links to the library
     besides PyGObject itself.  Bug #550235.
 
- configure.ac	     |	  2 ++
- gio/Makefile.am     |	  2 +-
- glib/Makefile.am    |	 10 +++++-----
- gobject/Makefile.am |	  2 +-
+ configure.ac	     |	2 ++
+ gio/Makefile.am     |	2 +-
+ glib/Makefile.am    | 10 +++++-----
+ gobject/Makefile.am |	2 +-
  4 files changed, 9 insertions(+), 7 deletions(-)
 
 commit 59da8cd24ea390b6c983995833ec6b0e5d028b35
@@ -20750,9 +22787,9 @@ Date:	Sun May 24 11:44:24 2009 +0200
 
     wrap gio.OutputStream.flush_async() and add a test.
 
- gio/goutputstream.override |	47
- +++++++++++++++++++++++++++++++++++++++++++-
- tests/test_gio.py	    |	11 +++++++++++
+ gio/goutputstream.override | 47
+ +++++++++++++++++++++++++++++++++++++++++++++-
+ tests/test_gio.py	    | 11 +++++++++++
  2 files changed, 57 insertions(+), 1 deletion(-)
 
 commit 84ab6178ed0033f69932df5bc73c86bdff80c953
@@ -20767,10 +22804,10 @@ Date:	Sun May 17 17:29:37 2009 +0200
     classes
     are in place so we can ship a (almost) complete reference.
 
- docs/Makefile.am		      |    2 +
- docs/reference/pygio-classes.xml     |    1 +
- docs/reference/pygio-filemonitor.xml |  128
- ++++++++++++++++++++++++++++++++++
+ docs/Makefile.am		      |   2 +
+ docs/reference/pygio-classes.xml     |   1 +
+ docs/reference/pygio-filemonitor.xml | 128
+ +++++++++++++++++++++++++++++++++++
  3 files changed, 131 insertions(+)
 
 commit 629496a5617d30e4dfa494b05a62c85a6af77b9a
@@ -20781,8 +22818,8 @@ Date:	Sun May 17 18:03:44 2009 +0300
 
     Correction for patch in bug #550231.
 
- pygobject-2.0-uninstalled.pc.in |    3 ++-
- pygobject-2.0.pc.in		 |    3 ++-
+ pygobject-2.0-uninstalled.pc.in | 3 ++-
+ pygobject-2.0.pc.in		 | 3 ++-
  2 files changed, 4 insertions(+), 2 deletions(-)
 
 commit 90cd8b7c4a25cd2ecb751f8337b401c98538272b
@@ -20795,9 +22832,9 @@ Date:	Wed May 13 21:54:39 2009 +0200
     forgotten while
     wrapping the gio API. This should probably be done in gio itself.
 
- gio/gfileinfo.override |   24 ++++++++++++++++++++++--
- gio/gio-types.defs	|    7 +++++++
- gio/gio.override	|    2 ++
+ gio/gfileinfo.override | 24 ++++++++++++++++++++++--
+ gio/gio-types.defs	|  7 +++++++
+ gio/gio.override	|  2 ++
  3 files changed, 31 insertions(+), 2 deletions(-)
 
 commit e707447d9313f2f2ecba395cfe3682d5a5e859f4
@@ -20809,8 +22846,8 @@ Date:	Wed May 13 22:06:25 2009 +0300
     Additionally fix glib.IOChannel.set_close_on_unref: was marked
     METH_NOARGS but actually accepted arguments.  Fixes bug #582427.
 
- glib/pygiochannel.c |	 83
- +++++++++++++--------------------------------------
+ glib/pygiochannel.c | 83
+ +++++++++++++----------------------------------------
  1 file changed, 20 insertions(+), 63 deletions(-)
 
 commit 002915e5f458fec5a89766a54e8119a70a80caa7
@@ -20825,10 +22862,10 @@ Date:	Tue May 12 20:37:24 2009 +0200
     classes
     are in place so we can ship a (almost) complete reference.
 
- docs/Makefile.am		   |	2 +
- docs/reference/pygio-classes.xml  |	1 +
- docs/reference/pygio-fileinfo.xml |  346
- +++++++++++++++++++++++++++++++++++++
+ docs/Makefile.am		   |   2 +
+ docs/reference/pygio-classes.xml  |   1 +
+ docs/reference/pygio-fileinfo.xml | 346
+ ++++++++++++++++++++++++++++++++++++++
  3 files changed, 349 insertions(+)
 
 commit 8cd25c871609580425c6c4c9e5bc6ec8d40862a1
@@ -20854,7 +22891,7 @@ Date:	Sat May 9 00:03:05 2009 +0200
 
     use the count argument instead of buffer_size which is always zero
 
- gio/ginputstream.override |	3 ++-
+ gio/ginputstream.override | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit ed6b06315c17441b41c001d38537c904b8fe18de
@@ -20863,10 +22900,10 @@ Date:	Sat May 9 00:02:33 2009 +0200
 
     Add docs for the gio.InputStream class
 
- docs/Makefile.am		      |    2 +
- docs/reference/pygio-classes.xml     |    1 +
- docs/reference/pygio-inputstream.xml |  730
- ++++++++++++++++++++++++++++++++++
+ docs/Makefile.am		      |   2 +
+ docs/reference/pygio-classes.xml     |   1 +
+ docs/reference/pygio-inputstream.xml | 730
+ +++++++++++++++++++++++++++++++++++
  3 files changed, 733 insertions(+)
 
 commit d58322b84d47da7905f95b43e9e0daf9f7c4b507
@@ -20877,9 +22914,9 @@ Date:	Mon May 4 23:40:28 2009 +0200
 
     wrap gio.InputStream.skip_async() and add a test.
 
- gio/ginputstream.override |   50
- ++++++++++++++++++++++++++++++++++++++++++++-
- tests/test_gio.py	   |   20 ++++++++++++++++++
+ gio/ginputstream.override | 50
+ ++++++++++++++++++++++++++++++++++++++++++++++-
+ tests/test_gio.py	   | 20 +++++++++++++++++++
  2 files changed, 69 insertions(+), 1 deletion(-)
 
 commit 2311187824d1b48a996ee2620fd3c9a63e3edd66
@@ -20891,9 +22928,9 @@ Date:	Mon May 4 15:46:49 2009 +0430
 
     Patch from bug #579275
 
- ChangeLog	  |    8 ++++
- codegen/h2def.py |  133
- ++++++++++++++++++++++++++++++++++++++++++++----------
+ ChangeLog	  |   8 ++++
+ codegen/h2def.py | 133
+ +++++++++++++++++++++++++++++++++++++++++++++----------
  2 files changed, 117 insertions(+), 24 deletions(-)
 
 commit 442ec5bb997bb7dab55baeea6e54e79d3ce0d3c1
@@ -20904,7 +22941,7 @@ Date:	Sat May 2 23:54:52 2009 +0300
 
     Fixes bug #581082.
 
- glib/glibmodule.c |	2 +-
+ glib/glibmodule.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f466dca880cc6ea68b9fe236943eea7a07d33520
@@ -20913,10 +22950,10 @@ Date:	Sun May 3 11:03:25 2009 +0200
 
     Add docs for the gio.LoadableIcon class
 
- docs/Makefile.am		       |    2 +
- docs/reference/pygio-classes.xml      |    1 +
- docs/reference/pygio-loadableicon.xml |  198
- +++++++++++++++++++++++++++++++++
+ docs/Makefile.am		       |   2 +
+ docs/reference/pygio-classes.xml      |   1 +
+ docs/reference/pygio-loadableicon.xml | 198
+ ++++++++++++++++++++++++++++++++++
  3 files changed, 201 insertions(+)
 
 commit eab4ebf7f6c82580b61205f34e1cfe535aeada60
@@ -20925,10 +22962,10 @@ Date:	Sun May 3 01:21:55 2009 +0200
 
     Add docs for the gio.ThemedIcon class
 
- docs/Makefile.am		     |	  2 +
- docs/reference/pygio-classes.xml    |	  1 +
- docs/reference/pygio-themedicon.xml |	204
- +++++++++++++++++++++++++++++++++++
+ docs/Makefile.am		     |	 2 +
+ docs/reference/pygio-classes.xml    |	 1 +
+ docs/reference/pygio-themedicon.xml | 204
+ ++++++++++++++++++++++++++++++++++++
  3 files changed, 207 insertions(+)
 
 commit 22d7de8b620055f14b30f9c3c99160c8b4ebe672
@@ -20937,7 +22974,7 @@ Date:	Sat May 2 12:25:19 2009 +0200
 
     post release version bump to 2.17.1
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 282ac3c76e1e3513bd76f819f320ec56aba15d9e
@@ -20946,7 +22983,7 @@ Date:	Fri May 1 23:40:31 2009 +0200
 
     Fix the class title
 
- docs/reference/pygio-mountoperation.xml |    2 +-
+ docs/reference/pygio-mountoperation.xml | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d8b70dec1e5c09b73ae277f4f5b246315841fb8e
@@ -20955,11 +22992,11 @@ Date:	Fri May 1 22:24:33 2009 +0200
 
     Add docs for the gio.MountOperation class
 
- docs/Makefile.am			 |    2 +
- docs/reference/pygio-classes.xml	 |    1 +
- docs/reference/pygio-constants.xml	 |  107 +++++
- docs/reference/pygio-mountoperation.xml |  726
- +++++++++++++++++++++++++++++++
+ docs/Makefile.am			 |   2 +
+ docs/reference/pygio-classes.xml	 |   1 +
+ docs/reference/pygio-constants.xml	 | 107 +++++
+ docs/reference/pygio-mountoperation.xml | 726
+ ++++++++++++++++++++++++++++++++
  4 files changed, 836 insertions(+)
 
 commit fceea8e843e880f0469e454df23141e7dd2bc0cf
@@ -20968,8 +23005,8 @@ Date:	Thu Apr 30 22:13:06 2009 +0200
 
     Update NEWS, release 2.17.0
 
- NEWS |   93
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ NEWS | 93
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 93 insertions(+)
 
 commit 47389217d1a65a8e3f404d486c508cf5d3164756
@@ -20981,5 +23018,5 @@ Date:	Thu Apr 30 22:47:19 2009 +0300
     After the recent patch it would leak exception data if old argument
     order was used.  Properly decref the objects.
 
- gio/gfile.override |	 4 ++++
+ gio/gfile.override | 4 ++++
  1 file changed, 4 insertions(+)
diff --git a/ChangeLog.pre-2.18 b/ChangeLog.pre-2.18
deleted file mode 100644
index 2fb8ef4..0000000
--- a/ChangeLog.pre-2.18
+++ /dev/null
@@ -1,3608 +0,0 @@
-=== ChangeLog discontinued ===
-
-2009-05-04  Siavash Safi  <siavash@siavashs.org>
-
-	Bug 579275 – Patch which removes dll api in headers and adds
-	a namespace option
-
-	* codegen/h2def.py: Add -n --namespace option and the code to remove
-	dll API in headers, Added documentation
-
-2009-04-17  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	Bug 568499 – CellRendererPixbuf stock-size property has wrong type
-
-	* gobject/pygtype.c (pyg_enum_get_value): Also accept long
-	integers.
-
-2009-04-15  Götz Waschk  <waschk@mandriva.org>
-
-	Bug 550231 – missing dep on libffi in pygobject-2.0.pc
-
-	* configure.ac: Define `LIBFFI_PC' subst.
-
-	* pygobject-2.0.pc.in:
-	* pygobject-2.0-uninstalled.pc.in: Use it.
-
-2009-04-15  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	Bug 555613 – gio.VolumeMonitor segfaults
-
-	* gio/gvolumemonitor.override (_wrap_g_volume_monitor_tp_new): New
-	function, return the singleton object.
-
-2009-04-14  James Westby  <jw+debian@jameswestby.net>
-
-	Bug 573753 – DeprecationWarning under python 2.6
-
-	* codegen/definitions.py (ReturnType.__init__): Don't pass
-	'type_name' argument to super __init__.
-
-2009-04-14  Krzesimir Nowak  <krnowak@svn.gnome.org>
-
-	Bug 576566 – several scripts from codegen directory are not
-	distributed
-
-	* codegen/Makefile.am (codegen_PYTHON): List several missing
-	scripts.
-
-2009-04-14  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	* gio/gfile.override: (_wrap_g_file_copy_async) change argument order
-	to keep it consistent with the other methods.
-
-2009-04-13  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	Bug 578870 – memory leak in gio.File.copy_async
-
-	* gio/gio.override (PyGIONotify): Add 'slaves' field.
-	(pygio_notify_new_slave): New function.
-	(pygio_notify_reference_callback): Recurse for slaves, if any.
-	(pygio_notify_free): Likewise.
-
-	* gio/gfile.override (file_progress_callback_marshal): Use new
-	chaining functionality to avoid leaking the second PyGIONotify
-	structure.  Rename 'callback' as 'progress_callback' for clarity.
-
-2009-04-12  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	* gio/gio.defs: (g_file_monitor) should accept None
-	for cancellable and set the default flag to G_FILE_MONITOR_NONE.
-
-2009-04-09  Jonathan Matthew  <jonathan@d14n.org>
-
-	Bug 575781 – pyg_notify_free needs to ensure it has GIL before calling
-	Py_XDECREF
-
-	* gio/gio.override:  Ensure we're holding the GIL before potentially
-	destroying the callback and data.
-
-2009-04-05  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	* gio/gfile.override:
-	(_wrap_g_file_set_display_name_async) Wrap new GFile method.
-	
-	* tests/test_gio.py: Test the above methods.
-
-2009-04-05  Tristan Hill  <stan@saticed.me.uk>
-
-	reviewed by: Gustavo J. A. M. Carneiro.
-
-	* glib/pygoptioncontext.c (pyg_option_get_context): Add a
-	semi-private method to return the option context C object from an
-	option context wrapper.  Used in gnome-python for fixing Bug
-	#507174.
-
-2009-04-05  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* gobject/pygtype.c (pyg_value_from_pyobject): Bug 577999 –
-	converting a negative long Python value to a GUINT64 GValue
-	doesn't error out as it should.
-
-2009-04-04  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	* gio/gfile.override:
-	(_wrap_g_file_set_attributes_async)
-	(_wrap_g_file_set_attributes_finish) Wrap new GFile methods.
-	
-	* tests/test_gio.py: Test the above methods.
-
-2009-03-31  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	* gio/gfile.override:
-	(_wrap_g_file_query_filesystem_info_async) Fix a typo.
-
-2009-03-31  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	* gio/gfile.override:
-	(_wrap_g_file_query_filesystem_info_async) Wrap new GFile method.
-
-2009-03-31  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	* gio/gio.defs: Add missing g_file_query_filesystem_info_async and
-	g_file_query_filesystem_info_finish
-
-2009-03-30  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	* gio/gfile.override: (_wrap_g_file_mount_mountable)
-	Swap kwargs names to reflect the code.
-
-2009-03-30  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	* gio/gfile.override: (_wrap_g_file_mount_enclosing_volume)
-	Swap kwargs names to reflect the code.
-
-2009-03-30  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	* gio/gfile.override:
-	(_wrap_g_file_find_enclosing_mount_async) Wrap new GFile method.
-
-2009-03-30  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	* gio/gfile.override:
-	(_wrap_g_file_eject_mountable) Wrap new GFile method.
-
-2009-03-30  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	* gio/gfile.override: (_wrap_g_file_copy) revert previous commit.
-
-2009-03-30  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	* gio/gfile.override: (_wrap_g_file_copy) callback cannot be optional.
-
-2009-03-29  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	* gio/gvolume.override: (_wrap_g_volume_mount) should accept None
-	for mount_operation.
-
-2009-03-29  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	* gio/gvolume.override: Swap kwargs names to reflect the code.
-
-2009-03-29  Tobias Mueller  <tobiasmue@gnome.org>
-
-	* ltihooks.py:
-	* pygtk.py:
-	* COPYING:
-	* gobject/pygparamspec.h:
-	* gobject/pygpointer.c:
-	* gobject/ffi-marshaller.h:
-	* gobject/pygtype.c:
-	* gobject/__init__.py:
-	* gobject/pygpointer.h:
-	* gobject/pygtype.h:
-	* gobject/pygflags.c:
-	* gobject/pyginterface.c:
-	* gobject/pygflags.h:
-	* gobject/pygboxed.c:
-	* gobject/gobjectmodule.c:
-	* gobject/pygenum.c:
-	* gobject/pyginterface.h:
-	* gobject/pygboxed.h:
-	* gobject/pygobject.c:
-	* gobject/constants.py.in:
-	* gobject/pygenum.h:
-	* gobject/propertyhelper.py:
-	* gobject/pygparamspec.c:
-	* gobject/ffi-marshaller.c:
-	* glib/pygmainloop.c:
-	* glib/pygoptioncontext.h:
-	* glib/pygmainloop.h:
-	* glib/pyglib-private.h:
-	* glib/__init__.py:
-	* glib/pygoptiongroup.c:
-	* glib/pygspawn.c:
-	* glib/pygmaincontext.c:
-	* glib/pygoptiongroup.h:
-	* glib/pygspawn.h:
-	* glib/pygmaincontext.h:
-	* glib/option.py:
-	* glib/pygsource.c:
-	* glib/glibmodule.c:
-	* glib/pygiochannel.h:
-	* glib/pygsource.h:
-	* glib/pyglib.c:
-	* glib/pyglib.h:
-	* glib/pyglib-python-compat.h:
-	* glib/pygoptioncontext.c:
-	* gio/gfileinfo.override:
-	* gio/gappinfo.override:
-	* gio/__init__.py:
-	* gio/gfileattribute.override:
-	* gio/gvolume.override:
-	* gio/gio.override:
-	* gio/ginputstream.override:
-	* gio/goutputstream.override:
-	* gio/unix.override:
-	* gio/gfile.override:
-	* gio/gvolumemonitor.override:
-	* gio/gapplaunchcontext.override:
-	* gio/giomodule.c:
-	* gio/gfileenumerator.override:
-	* gio/pygio-utils.c:
-	* gio/unixmodule.c:
-	* gio/pygio-utils.h:
-	* gio/gicon.override:
-	Update the address of the FSF, by replacing old bits of the address 
-	with new ones.
-	Fixes bug 577134
-
-2009-03-29  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	* gio/gio.defs: Add g_volume_should_automount
-
-2009-03-28  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	* gio/pygio-utils.[hc]: (strv_to_pylist) (pylist_to_strv) add a couple
-	of convinence functions to convert from/to a python list and an array
-	of strings.
-
-	* gio/Makefile.am
-	* gio/gdrive.override:
-	* gio/gio.override: Strip GDrive overrides and
-	wrap g_drive_enumerate_identifiers
-	
-	* tests/test_gio.py:
-	* gio/gvolume.override: wrap g_volume_enumerate_identifiers
-
-	* gio/gio.defs: add missing g_drive_get_identifier and
-	g_drive_enumerate_identifiers
-
-2009-03-22  Mark Lee  <marklee@svn.gnome.org>
-
-	Bug 559001 – Allow setting pytype wrapper class
-
-	initial patch by: John Ehresman  <jpe@wingware.com>
-
-	* gobject/pygtype.c (_wrap_g_type_wrapper__set_pytype): New function.
-
-	* tests/test_gtype.py (GTypeTest.assertPyType),
-	(GTypeTest.setInvalidPyType), (GTypeTest.testPyType),
-	(GTypeTest.testInvalidPyType): Two new testcases to test the above,
-	with accompanying helper methods.
-
-2009-03-22  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	* gio/gio.defs: Add g_file_enumerator_get_container, new in 2.18
-
-2009-03-22  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	* gio/gfileenumerator.override (_wrap_g_file_enumerator_close_async)
-	wrap new method.
-
-	* tests/test_gio.py (TestGFileEnumerator.testCloseFilesAsync):
-	Test the above.
-
-2009-03-09  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	* docs/reference/Changelog: Create a dedicated Changelog for the docs
-	and move the latest entries in there.
-
-2009-02-20  James Henstridge  <james@jamesh.id.au>
-
-	* ltihooks.py: pull in changes from pygtk (updating license header
-	from GPL to LGPL).
-
-2009-02-18  Andre Klapper  <a9016009@gmx.de>
-
-	* gobject/pygobject.h:
-	Change comment to avoid false positives when grep'ing for 
-	deprecated gtk functions
-
-2009-02-17  Gustavo J. A. M. Carneiro  <gjc@inescporto.pt>
-
-	* gio/gfile.override, gio/gio.defs, gio/gio.override: Bug 556250
-	again.  I screwed up and gave misinformation about how to fix it.
-	It must be pyg_begin/end_allow_threads, pyg_block/unblock_threads
-	is only to be used for async callbacks.
-
-2009-02-10  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	Bug 556250 – non-async functions don't release python locks before
-	calling blocking C functions
-
-	* gio/gio.override:
-	* gio/gfile.override:
-	* gio/gio.defs: release the thread lock.
-
-2009-02-10  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	* gio/gio.defs:
-	* gio/gio-types.defs:
-	* gio/unix.defs: Add 2.18 gio API.
-
-2009-02-08  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	Bug 568427 – "gio.Error: Too many open files" without too many
-	open files
-	
-	* gobject/pygtype.c (_wrap_g_type_wrapper__get_name):
-	* gobject/gobjectmodule.c (get_type_name_for_class):
-	* gobject/pygobject.c (build_parameter_list), (PyGProps_length):
-	* gio/gfileinfo.override (_wrap_g_file_info_list_attributes):
-	* gio/gio.override (_wrap_g_content_type_guess):
-	* gio/gfile.override (_wrap__file_init), (_wrap_g_file_load_contents)
-	(_wrap_g_file_load_contents_finish): Remove some memory leaks.
-	
-	* gio/gio.defs: add (caller-owns-return #t) all over the place to
-	prevent memory leaks.
-	
-	patch contributed by Paul Pogonyshev, Paolo Borelli and
-	Gian Mario Tagliaretti.
-
-2009-02-06  Murray Cumming  <murrayc@murrayc.com>
-
-	* codegen/h2def.py DefsWriter::write_enum_defs(): Prevent an exception 
-	when the prefix is empty.
-
-2009-01-29  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	Bug 569350 – Inconsistent use of tabs and spaces in pygtk.py
-
-	* pygtk.py: Replace all tabs with spaces.
-
-2009-01-29  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	Bug 567792 – gio.InputStream.read_async can cause memory
-	corruption
-
-	* gio/gio.override (py_decref_callback): Remove (unused now).
-	(pygio_notify_allocate_buffer, pygio_notify_attach_to_result)
-	(pygio_notify_get_attached): New functions.
-	(async_result_callback_marshal): Attach to the result object if
-	asked and then don't free self.  Fix reference leak (spotted by
-	Gustavo).
-
-	* gio/ginputstream.override (async_result_callback_marshal_read):
-	Remove.  Use new attachment functionality in
-	async_result_callback_marshal() instead.
-	(_wrap_g_input_stream_read_async): Use the new functions (also
-	those mentioned in the cleanup log below).
-	(_wrap_g_input_stream_read_finish): Use the new functions.
-
-2009-01-27  Daniel Elstner  <danielk@openismus.com>
-
-	* codegen/docextract_to_xml.py (escape_text): Do not escape the
-	ampersand "&" in entity references (bug #568485).  Replace some
-	unusual entity references in the output with their literal values.
-
-2009-01-14  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	Bug 566571 – gtk.Buildable interface method override is not
-	recognized
-
-	* gobject/gobjectmodule.c (pyg_type_add_interfaces): New function,
-	break out code repetition out of pyg_type_register().
-
-	* tests/test_subtype.py
-	(TestSubType.test_gtk_buildable_virtual_method): New test
-	case (inactive).
-
-2009-01-14  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	Bug 566706 – cleanup GIO overrides
-
-	* gio/gio.override (pygio_notify_new)
-	(pygio_notify_using_optional_callback)
-	(pygio_notify_callback_is_valid_full)
-	(pygio_notify_callback_is_valid)
-	(pygio_notify_reference_callback): New functions.
-	(pygio_notify_free): Rename from pygio_free_notify() and extend.
-	(async_result_callback_marshal): Warn if new `referenced' field is
-	not set (programming error).
-	(_wrap_g_drive_eject, _wrap_g_drive_poll_for_media)
-	(_wrap_g_mount_unmount, _wrap_g_mount_eject)
-	(_wrap_g_mount_remount): Lots of cleanup: use new functions
-	instead of repeating code, unify and fix error handling.
-
-	* gio/gfile.override (_wrap_g_file_read_async)
-	(_wrap_g_file_load_contents_async)
-	(_wrap_g_file_enumerate_children_async)
-	(_wrap_g_file_mount_mountable, _wrap_g_file_unmount_mountable)
-	(_wrap_g_file_mount_enclosing_volume, _wrap_g_file_copy)
-	(_wrap_g_file_copy_async, _wrap_g_file_move)
-	(_wrap_g_file_append_to_async, _wrap_g_file_create_async)
-	(_wrap_g_file_replace_async, _wrap_g_file_query_info_async)
-	(_wrap_g_file_replace_contents_async): Similar cleanup.
-
-	* gio/gfileenumerator.override
-	(_wrap_g_file_enumerator_next_files_async): Similar cleanup.
-
-	* gio/gicon.override (_wrap_g_loadable_icon_load_async): Similar
-	cleanup.
-
-	* gio/ginputstream.override (_wrap_g_input_stream_close_async):
-	Similar cleanup.
-
-	* gio/goutputstream.override (_wrap_g_output_stream_write_async)
-	(_wrap_g_output_stream_close_async): Similar cleanup.
-
-	* gio/gvolume.override (_wrap_g_volume_mount)
-	(_wrap_g_volume_eject): Similar cleanup.
-
-	* tests/test_gio.py (TestFile.test_copy_async): Fix the test.
-
-2009-01-09  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* gobject/gobjectmodule.c (pyg_type_register): Add a comment
-	explaining why the two for loops for registering interfaces.
-
-2009-01-07  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	Bug 566744 – _wrap_g_input_stream_read_async() argument parsing
-	has incorrect keyword args
-
-	* gio/ginputstream.override (_wrap_g_input_stream_read_async): Fix
-	keyword list to be in sync with positional arguments.
-
-2009-01-06  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	Bug 566737 – Bad -I ordering can break build
-
-	* Makefile.am:
-	* gobject/Makefile.am:
-	* gio/Makefile.am:
-	* tests/Makefile.am:
-	Commit a patch from [dmacks at netspace dot org]
-
-2009-01-04  Mads Chr. Olesen  <gnome-bugzilla@shiyee.dk>
-
-	* gio/gio.defs (gio.File.copy_async, gio.File.copy_finish): Define
-	methods.
-
-	* gio/gfile.override (_wrap_g_file_copy_async): New function.
-
-	* tests/test_gio.py (TestFile.test_copy_async): Test the methods.
-
-2009-01-04  Przemysław Grzegorczyk  <pgrzegorczyk@gmail.com>
-
-	Bug 563714 – GNOME Goal: Clean up GLib and GTK+ includes
-
-	* gobject/generate-constants.c:
-	* glib/pygspawn.c: Only include toplevel <glib.h>.
-
-2009-01-04  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	Bug 564018 – pygobject libtool-2.2 patch
-
-	* configure.ac: Apply the patch provided by Cygwin Ports
-	maintainer.
-
-2009-01-04  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	* configure.ac: Branch, bump version to 2.17.0.
-
-=== 2.16.0 ===
-2008-12-24  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	Bug 547119 – gobject.timeout_add_seconds() not found in docs
-
-	* docs/reference/pyglib-functions.xml (glib.timeout_add_seconds):
-	Describe.
-
-2008-12-21  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	Bug 564102 – _wrap_g_output_stream_write_async not adding a
-	reference to the buffer passed
-
-	* gio/gio.override (pygio_notify_copy_buffer): New function.
-	(pygio_free_notify): Free new `buffer' field if it is set.
-
-	* gio/goutputstream.override (_wrap_g_output_stream_write_async):
-	Copy the buffer with new pygio_notify_copy_buffer() and use the
-	copy for g_output_stream_write_async() call.
-
-	* gio/gfile.override (_wrap_g_file_replace_contents_async): Same
-	as for _wrap_g_output_stream_write_async().
-
-2008-12-03  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	* glib/pyglib.c (pyglib_error_check): Test if `domain' is not-null
-	before using it (avoids segfaults, see bug #561826).
-
-2008-10-31  John Finlay  <finlay@moeraki.com>
-
-	* codegen/__init__.py (__all__): Add defsgen to __all__ list.
-
-	* codegen/h2def.py (find_enum_defs): Strip out # directives from
-	enum defintions.
-	(clean_func): Change ' * G_CONST_RETURN * ' to '** '
-
-	* codegen/Makefile.am (codegen_PYTHON): Add defsgen.py
-
-	* codegen/defsgen.py (typecode): Use the passed in prefix as a
-	hint when creating a typecode.
-	(split_prefix,write_enum_defs,_write_obj_helper): Add function to
-	use passed in prefix as a hint when splitting an object name into
-	module and name.
-
-	* codegen/h2def.py (DefsWriter.write_enum_defs): Make sure the
-	prefix ends with a _ i.e. really handle the GDK_FONT_FONT,
-	GDK_FONT_FONTSET case.
-
-2008-09-12  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	* gio/goutputstream.override
-	(g_output_stream_write_all): use gsize instead of gssize.
-
-2008-09-10  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	Bug 530935 – pygobject_set_properties doesnt release the GIL
-
-	* gobject/pygobject.c (pygobject_set_properties): Reuse
-	set_property_from_pspec() which release GIL for us.  Also make
-	sure that g_object_thaw_notify() is called even after error.
-
-2008-09-09  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	Bug 549517 – add __repr__ to gio.Drive, gio.Mount and gio.Volume
-
-	* gio/gio.override (_wrap_g_drive_tp_repr, _wrap_g_mount_tp_repr):
-	New functions.
-
-	* gio/gvolume.override (_wrap_g_volume_tp_repr): New function.
-
-2008-09-09  Loïc Minier  <lool@dooz.org>
-
-	Bug 551227 – Missing AC_CONFIG_MACRO_DIR([m4])
-
-	* configure.ac: Add AC_CONFIG_MACRO_DIR.
-
-2008-09-08  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	Bug 551056 – make codegen not import when corresponding argument
-	types are not registered
-
-	* codegen/override.py (import_pat): Add support for optional 'for'
-	clause.
-	(Overrides.__parse_override): Handle it.
-
-	* codegen/codegen.py (SourceWriter.write_imports)
-	(SourceWriter.write_object_imports): Adapt for changes in
-	get_imports() return value.
-	(is_registered_object): New function.
-
-2008-09-07  Frederic Peters  <fpeters@0d.be>
-
-	* gio/gfile.override (_wrap_g_file_load_contents)
-	(_wrap_g_file_load_contents_finish): Fix typos breaking
-	compilation (bug #551212).
-
-2008-09-07  Jonathan Matthew  <jonathan@d14n.org>
-
-	Bug 551059 – GFile load_contents methods chop data at first \0
-
-	* gio/gfile.override:
-	Use 's#' (length specified) rather than 's' when constructing
-	result values in load_contents and load_contents_finish.
-
-2008-09-03  Johan Dahlin  <johan@gnome.org>
-
-	* configure.ac:
-	Post release version bump
-
-=== 2.15.4 ===
-2008-09-03  Johan Dahlin  <johan@gnome.org>
-
-	* NEWS: Update
-
-2008-09-03  Loïc Minier  <lool@dooz.org>
-
-	* gobject/pygpointer.c: (pyg_register_pointer):
-	Fix typo (s/&type/type) introduced in r886 causing weird crashes on
-	x86-64; bug #550463.
-
-2008-09-01  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	* codegen/argtypes.py: add G_TYPE_CLOSURE boxed type in codegen.
-
-2008-08-31  Johan Dahlin  <johan@gnome.org>
-
-	* configure.ac:
-	Post release version bump
-
-=== 2.15.3 ===
-2008-08-31  Johan Dahlin  <johan@gnome.org>
-
-	* NEWS: Update
-
-2008-08-30  Gustavo J. A. M. Carneiro  <gjc@inescporto.pt>
-
-	* glib/pyglib.h: * gobject/pygobject.c: Fix memory problems
-	reported by valgrind due to invalid tp_basicsize in
-	PyGPropsDescr_Type.  Closes #549945.
-
-2008-08-28  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	Bug 549191 – Constructor of gtk.TreeView raises TypeError when
-	model is None
-
-	* gobject/pygtype.c (pyg_value_from_pyobject): Handle None in
-	G_TYPE_INTERFACE branch.
-
-2008-08-28  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	Bug 549351 – an unitialized variable in PyGLib
-
-	* glib/pygmainloop.c (pyg_main_loop_init): Initialize
-	`is_running'.
-
-2008-08-28  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	Bug 547633 – cannot create new threads when pygtk is used
-
-	* glib/pyglib.c (_pyglib_notify_on_enabling_threads): New
-	function.
-	(pyglib_enable_threads): Invoke all callbacks added with new
-	_pyglib_notify_on_enabling_threads().
-
-	* gobject/gobjectmodule.c (pyg_note_threads_enabled): New
-	function (callback for new _pyglib_notify_on_enabling_threads()).
-	(PYGLIB_MODULE_START): Initialize
-	'pygobject_api_functions.threads_enabled' and also watch for
-	thread being enabled later on.
-
-2008-08-28  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	Bug 547088 – wrap g_content_types_get_registered()
-
-	* gio/gio.override (_wrap_g_drive_get_volumes): Fix refleak.
-	(_wrap_g_content_types_get_registered): New function.
-
-	* gio/gfileenumerator.override (_wrap_g_file_enumerator_next_files_finish):
-	Fix refleak.
-
-	* gio/gvolumemonitor.override (_wrap_g_volume_monitor_get_connected_drives):
-	Fix refleak.
-	(_wrap_g_volume_monitor_get_volumes): Likewise.
-	(_wrap_g_volume_monitor_get_mounts): Likewise.
-
-2008-08-28  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	Bug 547494 – gio.InputStream.read() looks broken
-
-	* gio/gio.defs (gio.InputStream.read_part): Rename from read(),
-	document.
-	(gio.InputStream.read): Rename from read_all(), document.
-	(gio.OutputStream.write_part): Rename from write(), document.
-	(gio.OutputStream.write): Rename from write_all(), document.
-
-	* gio/ginputstream.override (_wrap_g_input_stream_read): Fix
-	several bugs.
-	(_wrap_g_input_stream_read_all): New function.
-
-	* gio/goutputstream.override (_wrap_g_output_stream_write_all):
-	New function.
-
-	* tests/test_gio.py (TestInputStream.testRead): Add more tests.
-	(TestInputStream.test_read_part): New test.
-	(TestInputStream._read_in_loop): New helper method.
-	(TestOutputStream.test_write_part): New test.
-
-2008-08-16  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	* gio/gfile.override (_wrap_g_file_enumerate_children_async): Fix
-	keywords getting out of sync with actual argument order.
-
-2008-08-13  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	Bug 547495 – wrap four important asynchronous methods in gio.Drive
-	and gio.Mount
-
-	* gio/gio.defs (gio.Drive.eject, gio.Drive.poll_for_media)
-	(gio.Mount.remount): Document.
-
-	* gio/gio.override (_wrap_g_drive_eject)
-	(_wrap_g_drive_poll_for_media, _wrap_g_mount_eject)
-	(_wrap_g_mount_remount): New functions.
-
-2008-08-12  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	Bug 547484 – wrap gio.DataInputStream.read_line and ...read_until
-
-	* tests/test_gio.py (TestDataInputStream): New test case.
-
-	* gio/gio.defs (gio.DataInputStream.read_line)
-	(gio.DataInputStream.read_until): Document.
-
-	* gio/ginputstream.override (_wrap_g_data_input_stream_read_line)
-	(_wrap_g_data_input_stream_read_until): New functions.
-
-2008-08-12  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	Bug 547354 – wrap a few memory stream methods
-
-	* gio/ginputstream.override (_wrap_g_memory_input_stream_add_data):
-	New function.
-
-	* gio/gio.defs (gio.MemoryOutputStream.get_contents): Rename from
-	get_data() to avoid name clash.
-
-	* gio/goutputstream.override (_wrap_g_memory_output_stream_new)
-	(_wrap_g_memory_output_stream_get_data): New functions.
-
-	* tests/test_gio.py (TestMemoryInputStream)
-	(TestMemoryOutputStream): New test cases.
-
-2008-08-12  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	* gio/gio.override: Ignore `g_io_module*' and `g_io_scheduler_*'.
-
-2008-08-11  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	Bug 540376 – No TypeError raised when type is None
-
-	* gobject/gobjectmodule.c (pyg_signal_new): Add check on second
-	argument type.
-
-	* tests/test_signal.py (TestSignalCreation): New test case.
-
-2008-08-11  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	Bug 547104 – improve type wrapper creation
-
-	* gio/gappinfo.override (_wrap_g_app_info_tp_richcompare)
-	(_wrap_g_app_info_tp_repr): New functions.
-
-	* tests/test_gio.py (TestAppInfo.test_eq): New test.
-
-2008-08-11  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	Bug 547104 – improve type wrapper creation
-
-	* gobject/pygobject.c (pygobject_register_class): Use new
-	pygobject_inherit_slots() to propagate custom slots in normal
-	types too.
-	(pygobject_inherit_slots): New function, break out of
-	pygobject_new_with_interfaces() and rewrite a bit.
-	(pygobject_find_slot_for): Add new argument that can forbid
-	overriding non-NULL slots.
-
-	* gio/gicon.override (pygio_do_icon_richcompare): Remove, the code
-	is now directly in _wrap_g_icon_tp_richcompare().
-	(_wrap_g_file_icon_tp_richcompare, _wrap_g_file_icon_tp_hash)
-	(_wrap_g_themed_icon_tp_richcompare, _wrap_g_themed_icon_tp_hash):
-	Remove, duplicating code in this way is not needed anymore.
-
-2008-08-10  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	Bug 546120 – make gio.File more Pythonic
-
-	* gio/gfile.override (_wrap_g_file_tp_richcompare)
-	(_wrap_g_file_tp_hash, _wrap_g_file_tp_repr): New functions.
-
-	* tests/test_gio.py (TestFile.test_eq, TestFile.test_hash): New
-	tests.
-
-2008-08-10  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	Bug 547104 – improve runtime type wrapper creation
-
-	* gobject/pygobject.c (pygobject_new_with_interfaces): Use new
-	pygobject_find_slot_for() for `tp_richcompare', `tp_compare`,
-	`tp_hash', `tp_iter', `tp_repr', `tp_str' and `tp_print'.
-	(pygobject_find_slot_for): New static function.
-
-2008-08-10  Jonathan Matthew  <jonathan@d14n.org>
-
-	Bug 547134 – fix docstring line length
-
-	* gio/gio.defs:
-	Fix docstring line lengths so they don't wrap across lines in an 80
-	column terminal.
-
-2008-08-10  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	* gio/gio.defs:
-	Add GFile.query_default_handler which was missing from the defs.
-
-2008-08-10  Jonathan Matthew  <jonathan@d14n.org>
-
-	Bug 547067 – add File.replace_contents, replace_contents_async,
-	replace_contents_finish.
-
-	* gio/gfile.override:
-	* gio/gio.defs:
-	* tests/test_gio.py:
-	Add overrides, docs, and tests for File.replace_contents,
-	replace_contents_async, and replace_contents_finish.
-
-2008-08-09  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	* tests/test_gicon.py (TestThemedIcon.test_constructor): Fix to
-	not use `use_default_fallbacks' property (it's new).
-
-2008-08-09  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	Bug 546135 – GIcon and implementations improvements
-
-	* gio/gio.defs (g_file_icon_new): Change from method of gio.File
-	to constructor of gio.FileIcon.
-
-	* tests/test_gicon.py (TestIcon.test_eq, Test_Eq.test_hash)
-	(TestLoadableIcon.setUp): Adapt accordingly.
-	(TestFileIcon): New test case.
-
-2008-08-09  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	Bug 546591 – File.copy progress_callback does not work
-
-	* gio/gfile.override (file_progress_callback_marshal): Use
-	PyObject_CallFunction() instead of PyEval_CallFunction().  Use "K"
-	instead of "k" (the latter is not correct for 32-bit platforms).
-	Don't free 'notify' here.
-	(_wrap_g_file_copy): Free 'notify'.
-	(_wrap_g_file_move): Likewise.
-
-	* gio/gio.override (pygio_free_notify): New function.
-	(async_result_callback_marshal): Use it.
-
-	* tests/test_gio.py (TestFile.test_copy_progress.progress): New
-	test.
-
-2008-08-09  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	Bug 546135 – GIcon and implementations improvements
-
-	* gio/gio.defs (gio.LoadableIcon.load)
-	(gio.LoadableIcon.load_async, gio.LoadableIcon.load_finish):
-	Document.
-
-	* gio/Makefile.am:
-	* gio/gicon.override: New file: parts of 'gio.override', three
-	methods of gio.LoadableIcon and gio.ThemedIcon constructor.
-
-	* gio/gio.override: Move over all icon-related overrides to
-	'gicon.override'.
-
-	* tests/Makefile.am:
-	* tests/test_gicon.py: New file: parts of 'test_gio.py' and
-	several new gio.Icon tests.
-
-	* tests/test_gio.py (TestThemedIcon): Move over to
-	'test_gicon.py'.
-
-2008-08-07  Jonathan Matthew  <jonathan@d14n.org>
-
-	Bug 546734 – Missing Py_INCREFs for some file async methods
-
-	* gio/gfile.override:
-	Increment refcounts on callbacks and callback data for
-	append_to_async, create_async, replace_async, query_info_async and
-	load_contents_async as for all other async methods.
-
-2008-08-06  Johan Dahlin  <johan@gnome.org>
-
-	* gio/gfile.override:
-	* gio/gio.defs:
-	Move the progress callback for move/copy so it's consistent with
-	the documentation and positional arguments. Update documentation as well
-
-2008-08-06  Johan Dahlin  <johan@gnome.org>
-
-	* glib/pyglib.c (pyglib_enable_threads):
-	* gobject/gobjectmodule.c (pyg_threads_init),
-	(pygobject_enable_threads):
-	Add a pygobject_enable_threads wrapper around pyglib_threads_enable
-	and return 0/-1 which existing gobject based applications expect.
-
-2008-08-06  Johan Dahlin  <johan@gnome.org>
-
-	* glib/pyglib.c (pyglib_init):
-	return in case of error instead of trying to access the internal
-	types.
-
-2008-08-06  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	* gio/gio.override: Add 'pygio_do_icon_richcompare' prototype to
-	header.
-	(_wrap_g_file_icon_tp_repr, _wrap_g_themed_icon_tp_repr): Fix
-	return value type in signature.
-
-2008-08-05  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	Bug 546135 – GIcon and implementations improvements
-
-	* gio/gio-types.defs (FileIcon): New 'define-object'.
-
-	* gio/gio.override (pygio_do_icon_richcompare)
-	(_wrap_g_icon_tp_richcompare, _wrap_g_icon_tp_hash)
-	(_wrap_g_file_icon_tp_richcompare, _wrap_g_file_icon_tp_hash)
-	(_wrap_g_file_icon_tp_repr, _wrap_g_themed_icon_tp_richcompare)
-	(_wrap_g_themed_icon_tp_hash, _wrap_g_themed_icon_tp_repr): New
-	functions.
-
-2008-08-03  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	Bug 546046 – Wrap GFile.replace_async and query_info_async
-
-	* tests/test_gio.py:
-	* gio/gfile.override:
-	* gio/gio.defs:
-	Wrap GFile.replace_async and query_info_async with docs and test.
-
-2008-08-03  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	* glib/pyglib.h:
-	* glib/pyglib.c (pyglib_enable_threads): Change return value from
-	'gboolean' to 'int' and changed semantics to Pythonic: restores
-	backwards compatibility.
-
-	* gobject/gobjectmodule.c (pyg_threads_init): Treat return value
-	accordingly (bug #544946).
-
-2008-08-02  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	Bug 546020 – Wrap GFile.create_async
-
-	* tests/test_gio.py:
-	* gio/gfile.override:
-	* gio/gio.defs:
-	Wrap GFile.create_async with docs and test
-
-2008-08-02  Johan Dahlin  <johan@gnome.org>
-
-	* codegen/docgen.py:
-	Remove SGML support, require python 2.4, modernize,
-	PEP-8ify. Make it run on gio.
-
-	* codegen/definitions.py:
-	Make property iterable
-
-	* gio/gio.defs:
-	Include the gio-types.defs file.
-
-2008-08-02  Johan Dahlin  <johan@gnome.org>
-
-	* glib/glibmodule.c (pyglib_set_prgname):
-	* glib/pygoptioncontext.c (pyg_option_context_init),
-	(pyg_option_context_set_help_enabled),
-	(pyg_option_context_set_ignore_unknown_options),
-	(pyg_option_context_set_main_group),
-	(pyg_option_context_add_group):
-	* glib/pygoptiongroup.c (arg_func), (pyg_option_group_add_entries),
-	(pyg_option_group_set_translation_domain),
-	(pyg_option_group_compare), (pyglib_option_group_register_types):
-	Fix compilation warnings, clean up style and indentation.
-
-2008-08-02  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	Bug 545959 – Wrap GFile.append_to_async
-
-	* tests/test_gio.py:
-	* gio/gfile.override:
-	* gio/gio.defs:
-	Wrap GFile.append_to_async with docs and test
-
-2008-08-02  Johan Dahlin  <johan@gnome.org>
-
-	* gio/gfileinfo.override:
-	* gio/gio.override:
-	* glib/glibmodule.c (pyglib_get_current_time):
-	* glib/pyglib.c (pyglib_float_from_timeval):
-	* glib/pyglib.h:
-	Add pyglib_float_from_timeval and use it
-
-2008-08-02  Johan Dahlin  <johan@gnome.org>
-
-	* docs/Makefile.am:
-	* docs/reference/pyglib-constants.xml:
-	* docs/reference/pyglib-functions.xml:
-	* docs/reference/pyglib-maincontext.xml:
-	* docs/reference/pyglib-mainloop.xml:
-	* docs/reference/pygobject-classes.xml:
-	* docs/reference/pygobject-constants.xml:
-	* docs/reference/pygobject-functions.xml:
-	* docs/reference/pygobject-maincontext.xml:
-	* docs/reference/pygobject-mainloop.xml:
-	Separate the glib and gobject bindings in the manual.
-
-2008-08-02  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	Bug 545920 – Wrap GFile.query_writable_namespaces
-
-	* tests/test_gio.py:
-	* gio/gfile.override:
-	* gio/gio.defs:
-	Wrap GFile.query_writable_namespaces with docs and test
-
-2008-08-02  Johan Dahlin  <johan@gnome.org>
-
-	* gio/gio.defs:
-	* gio/gfile.override:
-	* tests/test_gio.py:
-	Wrap gio.File.move
-
-2008-08-02  Johan Dahlin  <johan@gnome.org>
-
-	* gio/Makefile.am:
-	* gio/gfile.override:
-	* gio/gio.defs:
-	* gio/gio.override:
-	* gio/gvolume.override:
-	Wrap gio.Volume.mount and gio.Volume.eject
-
-2008-08-01  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	* gio/gio.defs:
-	Add docstring for gio.FileInfo.list_attributes
-
-2008-08-01  Johan Dahlin  <johan@gnome.org>
-
-	Bug 545861 – g_file_info_get_modification_time is missing
-	* gio/gfileinfo.override:
-	* gio/gio.defs:
-	* tests/test_gio.py:
-	Wrap, add test and documentation
-
-2008-08-01  Johan Dahlin  <johan@gnome.org>
-
-	Bug 545846 – g_vfs_get_supported_uri_schemes is missing
-
-	* gio/gio.defs:
-	* gio/gio.override:
-	* tests/test_gio.py:
-	Wrap, add test and documentation
-
-2008-08-01  Johan Dahlin  <johan@gnome.org>
-
-	* glib/glibmodule.c (pyglib_set_application_name):
-	Use %r instead of %s, this is not python!
-
-2008-07-31  Johan Dahlin  <johan@gnome.org>
-
-	* glib/glibmodule.c (pyglib_set_prgname)
-	(pyglib_set_application_name): Use METH_O instead of METH_VARARGS.
-	(_glib_functions): Add doc strings for idle_add, timeout_add,
-	timeout_add_seconds, io_add_watch, child_watch_add, source_remove,
-	main_depth and main_context_default.
-
-2008-07-29  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	* tests/test_gio.py:
-	* gio/gfileattribute.override:
-	* gio/gio.override:
-	* gio/gio.defs:
-	* gio/gfile.override:
-	* gio/Makefile.am: Wrap new object gio.FileAttributeInfo,
-	g_file_set_attribute and g_file_query_settable_attributes methods.
-
-2008-07-29  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	* gio/unix-types.defs: Wrap gio.unix.DesktopAppInfo
-
-	* gio/gappinfo.override:
-	* gio/gio.override:
-	* gio/gio.defs:
-	* gio/gapplaunchcontext.override:
-	* gio/Makefile.am: Wrap g_app_info_launch_uris,
-	g_app_info_launch, g_app_launch_context_get_display and
-	g_app_launch_context_get_startup_notify_id
-
-	* gio/pygio-utils.c:
-	* gio/pygio-utils.h: Add a couple of useful function to reduce the
-	code in wrapped methods.
-
-2008-07-29  Johan Dahlin  <johan@gnome.org>
-
-	* examples/gio/downloader.py:
-	* gio/giomodule.c (init_gio):
-	Add gio.FILE_ATTRIBUTE_* constants and update the examples to use them.
-
-2008-07-29  Johan Dahlin  <johan@gnome.org>
-
-	* examples/gio/downloader.py:
-	Add a new example
-
-	* gio/ginputstream.override:
-	Use a string internally instead of a PyStringObject when
-	in read_async. Create a new python string in finish and
-	honor the number of bytes read.
-
-2008-07-28  Johan Dahlin  <johan@gnome.org>
-
-	* glib/pyglib-python-compat.h:
-	* gobject/pygobject-private.h:
-	Move all compatibility into the same place, fixes build
-	on python 2.4.
-
-2008-07-27  Johan Dahlin  <johan@gnome.org>
-
-	* glib/option.py:
-	Remove tabs. Use sys.exc_info()[1] to fetch the exception value
-
-	* gobject/__init__.py:
-	* gobject/propertyhelper.py:
-	Import gobject._gobject instead of just gobject.
-
-	* gobject/Makefile.am:
-	* gobject/constants.py.in:
-	* gobject/generate-constants.c (main):
-	Don't add long suffix if python >= 3.0
-
-2008-07-27  Johan Dahlin  <johan@gnome.org>
-
-	* glib/pyglib-python-compat.h:
-	* gobject/gobjectmodule.c (pyg_object_new),
-	(pyg__install_metaclass):
-	* gobject/pygboxed.c (pyg_boxed_dealloc), (pyg_boxed_init),
-	(pyg_register_boxed):
-	* gobject/pygenum.c (pyg_enum_reduce):
-	* gobject/pyginterface.c (pyg_interface_init),
-	(pyg_register_interface):
-	* gobject/pygobject.c (pygobject_get_inst_data),
-	(pygobject_register_class), (pygobject_new_with_interfaces),
-	(pygobject_dealloc), (pygobject_repr), (pygobject_emit),
-	(pygobject_chain_from_overridden), (pygobject_weak_ref_notify):
-	* gobject/pygparamspec.c (pygobject_paramspec_register_types):
-	* gobject/pygpointer.c (pyg_pointer_dealloc), (pyg_pointer_init),
-	(pyg_register_pointer):
-	* gobject/pygtype.c (pyg_type_from_object),
-	(pyg_value_array_from_pyobject), (pyg_value_from_pyobject),
-	(pyg_object_descr_doc_get):
-	Use the Py_TYPE macro everywhere.
-
-2008-07-27  Johan Dahlin  <johan@gnome.org>
-
-	* glib/pyglib-python-compat.h:
-	Add a Py_TYPE macro for accessing ob_type.
-	* glib/glibmodule.c (pyglib_register_constants):
-	* gobject/gobjectmodule.c (pygobject__g_instance_init),
-	(pyg_integer_richcompare):
-	* gobject/pygenum.c (pyg_enum_repr), (pyg_enum_from_gtype),
-	(pyg_enum_add), (pyg_enum_get_value_name),
-	(pyg_enum_get_value_nick):
-	* gobject/pygflags.c (pyg_flags_repr), (pyg_flags_from_gtype),
-	(pyg_flags_add), (pyg_flags_and), (pyg_flags_or), (pyg_flags_xor),
-	(pyg_flags_get_first_value_name), (pyg_flags_get_first_value_nick),
-	(pyg_flags_get_value_names), (pyg_flags_get_value_nicks):
-	Use Py_TYPE and PyLong macros to access struct fields
-
-2008-07-27  Johan Dahlin  <johan@gnome.org>
-
-	* gobject/gobjectmodule.c (pyg_param_spec_from_object),
-	(add_properties), (pyg_signal_new), (pyg_signal_list_ids),
-	(pyg_signal_lookup), (pyg_signal_query):
-	* gobject/pygenum.c (pyg_enum_richcompare), (pyg_enum_new),
-	(pyg_enum_from_gtype), (pyg_enum_add), (pyg_enum_reduce),
-	(pygobject_enum_register_types):
-	* gobject/pygflags.c (pyg_flags_richcompare), (pyg_flags_new),
-	(pyg_flags_from_gtype), (pyg_flags_add), (pyg_flags_and),
-	(pyg_flags_or), (pyg_flags_xor), (pygobject_flags_register_types):
-	* gobject/pygobject-private.h:
-	* gobject/pygobject.c (pygobject_disconnect_by_func),
-	(pygobject_handler_block_by_func),
-	(pygobject_handler_unblock_by_func), (pygobject_get_refcount):
-	* gobject/pygparamspec.c (pyg_param_spec_getattr):
-	* gobject/pygtype.c (_wrap_g_type_wrapper__get_depth),
-	(pyg_type_from_object), (pyg_enum_get_value),
-	(pyg_flags_get_value), (pyg_value_from_pyobject),
-	(pyg_value_as_pyobject):
-	Use _PyLong macros.
-
-2008-07-27  Johan Dahlin  <johan@gnome.org>
-
-	* gobject/pygboxed.c (pygobject_boxed_register_types):
-	* gobject/pygenum.c (pygobject_enum_register_types):
-	* gobject/pygflags.c (pygobject_flags_register_types):
-	* gobject/pygobject.c (pygobject_object_register_types):
-	* gobject/pygparamspec.c (pygobject_paramspec_register_types):
-	* gobject/pygpointer.c (pygobject_pointer_register_types):
-	* gobject/pygtype.c (pygobject_type_register_types):
-	Use PYGLIB_DEFINE_TYPE macro and move struct field initialization
-	to the registration methods.
-
-2008-07-27  Johan Dahlin  <johan@gnome.org>
-
-	* glib/pyglib-python-compat.h:
-	Add _PyUnicode_Type macro
-
-	* gobject/gobjectmodule.c (pyg_type_name), (pyg_type_from_name),
-	(_pyg_signal_accumulator), (add_signals), (add_properties),
-	(get_type_name_for_class), (pyg_signal_list_names),
-	(pyg_signal_name), (pyg_signal_query), (pyg_object_new),
-	(pyg_add_emission_hook), (pyg_remove_emission_hook):
-	* gobject/pygboxed.c (pyg_boxed_repr):
-	* gobject/pygenum.c (pyg_enum_repr), (pyg_enum_add),
-	(pyg_enum_get_value_name), (pyg_enum_get_value_nick):
-	* gobject/pygflags.c (pyg_flags_repr), (pyg_flags_add),
-	(pyg_flags_get_first_value_name), (pyg_flags_get_first_value_nick),
-	(pyg_flags_get_value_names), (pyg_flags_get_value_nicks):
-	* gobject/pygobject.c (build_parameter_list), (PyGProps_getattro),
-	(PyGProps_setattro), (pygobject_register_class), (pygobject_repr),
-	(pygobject_init), (pygobject_get_properties),
-	(pygobject_set_properties), (pygobject_connect),
-	(pygobject_connect_after), (pygobject_connect_object),
-	(pygobject_connect_object_after), (pygobject_emit),
-	(pygobject_stop_emission), (pygobject_disconnect_by_func),
-	(pygobject_handler_block_by_func),
-	(pygobject_handler_unblock_by_func),
-	(pygobject_object_register_types):
-	* gobject/pygparamspec.c (pyg_param_spec_repr),
-	(pyg_param_spec_getattr):
-	* gobject/pygpointer.c (pyg_pointer_repr):
-	* gobject/pygtype.c (pyg_type_wrapper_repr),
-	(_wrap_g_type_wrapper__get_name), (pyg_type_from_object),
-	(pyg_enum_get_value), (pyg_flags_get_value),
-	(pyg_value_from_pyobject), (pyg_value_as_pyobject),
-	(object_doc_descr_get), (_pyg_strv_from_gvalue),
-	(_pyg_strv_to_gvalue):
-
-	Use _PyUnicode_* macros in the gobject module
-
-2008-07-27  Johan Dahlin  <johan@gnome.org>
-
-	* gobject/Makefile.am:
-	* gobject/gobjectmodule.c (PYGLIB_MODULE_START):
-	* gobject/pygobject-private.h:
-	Use glib macros to define the module, update export regexp.
-
-2008-07-27  Johan Dahlin  <johan@gnome.org>
-
-	* gobject/Makefile.am:
-	* gobject/gobjectmodule.c (init_gobject):
-	* gobject/pygboxed.c (pygobject_boxed_register_types):
-	* gobject/pygboxed.h:
-	* gobject/pygenum.c (pygobject_enum_register_types):
-	* gobject/pygenum.h:
-	* gobject/pygflags.c (pygobject_flags_register_types):
-	* gobject/pygflags.h:
-	* gobject/pygpointer.c (pygobject_pointer_register_types):
-	* gobject/pygpointer.h:
-	Split out quark and type registration to the respective
-	implementation source files, add headers.
-
-2008-07-27  Johan Dahlin  <johan@gnome.org>
-
-	* gobject/Makefile.am:
-	* gobject/gobjectmodule.c (pygobject_register_api),
-	(pygobject_register_constants), (pygobject_register_features),
-	(pygobject_register_version_tuples), (pygobject_register_warnings),
-	(init_gobject):
-	* gobject/pygobject-private.h:
-	* gobject/pygobject.c (pyobject_copy), (pyobject_free),
-	(pygobject_object_register_types):
-	* gobject/pygtype.c (_pyg_strv_from_gvalue), (_pyg_strv_to_gvalue),
-	(pygobject_type_register_types):
-	* gobject/pygtype.h:
-	Move off a bit more to separate functions, cleaning up the init_glib
-	a bit more.
-
-2008-07-27  Johan Dahlin  <johan@gnome.org>
-
-	* gobject/Makefile.am:
-	* gobject/gobjectmodule.c (init_gobject):
-	* gobject/pygobject-private.h:
-	* gobject/pygobject.c:
-	* gobject/pygparamspec.c (pygobject_paramspec_register_types):
-	* gobject/pygparamspec.h:
-	* gobject/pygtype.c:
-	Move paramspec registration to a separate file, add a header
-	for the internal API.
-
-2008-07-27  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	* gobject/pygtype.c (pyg_enum_get_value): Issue warning if 'obj'
-	is a PyGEnum of wrong type, i.e. not matching 'enum_type' (bug
-	#503771).
-
-2008-07-26  Johan Dahlin  <johan@gnome.org>
-
-	reviewed by: <delete if not using a buddy>
-
-	* glib/pyglib-python-compat.h:
-	* glib/pyglib.h:
-	Make a few macros public
-
-	* gobject/Makefile.am:
-	* gobject/gobjectmodule.c (init_gobject):
-	* gobject/pyginterface.c (pyg_interface_init),
-	(pyg_interface_free), (pyg_register_interface),
-	(pyg_register_interface_info), (pyg_lookup_interface_info),
-	(pygobject_interface_register_types):
-	* gobject/pyginterface.h:
-	* gobject/pygobject-private.h:
-	* gobject/pygobject.c:
-	Move GInterface wrapper into its own file
-
-2008-07-26  Johan Dahlin  <johan@gnome.org>
-
-	* glib/Makefile.am:
-	Also export PyInit_glib
-	* glib/__init__.py:
-	import glib._glib instead of just _glib
-	* glib/pyglib-python-compat.h:
-	* glib/pygoptioncontext.c (pyg_option_context_parse):
-	* glib/pygsource.c (source_repr), (pyg_source_attach),
-	(pyg_source_get_priority), (pyg_source_set_priority),
-	(pyg_source_get_id), (pyg_source_prepare), (pyg_poll_fd_repr):
-	* glib/pygspawn.c (pyg_pid_close), (pyg_pid_free), (pyg_pid_new),
-	(pyglib_spawn_async), (pyglib_spawn_register_types):
-	Go over the rest and replace missing symbols on python3.
-	the glib module successfully compiles and runs now.
-
-2008-07-26  Johan Dahlin  <johan@gnome.org>
-
-	* glib/pygiochannel.c (py_io_channel_shutdown),
-	(py_io_channel_set_buffer_size), (py_io_channel_get_buffer_size),
-	(py_io_channel_set_buffered), (py_io_channel_get_buffered),
-	(py_io_channel_set_encoding), (py_io_channel_get_encoding),
-	(py_io_channel_read_chars), (py_io_channel_write_chars),
-	(py_io_channel_write_lines), (py_io_channel_flush),
-	(py_io_channel_set_flags), (py_io_channel_get_flags),
-	(py_io_channel_get_buffer_condition),
-	(py_io_channel_set_close_on_unref), (py_io_channel_add_watch),
-	(py_io_channel_win32_poll), (py_io_channel_win32_make_pollfd),
-	(py_io_channel_read_line), (py_io_channel_read_lines),
-	(py_io_channel_seek), (py_io_channel_init):
-	* glib/pyglib.c (pyglib_gerror_exception_check):
-	* glib/pygoptioncontext.c (pyg_option_context_init):
-	* glib/pygoptiongroup.c (check_if_owned):
-	* glib/pygsource.c (pyg_idle_init), (pyg_timeout_init),
-	(pyg_poll_fd_init):
-	gobject -> glib
-
-2008-07-26  Johan Dahlin  <johan@gnome.org>
-
-	* glib/pygmaincontext.c (pyglib_maincontext_register_types):
-	* glib/pygmainloop.c (pyg_main_loop_init),
-	(pyglib_mainloop_register_types):
-	* glib/pygoptioncontext.c (pyg_option_context_set_main_group),
-	(pyglib_option_context_register_types):
-	* glib/pygoptiongroup.c (pyglib_option_group_register_types):
-	* glib/pygspawn.c (pyglib_spawn_register_types):
-	Convert the pid/mainloop/maincontext/optiongroup/optioncontext.
-
-2008-07-26  Johan Dahlin  <johan@gnome.org>
-
-	* glib/pygsource.c (pyglib_source_register_types):
-	Convert the source objects to use macros, saves ~150 lines of code!
-
-2008-07-26  Johan Dahlin  <johan@gnome.org>
-
-	* glib/glibmodule.c (get_handler_priority), (pyglib_idle_add),
-	(pyglib_timeout_add), (pyglib_timeout_add_seconds),
-	(pyglib_io_add_watch), (pyglib_child_watch_add),
-	(pyglib_markup_escape_text), (pyglib_main_depth),
-	(pyglib_filename_from_utf8), (pyglib_get_application_name),
-	(pyglib_get_prgname), (PYGLIB_MODULE_START):
-	* glib/pygiochannel.c (py_io_channel_next),
-	(py_io_channel_shutdown), (py_io_channel_get_buffer_size),
-	(py_io_channel_get_buffered), (py_io_channel_get_encoding),
-	(py_io_channel_read_chars), (py_io_channel_write_chars),
-	(py_io_channel_write_lines), (py_io_channel_flush),
-	(py_io_channel_set_flags), (py_io_channel_get_flags),
-	(py_io_channel_get_buffer_condition), (py_io_channel_win32_poll),
-	(py_io_channel_read_line), (py_io_channel_read_lines),
-	(py_io_channel_seek), (pyglib_iochannel_register_types):
-	* glib/pyglib-private.h:
-	* glib/pyglib-python-compat.h:
-	* glib/pyglib.c (pyglib_init), (pyglib_error_check),
-	(pyglib_gerror_exception_check),
-	(pyglib_register_exception_for_domain):
-	Add macros for supporting additional python versions.
-	Start using them for the glib module. Tested on python 2.5 and 3.0.
-
-2008-07-26  Johan Dahlin  <johan@gnome.org>
-
-	* configure.ac:
-	* m4/python.m4:
-	Add macros which are compatible with python > 2.6.
-
-2008-07-26  Johan Dahlin  <johan@gnome.org>
-
-	* configure.ac:
-	Post release version bump
-
-=== 2.15.2 ===
-2008-07-26  Johan Dahlin  <johan@gnome.org>
-
-	* NEWS: Update
-
-2008-07-26  Johan Dahlin  <johan@gnome.org>
-
-	* gobject/Makefile.am (_gobject_la_SOURCES): Build fix, remove
-	extra \
-
-	* examples/gio/directory-async.py:
-	* gio/Makefile.am:
-	* gio/giomodule.c (init_gio):
-	* glib/pyglib.c (pyglib_error_check),
-	(pyglib_register_exception_for_domain):
-	* glib/pyglib.h:
-	* tests/test_gio.py:
-	Add a new API for registering exceptions for a GError domain.
-	Register a new exception for G_IO_ERROR, update tests
-	and examples to use the new exception.
-
-2008-07-26  Johan Dahlin  <johan@gnome.org>
-
-	* glib/pygoptioncontext.c (pyg_option_context_set_main_group),
-	(pyg_option_context_add_group):
-	Send in a PyObject instead of a PyGOptionGroup object.
-
-2008-07-26  Johan Dahlin  <johan@gnome.org>
-
-	* glib/Makefile.am:
-	* glib/glibmodule.c (pyglib_register_constants), (init_glib):
-	* glib/option.py:
-	* glib/pyglib.c (pyglib_init),
-	(pyglib_option_group_transfer_group), (pyglib_option_group_new),
-	(pyglib_option_context_new):
-	* glib/pyglib.h:
-	* glib/pygoptioncontext.c (pyg_option_context_parse),
-	(pyg_option_context_set_main_group),
-	(pyg_option_context_add_group),
-	(pyglib_option_context_register_types):
-	* glib/pygoptioncontext.h:
-	* glib/pygoptiongroup.c (arg_func),
-	(pyglib_option_group_register_types):
-	* glib/pygoptiongroup.h:
-	* gobject/Makefile.am:
-	* gobject/__init__.py:
-	* gobject/gobjectmodule.c (init_gobject):
-	* gobject/option.py:
-	* gobject/pygobject-private.h:
-	* gobject/pygoptioncontext.c:
-	* gobject/pygoptiongroup.c:
-	Move option over from gobject to glib.
-
-2008-07-26  Johan Dahlin  <johan@gnome.org>
-
-	* tests/common.py:
-	* tests/test_conversion.py:
-	* tests/test_enum.py:
-	* tests/test_interface.py:
-	* tests/test_option.py:
-	* tests/test_source.py:
-	* tests/test_subprocess.py:
-	* tests/test_subtype.py:
-	* tests/test_thread.py:
-	* tests/test_unknown.py:
-	Run pyflakes on the testsuite, remove unused imports
-	and reorganize others.
-
-2008-07-26  Johan Dahlin  <johan@gnome.org>
-
-	* glib/glibmodule.c (pyglib_register_constants), (init_glib):
-	* gobject/__init__.py:
-	* gobject/gobjectmodule.c (init_gobject):
-	Move over glib constants to gobject
-	* tests/test_gio.py:
-	* tests/test_mainloop.py:
-	* tests/test_source.py:
-	* tests/test_subprocess.py:
-	* tests/test_thread.py:
-	Update tests to refer to glib when appropriate
-
-2008-07-26  Johan Dahlin  <johan@gnome.org>
-
-	* README:
-	* configure.ac:
-	Bump required glib version to 2.10
-
-2008-07-26  Johan Dahlin  <johan@gnome.org>
-
-	* glib/glibmodule.c (child_watch_dnotify),
-	(pyglib_child_watch_add):
-	* glib/pygiochannel.c (pyg_iowatch_data_free),
-	(py_io_channel_add_watch):
-	* glib/pygspawn.c (_pyg_spawn_async_callback),
-	(pyglib_spawn_async):
-	Use g_slice_new instead of g_new
-
-2008-07-25  Johan Dahlin  <johan@gnome.org>
-
-	* gobject/Makefile.am:
-	* tests/Makefile.am:
-	Make distcheck pass
-
-2008-07-25  Johan Dahlin  <johan@gnome.org>
-
-	* gobject/gobjectmodule.c (init_gobject):
-	* gobject/pygobject-private.h:
-	Remove private structures which moved to pyglib.
-
-2008-07-24  Johan Dahlin  <johan@gnome.org>
-
-	Bug 544600 – pygobject building failed since 839 revision,
-	error : "Py_ssize_t" undeclared
-
-	* glib/pyglib-private.h: Add backward compatibility macros for
-	python 2.4.
-
-	* gio/gfile.override:
-	* gio/gfileenumerator.override:
-	* gio/ginputstream.override:
-	* gio/gio.defs:
-	* gio/gio.override:
-	* gio/goutputstream.override:
-	* tests/test_gio.py:
-	Wrap gio.File.copy, add tests and documentation.
-	Rename PyGAsyncRequestNotify to PyGIONotify and reuse it.
-
-2008-07-23  Johan Dahlin  <johan@gnome.org>
-
-	* glib/pyglib.c (_pyglib_destroy_notify):
-	Rename the function too, not just the prototype!
-
-2008-07-21  Johan Dahlin  <johan@gnome.org>
-
-	* glib/glibmodule.c (pyglib_idle_add), (pyglib_timeout_add),
-	(pyglib_timeout_add_seconds), (pyglib_io_add_watch):
-	* glib/pyglib-private.h:
-	* glib/pyglib.c (pyglib_destroy_notify), (_pyglib_handler_marshal):
-	* glib/pyglib.h:
-	* glib/pygsource.c (pyg_source_set_callback):
-	Make pyglib_destroy_notify and pyglib_handler_marshal private.
-	Add a few public prototypes.
-
-2008-07-21  Johan Dahlin  <johan@gnome.org>
-
-	* glib/glibmodule.c (pyglib_idle_add), (pyglib_timeout_add),
-	(pyglib_timeout_add_seconds), (pyglib_io_add_watch),
-	(pyglib_source_remove), (pyglib_child_watch_add),
-	(pyglib_markup_escape_text), (pyglib_get_current_time),
-	(pyglib_main_depth), (pyglib_filename_display_name),
-	(pyglib_filename_display_basename), (pyglib_filename_from_utf8),
-	(pyglib_get_application_name), (pyglib_set_application_name),
-	(pyglib_get_prgname), (pyglib_set_prgname), (pyglib_register_api),
-	(pyglib_register_error):
-	Mark as static, rename from pyg_* -> pyglib_*. Fill in api struct,
-	rename struct and remove function suffix.
-
-2008-07-21  Johan Dahlin  <johan@gnome.org>
-
-	* glib/Makefile.am:
-	* glib/glibmodule.c (pyg_idle_add), (pyg_timeout_add),
-	(pyg_timeout_add_seconds), (pyg_io_add_watch),
-	(pyglib_register_api), (pyglib_register_error),
-	(pyglib_register_version_tuples), (init_glib):
-	* glib/pygiochannel.c (py_io_channel_next),
-	(py_io_channel_shutdown), (py_io_channel_set_encoding),
-	(py_io_channel_read_chars), (py_io_channel_write_chars),
-	(py_io_channel_write_lines), (py_io_channel_flush),
-	(py_io_channel_set_flags), (py_io_channel_read_line),
-	(py_io_channel_read_lines), (py_io_channel_seek),
-	(py_io_channel_init), (pyglib_iochannel_register_types):
-	* glib/pygiochannel.h:
-	* glib/pyglib-private.h:
-	* glib/pyglib.c (pyglib_threads_enabled),
-	(pyglib_gil_state_ensure), (pyglib_gil_state_release),
-	(pyglib_enable_threads), (pyglib_block_threads),
-	(pyglib_unblock_threads), (pyglib_set_thread_block_funcs),
-	(pyglib_handler_marshal), (pyglib_destroy_notify):
-	* glib/pyglib.h:
-	* glib/pygsource.c (pyg_source_set_callback),
-	(pyglib_source_register_types):
-	* glib/pygsource.h:
-	* glib/pygspawn.c (pyglib_spawn_register_types):
-	* glib/pygspawn.h:
-	* gobject/Makefile.am:
-	* gobject/__init__.py:
-	* gobject/gobjectmodule.c (pyg_set_thread_block_funcs),
-	(init_gobject):
-	* gobject/pygiochannel.c:
-	* gobject/pygobject-private.h:
-	* gobject/pygsource.c:
-	Move over Source, IOChannel, Idle, Timeout and PollFD to glib from
-	gobject.
-	Clean up and add a bit of new api for glib.
-
-2008-07-21  Johan Dahlin  <johan@gnome.org>
-
-	* configure.ac:
-	Use yes/no instead of true/false. Avoid bashism.
-	Fix another logic bug, and let's hope I didn't break anything
-
-2008-07-20  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	* configure.ac (pygobject_CODEGEN_DEFINES): Fix libffi check
-	logic.
-
-2008-07-20  Johan Dahlin  <johan@gnome.org>
-
-	* glib/Makefile.am:
-	* glib/glibmodule.c (pyglib_main_context_default), (init_glib):
-	* glib/pyglib.c (pyglib_init), (pyglib_threads_enabled),
-	(pyglib_main_context_new):
-	* glib/pyglib.h:
-	* glib/pygmaincontext.c (_wrap_g_main_context_iteration),
-	(pyglib_maincontext_register_types):
-	* glib/pygmaincontext.h:
-	* glib/pygmainloop.c (pyg_signal_watch_prepare),
-	(pyg_signal_watch_check), (pyg_main_loop_new),
-	(_wrap_g_main_loop_get_context), (_wrap_g_main_loop_run),
-	(pyglib_mainloop_register_types):
-	* glib/pygmainloop.h:
-	* gobject/Makefile.am:
-	* gobject/__init__.py:
-	* gobject/gobjectmodule.c (pyg_destroy_notify), (pyobject_free),
-	(pyg_object_set_property), (pyg_object_get_property),
-	(_pyg_signal_accumulator), (pygobject__g_instance_init),
-	(pyg_handler_marshal), (pygobject_gil_state_ensure),
-	(pygobject_gil_state_release), (marshal_emission_hook),
-	(_log_func), (init_gobject):
-	* gobject/pygboxed.c (pyg_boxed_dealloc), (pyg_boxed_new):
-	* gobject/pygenum.c (pyg_enum_add):
-	* gobject/pygflags.c (pyg_flags_add):
-	* gobject/pygiochannel.c (pyg_iowatch_marshal):
-	* gobject/pygmaincontext.c:
-	* gobject/pygmainloop.c:
-	* gobject/pygobject-private.h:
-	* gobject/pygobject.c (pygobject_data_free), (pyg_toggle_notify),
-	(pygobject_new_with_interfaces), (pygobject_weak_ref_notify):
-	* gobject/pygobject.h:
-	* gobject/pygoptiongroup.c (destroy_g_group), (arg_func):
-	* gobject/pygpointer.c (pyg_pointer_new):
-	* gobject/pygsource.c (pyg_source_get_context),
-	(pyg_source_prepare), (pyg_source_check), (pyg_source_dispatch),
-	(pyg_source_finalize):
-	* gobject/pygtype.c (pyg_closure_invalidate),
-	(pyg_closure_marshal), (pyg_signal_class_closure_marshal):
-	* tests/common.py:
-
-	Move maincontext and mainloop over to glib.
-	Update the threadstate api to use the variant in glib.
-
-2008-07-20  Johan Dahlin  <johan@gnome.org>
-
-	* glib/Makefile.am:
-	* gobject/Makefile.am:
-	* gobject/__init__.py:
-	* gobject/gobjectmodule.c (pyg_threads_init), (pyg_error_check),
-	(pyg_gerror_exception_check), (init_gobject):
-	* gobject/option.py:
-	Install the glib module, the helper library and the headers.
-	Use it from gobject and remove the old glib specific code from there.
-
-2008-07-20  Johan Dahlin  <johan@gnome.org>
-
-	* configure.ac:
-	* gobject/Makefile.am:
-	Use pkg-config to check for libffi again.
-
-2008-07-20  Johan Dahlin  <johan@gnome.org>
-
-	* glib/Makefile.am:
-	* glib/glibmodule.c (pyg_main_context_default):
-	* glib/pyglib.c (pyglib_gerror_exception_check):
-	* glib/pyglib.h:
-	Rename helper library to libpyglib-2.0.
-	Move over pyg_gerror_exception_check as well.
-
-2008-07-20  Johan Dahlin  <johan@gnome.org>
-
-	* Makefile.am:
-	* configure.ac:
-	* glib/Makefile.am:
-	* glib/__init__.py:
-	* glib/glibmodule.c (pyg_destroy_notify), (get_handler_priority),
-	(pyg_handler_marshal), (pyg_idle_add), (pyg_timeout_add),
-	(pyg_timeout_add_seconds), (iowatch_marshal), (pyg_io_add_watch),
-	(pyg_source_remove), (pyg_main_context_default),
-	(child_watch_func), (child_watch_dnotify), (pyg_child_watch_add),
-	(pyg_markup_escape_text), (pyg_get_current_time), (pyg_main_depth),
-	(pyg_filename_display_name), (pyg_filename_display_basename),
-	(pyg_filename_from_utf8), (pyg_get_application_name),
-	(pyg_set_application_name), (pyg_get_prgname), (pyg_set_prgname),
-	(pyg_register_api), (pyg_register_error),
-	(pyg_register_version_tuples), (init_glib):
-	* glib/pyglib-private.h:
-	* glib/pyglib.c (pyglib_init), (pyglib_init_internal),
-	(pyglib_gil_state_ensure), (pyglib_gil_state_release),
-	(pyglib_enable_threads), (pyglib_gil_state_ensure_py23),
-	(pyglib_gil_state_release_py23), (pyglib_error_check):
-	* glib/pyglib.h:
-	* glib/pygspawn.c (pyg_pid_close), (pyg_pid_free),
-	(pyg_pid_tp_init), (pyg_pid_new), (_pyg_spawn_async_callback),
-	(pyglib_spawn_async), (pyg_spawn_register_types):
-	* glib/pygspawn.h:
-	Add glib bindings, currently not installed or used.
-	Add some internal API and move over a couple of functions
-	from the gobject module. Still very much a work in progress.
-
-2008-07-19  Johan Dahlin  <johan@gnome.org>
-
-	* gio/gio.override:
-	Ignore a bunch of functions which are not relevant.
-
-2008-07-19  Johan Dahlin  <johan@gnome.org>
-
-	* gio/gfile.override:
-	* gio/gio.defs:
-	* gio/gio.override:
-	* tests/test_gio.py:
-	Bind gio.Mount.unmount, gio.File.mount_mountable,
-	gio.File.unmount_mountable and gio.File.mount_enclosing_volume.
-	Add documents and tests.
-
-2008-07-19  Johan Dahlin  <johan@gnome.org>
-
-	* gio/gio.override: Set module name back to
-	gio, as setting it to gio._gio breaks pydoc.
-
-	* gio/gio.defs:
-	Use property based constructors when possible.
-
-2008-07-19  Johan Dahlin  <johan@gnome.org>
-
-	* examples/gio/directory-async.py:
-	* gio/gfileenumerator.override:
-	* gio/gio.defs:
-	* tests/test_gio.py:
-	Wrap gio.FileEnumerator.next_files_async/next_files_done.
-	Update the example to use them instead of the synchronous versions,
-	add documentation and tests.
-
-2008-07-19  Johan Dahlin  <johan@gnome.org>
-
-	* examples/gio/directory-async.py:
-	Only fetch name, saves a couple of syscalls.
-	* gio/gio.override:
-	Set name to gio._gio so pychecker/pydoc works.
-
-2008-07-18  Johan Dahlin  <johan@gnome.org>
-
-	* examples/gio/directory-async.py:
-	* gio/gfile.override:
-	* gio/gfileenumerator.override:
-	* gio/gio.defs:
-	* tests/test_gio.py:
-	Wrap gio.File.enumerate_children_async, add tests, docstring
-	and an example.
-	Also document gio.File.enumerate while we're at it.
-
-2008-07-18  Johan Dahlin  <johan@gnome.org>
-
-	* gio/gfile.override:
-	Use %zd instead of %d since it's a Py_ssize_t and not an int.
-
-2008-07-18  Johan Dahlin  <johan@gnome.org>
-
-	* gio/pygio-utils.h:
-	define NO_IMPORT_PYGOBJECT before including pygobject.h
-
-2008-07-18  Johan Dahlin  <johan@gnome.org>
-
-	* gio/giomodule.c (init_gio):
-	Require pygobject 2.15.2
-
-2008-07-17  Johan Dahlin  <johan@gnome.org>
-
-	* gio/giomodule.c (init_gio):
-	Add a pygio_version module attribute
-	(DL_EXPORT): The module is called gio._gio, not just _gio.
-
-2008-07-17  Johan Dahlin  <johan@gnome.org>
-
-	* gio/gio-types.defs:
-	Rename gio.IOErrorEnum to gio.ErrorEnum
-
-2008-07-17  Johan Dahlin  <johan@gnome.org>
-
-	* gio/giomodule.c (init_gio):
-	Add gio.ERROR which maps to the G_IO_ERROR quark.
-
-2008-07-17  Johan Dahlin  <johan@gnome.org>
-
-	* gio/giomodule.c (init_gio):
-	Use the prefix G_IO_ for stripping constants instead of just G_
-	* gobject/gobjectmodule.c (pyg_constant_strip_prefix):
-	Check so the fist part of name and strip_prefix are the same,
-	if they don't, just strip of the part of strip_prefix which
-	matches.
-
-	This removes the initial IO_* prefix for some constants in gio.
-	Eg, gio.IO_ERROR_* -> gio.ERROR_*
-
-2008-07-16  Johan Dahlin  <johan@gnome.org>
-
-	* configure.ac: Post release version bump
-
-=== 2.15.1 ===
-2008-07-16  Johan Dahlin  <johan@gnome.org>
-
-	* NEWS: Update
-
-2008-07-15  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	* codegen/pygobject-codegen-2.0.in: Rename from
-	'pygtk-codegen-2.0.in'.
-
-	* configure.ac:
-	* codegen/Makefile.am: Update accordingly.
-
-2008-07-15  Johan Dahlin  <johan@gnome.org>
-
-	* configure.ac: Post release version bump
-
-=== 2.15.0 ===
-2008-07-15  Johan Dahlin  <johan@gnome.org>
-
-	New version
-
-	* NEWS: Update
-
-	* tests/Makefile.am:
-	Make sure we can distcheck the gio module properly
-
-2008-07-15  Johan Dahlin  <johan@gnome.org>
-
-	Bug 450659 – h2def.py - export 'typedef struct' object definitions not
-	working
-
-	* codegen/h2def.py:
-	Patch by Lauro Moura
-
-2008-07-14  Johan Dahlin  <johan@gnome.org>
-
-	Bug 471559 – add AM_PROG_CC_C_O to configure.ac for recent automake
-
-	* configure.ac:
-	Patch by Tim Mooney
-
-2008-07-14  Johan Dahlin  <johan@gnome.org>
-
-	Bug 448173 – use python-config to get python includes
-
-	* configure.ac:
-	Really close the by, patch by Matthias Klose
-
-2008-07-14  Johan Dahlin  <johan@gnome.org>
-
-	Bug 378704 – OptionParser.parse_args() returns unexpected results
-
-	* gobject/option.py:
-	Patch by Johannes Hölzl
-
-2008-07-14  Johan Dahlin  <johan@gnome.org>
-
-	Bug 491773 – autoconf failure: .m4 files cannot be found
-
-	* Makefile.am:
-	Patch by macks@netspace.org
-
-2008-07-14  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	* gio/gfile.override: wrap File.load_contents_async and
-	File.load_contents_finish
-
-	* gio/gio.defs: Add docstring for the above methods.
-
-	* tests/test_gio.py: Add a test for the above methods.
-
-2008-07-14  Johan Dahlin  <johan@gnome.org>
-
-	Bug 487523 – Add xslfiles variable to .pc.in files
-
-	* pygobject-2.0-uninstalled.pc.in:
-	Add xslfiles variable, patch by Damien Carbery
-
-2008-07-14  Johan Dahlin  <johan@gnome.org>
-
-	* gio/gio.defs:
-	Remove g_file_input_stream_seek and g_file_output_stream_seek,
-	they already implement the seekable interface.
-
-2008-07-14  Johan Dahlin  <johan@gnome.org>
-
-	Bug 504337 - crash bug in gobject.Timeout and gobject.Idle
-
-	* gobject/pygsource.c:
-	* tests/test_source.py:
-	Fix crash in Timeout and Idle, patch by Bryan Silverthorn.
-
-2008-07-14  Johan Dahlin  <johan@gnome.org>
-
-	* codegen/argtypes.py:
-	Map GSeekType to an int
-
-	* gio/gfileinfo.override:
-	* gio/ginputstream.override:
-	* gio/goutputstream.override:
-	Add comments for missing API
-
-2008-07-14  Johan Dahlin  <johan@gnome.org>
-
-	* gio/Makefile.am:
-	* gio/gfile.override:
-	* gio/ginputstream.override:
-	* gio/gio.override:
-	* gio/goutputstream.override:
-	* gio/pygio-utils.c (pygio_check_cancellable):
-	* gio/pygio-utils.h:
-	Refactor cancellable check to a utility function, avoids
-	plenty of code duplication.
-
-2008-07-14  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	* codegen/definitions.py (ReturnType): New class.
-	(MethodDefBase.__init__): Make 'self.ret' a 'ReturnType' instance,
-	not string.  Accept 'optional' flag.
-
-	* codegen/argtypes.py (ArgMatcher.get_reverse_ret): Test if
-	'ptype' has true 'optional' attribute and copy it to 'props' then.
-
-	* codegen/reversewrapper.py (ReturnType.support_optional): New
-	class field, False by default.
-	(GObjectReturn.support_optional, GObjectReturn.write_decl)
-	(GObjectReturn.write_conversion): Support optional return.
-
-	* pygobject-2.0.pc.in: Add 'codegendir' variable.
-	* codegen/pygtk-codegen-2.0.in: Make 'codegendir' refer to
-	PyGObject's codegen, not PyGTK's one --- the latter will be
-	removed (first part of bug #542821).
-
-2008-07-08  Murray Cumming  <murrayc@murrayc.com>
-
-	* codegen/h2def.py: clean_func(): Strip GSEAL out, to avoid us
-	thinking that there are many functions called GSEAL (merge from
-	PyGTK).
-
-2008-01-29  Olivier Crete  <tester@tester.ca>
-
-	* codegen/h2def.py (DefsWriter.__init__): Fix copy-paste
-	typos (merge from PyGTK).
-
-2008-07-11  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	* gio/gfile.override: wrap File.load_contents, fix a typo.
-
-	* gio/gio.defs: Add docstring for File.load_contents.
-
-	* tests/test_gio.py: Add a test for the above method.
-
-2008-07-09  Juha Sahakangas  <voas0113@saunalahti.fi>
-
-	* gobject/gobjectmodule.c (pyg_io_add_watch): Fix error message
-	referencing wrong argument.
-
-2008-06-29  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* gobject/gobjectmodule.c (pyg_markup_escape_text): text_size
-	should be Py_ssize_t instead of int.
-	Bug 540696 – gobject.markup_escape_text() causes python to segfault.
-
-2008-06-28  Johan Dahlin  <jdahlin@async.com.br>
-
-	* docs/reference/pygobject.xml:
-	Document GObject.handler_block_by_func/handler_unblock_by_func
-
-2008-06-17  Johan Dahlin  <jdahlin@async.com.br>
-
-	* gio/gio-types.defs:
-	* tests/test_gio.py:
-	Sort out confusion between interfaces and objects, add test.
-	Fixes #538601
-
-2008-06-09  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	* gobject/pygobject.c (pygobject_copy, pygobject_deepcopy): New
-	functions, unconditionally raise TypeError.
-	(pygobject_methods): Hook them up. (bug #482370)
-
-2008-05-31  Johan Dahlin  <johan@gnome.org>
-
-    * setup.py: set FFI_LIBS to '', since this is mostly used on win32.
-
-2008-05-30  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* gobject/gobjectmodule.c (init_gobject): Call PyType_Ready for
-	PyGParamSpec_Type, and add it to the module dict.
-
-2008-05-23  Johan Dahlin  <jdahlin@async.com.br>
-
-	* gio/gio.defs:
-	Add default values for all GSeekType variables.
-
-2008-05-21  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* gobject/gobjectmodule.c (pyg_spawn_async): Accept None for the
-	child_setup parameter of gobject.spawn_async().  Also check that
-	it is callable.
-
-2008-04-27  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	* gobject/pygenum.c (pyg_enum_richcompare): Fix: raise warning as
-	exception if asked by PyErr_Warn().
-
-	* gobject/pygflags.c (pyg_flags_richcompare):  Don't return NULL
-	after warning; more useful warning message.
-
-	(#480424, borrowing code by Mark Doffman)
-
-2008-04-21  Johan Dahlin  <johan@gnome.org>
-
-	* codegen/h2def.py: Update link to defs format discussion
-
-2008-04-15  Johan Dahlin  <johan@gnome.org>
-
-	* gobject/gobjectmodule.c (init_gobject): Set
-	gobject.GObject.__module__ to gobject._gobject, this
-	helps pylint to check public methods of GObject subclasses
-
-	* tests/Makefile.am (tests):
-	* tests/test_gobject.py (TestGObjectAPI.testGObjectModule):
-	Add a test for this
-
-	(#523821, Simon Schampijer)
-
-2008-04-11  Johan Dahlin  <jdahlin@async.com.br>
-
-	* gio/gio.defs (write_async): document.
-	Add default values to all flags parameters.
-
-2008-04-11  Johan Dahlin  <johan@gnome.org>
-
-	* gio/gio.defs (read_async, read): document.
-	Set io_priority default to G_PRIORITY_DEFAULT.
-
-2008-04-11  Johan Dahlin  <jdahlin@async.com.br>
-
-	* gio/gfile.override:
-	* gio/ginputstream.override:
-	* gio/goutputstream.override:
-	* tests/test_gio.py:
-	Move around the order of the callback argument to async methods,
-	so it comes before priority and cancellable, which can have default
-	values.
-
-2008-04-08  Johan Dahlin  <jdahlin@async.com.br>
-
-	* gio/Makefile.am:
-	* gio/__init__.py:
-	* gio/gappinfo.override:
-	* gio/gio.defs:
-	* gio/gio.override:
-	* tests/test_gio.py:
-	Implement GAppInfo constructor, add tests.
-
-2008-04-08  Johan Dahlin  <jdahlin@async.com.br>
-
-	* gio/Makefile.am:
-	* gio/gfileinfo.override:
-	* gio/gio.defs:
-	* gio/gio.override:
-	* tests/test_gio.py:
-	Wrap GFileInfo.list_attributes(), add tests and
-	set the default of GFileQueryInfoFlags args to G_FILE_QUERY_INFO_NONE.
-
-2008-04-08  Johan Dahlin  <jdahlin@async.com.br>
-
-	* gobject/option.py: Fix a typo
-	* tests/test_option.py:
-	Update the tests after the latest "refactoring".
-	The testsuite should run fine now again, finally.
-
-2008-04-08  Johan Dahlin  <johan@gnome.org>
-
-	* tests/test_gio.py (TestOutputStream.testWriteAsyncError):
-	(TestInputStream._testCloseAsync.callback):
-	Disable these tests until we can figure why they freeze during
-	make check.
-
-2008-04-08  Johan Dahlin  <jdahlin@async.com.br>
-
-	* gio/gio.defs:
-	* gio/gio.override:
-	* tests/test_gio.py:
-	Add bindings for content_type_guess.
-	Based on patch by Thomas Leonard (#525113)
-
-2008-04-08  Johan Dahlin  <jdahlin@async.com.br>
-
-	* gio/gio-types.defs:
-	* gio/gio.defs:
-	* gio/gio.override:
-	* tests/test_gio.py:
-	Add basic support for GThemedIcon, based on patch by
-	Thomas Leonard (#521883)
-
-2008-04-08  Johan Dahlin  <jdahlin@async.com.br>
-
-	* gobject/pygsource.c:
-	* tests/test_source.py:
-	Unbreak Source.prepare (#523075, Bryan Silverthorn)
-
-2008-04-08  Johan Dahlin  <johan@gnome.org>
-
-	* gio/gfile.override (_wrap__install_file_meta): Fix a couple of
-	silly typos and use gio.File instead of GFile in exceptions.
-
-2008-04-07  Johan Dahlin  <johan@gnome.org>
-
-	* gio/__init__.py:
-	* gio/gfile.override:
-	* gio/gio-types.defs:
-	* gio/gio.override:
-	* tests/test_gio.py:
-	Make gio.File() (calling on an interface) a factory for creating
-	files. Add tests and a docstring.
-
-2008-04-07  Johan Dahlin  <johan@gnome.org>
-
-	* gio/Makefile.am (pygiodir): Install gio in the right location
-
-2008-04-06  Johan Dahlin  <johan@gnome.org>
-
-	* tests/test_gio.py: Add tests for recently added features.
-
-	* gio/goutputstream.override:
-	(_wrap_g_output_stream_write_asyn,_wrap_g_output_stream_close_async):
-	* gio/ginputstream.override (async_result_callback_marshal_read):
-	Add wrappers.
-
-	* gio/gio.override: Ignore vararg functions and remove a couple
-	of left overs in the generic marshaller.
-
-	* gio/gio.defs: Remove g_file_output_stream_truncate,
-	g_file_output_stream_tell and g_file_input_stream_tell
-
-	* Makefile.am:
-	* gio/gfileenumerator.override (_wrap_g_file_enumerator_tp_iter):
-	Implement the python iteration protocol on GFileEnumerator
-
-	* codegen/argtypes.py (arg): Add goffset to the int64 arg type
-
-2008-04-02  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	* gobject/pygenum.c: bug #428732
-	(pyg_enum_new): Fix two wrong assertions about '__enum_values__'
-	size and contents.
-	(pyg_enum_reduce): New function (based on patch by Phil Dumont).
-	(pyg_enum_methods): Hook it up.
-
-2008-03-24  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	* gobject/pygenum.c (pyg_enum_richcompare): Don't return NULL
-	after warning; more useful warning message (bug #519631).
-
-2008-03-22  Johan Dahlin  <johan@gnome.org>
-
-	* gio/ginputstream.override:
-	* gio/gio.override:
-	* tests/test_gio.py:
-
-	Make read_finish() return the string, remove the get_buffer method.
-	This is more pythonic, as it mimics the normal read() behavior of
-	python.
-	Update the tests and use a separate marshaller for read.
-
-2008-03-21  Johan Dahlin  <johan@gnome.org>
-
-	* gobject/__init__.py:
-	* tests/test_properties.py:
-	Allow gobject.property work with subclasses. Add tests.
-
-	(#523352, Tomeu Vizoso)
-
-2008-03-10  Johan Dahlin  <johan@gnome.org>
-
-	* configure.ac: Require gio and giounix 2.15.7.
-
-2008-03-09  Johan Dahlin  <johan@gnome.org>
-
-	* gio/gio-types.defs:
-	* gio/gio.defs:
-	* tests/test_gio.py:
-	Update to SVN of gio:
-	g_file_contains_file -> g_file_has_prefix
-	can_seek and can_truncate are now only on the GSeekable interface
-	Add tests
-
-	(#521207, Thomas Leonard)
-
-2008-03-08  Johan Dahlin  <jdahlin@async.com.br>
-
-	* gio/ginputstream.override:
-	Pass in l instead of i to PyArg_ParseTupleAndKeywords when
-	parsing a long. Fixes the build on 64-bit systems.
-	(#521165, Thomas Leonard)
-
-2008-03-02  Johan Dahlin  <johan@gnome.org>
-
-	* Makefile.am: Dist .m4 files.
-	(#496011, Ed Catmur)
-
-2008-03-02  Paul Pogonyshev  <pogonyshev@gmx.net>
-
-	* gobject/gobjectmodule.c (REGISTER_TYPE): Never override customly
-	set 'tp_new' and 'tp_alloc'.
-
-2008-02-01  Dan Winship  <danw@gnome.org>
-
-	* pygobject-2.0.pc.in (defsdir): Add this so other bindings can
-	find gio.defs
-
-2008-01-21  Johan Dahlin  <johan@gnome.org>
-
-	* gio/gio.override (async_result_callback_marshal):
-	Don't assume the buffer is set, use Py_XINCREF instead of Py_INCREF.
-
-	* gio/Makefile.am:
-	* gio/ginputstream.override:
-	* gio/goutputstream.override:
-	* gio/gvolumemonitor.override:
-	* gio/gfile.override:
-	* tests/test_gio.py:
-	Implement and test GFile.read_async. Use try/finally to always quit
-	the mainloop, even if the test fail.
-	Update source comment headers.
-
-2008-01-20  Johan Dahlin  <johan@gnome.org>
-
-	* tests/test_gio.py (TestVolumeMonitor): New test
-
-	* gio/Makefile.am:
-	* gio/ginputstream.override:
-	* gio/gio.override:
-	* gio/giomodule.c:
-	* gio/goutputstream.override:
-	* gio/gvolumemonitor.override:
-	* gio/unix.override:
-	* gio/unixmodule.c:
-
-	Split out overrides into more files. Fix up module description in
-	comments
-
-2008-01-20  Johan Dahlin  <johan@gnome.org>
-
-	* gio/gio.override (_wrap_g_simple_async_result_get_buffer): Add
-	a new method, to fetch the buffer
-	(_wrap_g_input_stream_read_async): Save a reference to the buffer.
-	* tests/test_gio.py (TestInputStream.testReadAsync.callback):
-	Check the content
-
-	* tests/test_gio.py (TestInputStream.testReadAsyncError):
-	New function to test error condition of async read.
-
-	* gio/gio.override (async_result_callback_marshal): Grab a reference
-	to callback/data.
-
-2008-01-19  Johan Dahlin  <johan@gnome.org>
-
-	* gio/gio.override (_wrap_g_output_stream_write): Impl.
-	* gio/gio.override:
-	* gio/unix.defs:
-	Add GUnixInputStream type and methods
-
-	* tests/common.py:
-	* tests/test_gio.py:
-	Add GIO tests.
-
-	* gio/gio.override (_wrap_g_app_info_get_all_for_type),
-	(_wrap_g_app_info_get_all),
-	(_wrap_g_drive_get_volumes): Implement.
-
-	* gio/gio.override (async_result_callback_marshal): New marshaller
-	for async results
-	(_wrap_g_input_stream_read_async): Impl.
-	* gio/gio-types.defs: Add SimpleAsyncRequest
-	* gio/giomodule.c: Register enums/constants
-
-	* gio/gio.override: Fix a silly bug so it possible to read files
-	larger than 8192 bytes.
-
-	* gio/gio.defs: Set null-ok for all cancelable as well.
-
-	* gio/__init__.py: set gio.unix to None if it's not available
-
-	* gio/gio.override: Implement InputStream.read efficiently without
-	copying the strings, based on the standard libararys file.read()
-	implementation.
-
-	* gio/gio-types.defs (Cancellable): Add wrapper.
-
-	* gio/gio.defs (replace): Do not require cancellable argument
-	to be specified, default to NULL if not.
-
-	* Makefile.am:
-	* codegen/Makefile.am:
-	* codegen/README.defs:
-	* codegen/__init__.py:
-	* codegen/argtypes.py:
-	* codegen/code-coverage.py:
-	* codegen/codegen.py:
-	* codegen/createdefs.py:
-	* codegen/definitions.py:
-	* codegen/defsconvert.py:
-	* codegen/defsgen.py:
-	* codegen/defsparser.py:
-	* codegen/docextract.py:
-	* codegen/docextract_to_xml.py:
-	* codegen/docgen.py:
-	* codegen/h2def.py:
-	* codegen/mergedefs.py:
-	* codegen/missingdefs.py:
-	* codegen/mkskel.py:
-	* codegen/override.py:
-	* codegen/pygtk-codegen-2.0.in:
-	* codegen/reversewrapper.py:
-	* codegen/scanvirtuals.py:
-	* codegen/scmexpr.py:
-
-	* configure.ac:
-	* gio/Makefile.am:
-	* gio/__init__.py:
-	* gio/gio-types.defs:
-	* gio/gio.defs:
-	* gio/gio.override:
-	* gio/giomodule.c: (init_gio):
-	* gio/unix-types.defs:
-	* gio/unix.defs:
-	* gio/unix.override:
-	* gio/unixmodule.c: (initunix):
-
-	Import codegen from pygtk.
-	Add initial gio and gio.unix bindings.
-
-2008-01-11  Johan Dahlin  <johan@gnome.org>
-
-	* configure.ac: Don't link against libffi if we cannot find libffi
-	on the system. (#496006, Ed Catmur)
-
-2008-01-03  Johan Dahlin  <johan@gnome.org>
-
-	Reviewed by: Gustavo
-
-	* configure.ac:
-	* gobject/pygmainloop.c (pyg_signal_watch_prepare): Optinally
-	use PySignal_SetWakeupFd to avoid having to do a timeout to find
-	out if there are any pending signals from python.
-	Fixes #481569
-
-	* configure.ac (CPPFLAGS):
-	Include -Wall and -Werror when checking for PySignal_SetWakeupFd
-
-2008-01-02  Sebastian Rittau  <srittau@jroger.in-berlin.de>
-
-	* gobject/gobjectmodule.c
-	* gobject/gobjectmodule.c (pyg_get_application_name)
-	(pyg_get_prgname): Add wrappers for g_get_application_name and
-	g_get_prgname.
-
-2007-11-30  Rafael Villar Burke  <pachi@rvburke.com>
-
-	* docs/reference/pygobject.xml: Add props attribute
-
-2007-11-24  Paolo Borelli  <pborelli@katamail.com>
-
-	* gobject/gobjectmodule.c (pyg_type_register): check for NULL before
-	dereferencing.
-
-2007-11-24  Paolo Borelli  <pborelli@katamail.com>
-
-	* gobject/gobjectmodule.c (pyg_type_register): do not use a
-	potentially uninitialized variable. Bug #499334.
-
-2007-11-12  Johan Dahlin  <johan@gnome.org>
-
-	* gobject/option.py (OptionParser.parse_args):
-	Set the default value of old_args to 0, so we don't end
-	up slicing with None. Fixes #496278 (Vincent Untz)
-
-2007-11-06  Johan Dahlin  <johan@gnome.org>
-
-	* gobject/option.py (OptionParser.parse_args): Merge in values
-	from all groups to the global option group. Slice up args
-	so it doesn't return too much.
-
-	* tests/test_option.py: Refactor to be unittesty,
-	Add new tests to test what options returns.
-
-2007-11-05  Johan Dahlin  <johan@gnome.org>
-
-	* gobject/pygobject.h:
-	* gobject/gobjectmodule.c:
-	Add pyg_option_group_new to the public API
-
-	* configure.ac: Branch, bump version to 2.15.0.
-
-2007-10-16  Damien Carbery   <damien.carbery@sun.com>
-
-	reviewed by: Johan Dahlin.
-
-	* pygobject-2.0-uninstalled.pc.in: uninstalled.pc file missing
-	'datadir' value. Fixes #486876.
-
-2007-09-16  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* configure.ac: Post-relase version bump.
-
-=== 2.14.0 ===
-2007-09-16  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* configure.ac: Bump version to 2.14.0.
-
-	* NEWS: Update NEWS for next release.
-
-2007-09-06  John Finlay  <finlay@moeraki.com>
-
-	* docs/xsl/fixxref.py.in: Remove DATADIR substitution since it now
-	gets substituted as ${prefix}/share which doesn't work in a Python
-	script.
-
-2007-08-27  Johan Dahlin  <jdahlin@async.com.br>
-
-	* gobject/propertyhelper.py (property.__metaclass__.__repr__): Avoid
-	exporting the metaclass, just define it where it will be used.
-
-	* gobject/__init__.py (GObjectMeta._install_properties):
-	Refactor a bit to make sure that it is possible to use in subclasses,
-	fixes #470718 (Marco Giusti)
-
-2007-08-27   Marco Giusti  <marco.giusti@gmail.com>
-
-	reviewed by: Gustavo J. A. M. Carneiro
-
-	* gobject/propertyhelper.py:
-	* tests/test_properties.py:
-	Bug 470230 – check for default value in boolean type is wrong.
-
-2007-08-27  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* tests/Makefile.am,
-	* gobject/Makefile.am: Remove -D_XOPEN_SOURCE=600
-	-D__EXTENSIONS__, no longer needed.
-
-	* configure.ac: Don't add -std=c9x CFLAG on Solaris.  Fixes
-	#339924 again.
-
-	* gobject/pygtype.c (pyg_type_wrapper_repr): Typecast self->type
-	to (unsigned long int) to fix a compilation warning.
-
-2007-08-14   Ed Catmur   <ed@catmur.co.uk>
-
-	reviewed by: Gustavo J. A. M. Carneiro
-
-	* gobject/pygobject.c (pygobject_new_full, pygobject_clear),
-	(pygobject_get_dict): Bug 466082 – pygobject_new_full not fully
-	initialising PyGObject, chaos results.
-
-2007-08-13  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* tests/test_subtype.py (TestSubType.testGetDict): Add unit test
-	exercising a bug when GObject.__dict__ is accessed directly.
-
-2007-07-08  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* gobject/gobjectmodule.c (pygobject_functions)
-	(pyg_timeout_add_seconds): Wrap g_timeout_add_seconds,
-	conditionally compiled if glib version >= 2.13.5.
-
-2007-07-08   Johannes Hölzl   <johannes.hoelzl@gmx.de>
-
-	reviewed by: Gustavo Carneiro
-
-	* gobject/gobjectmodule.c (build_gerror, init_gobject): Work
-	around the deprecation warning of BaseException.message in Python
-	2.6+ affecting GError exceptions.  Fixes #342948.
-
-2007-07-07  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* configure.ac: Post-release version bump.
-
-=== 2.13.2 ===
-2007-07-07  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* NEWS: Update.
-
-2007-07-07  Damien Carbery   <damien.carbery@sun.com>
-
-	reviewed by: Gustavo Carneiro.
-
-	* configure.ac: Bug 339924 – pygobject doesn't compile on opensolaris.
-
-2007-04-30  Johannes Hölzl  <johannes.hoelzl@gmx.de>
-
-	* gobject/gobjectmodule.c (init_gobjectmodule),
-	* gobject/pygoptiongroup.c (arg_func),
-	* gobject/option.py (OptionParser._parse_args, OptionGroup._to_goptiongroup),
-	* tests/test_option.py: OptParse-Exceptions in GOption-callbacks
-	are now convertet into an GError.  GError from the
-	GOptionGroup.run is convertet into an OptParse-Exception.
-	Fixes #342948.
-
-2007-07-06  Ed Catmur  <ed@catmur.co.uk>
-
-	* gobject/pygtype.c (pyg_param_gvalue_from_pyobject),
-	(pyg_param_gvalue_as_pyobject): Applied patch from Ed Catmur to
-	support G_TYPE_VALUE boxed args/signals, and add a test, Fixes
-	#351072
-
-2007-07-06  Carlos Martin  <inean@users.sf.net>
-
-	* tests/test_gtype.py:
-	* tests/testhelpermodule.c: add test for #351072
-
-2007-07-04  Murray Cumming  <murrayc@murrayc.com>
-
-	* gobject/pygobject.c: (pygobject_switch_to_toggle_ref):
-	* gobject/pygobject.h: Rename the private struct field to
-	private_flags, because private is a C++ keyword, so this broke
-	builds of some C++ applications, such as Glom.
-
-2007-07-02  Sebastian Granjoux  <seb.sfo@free.fr>
-
-	reviewed by: Johan Dahlin
-
-	* gobject/gobjectmodule.c: (pyg_gerror_exception_check):
-	* tests/test_gtype.py:
-	* tests/testhelpermodule.c: (_wrap_test_gerror_exception):
-
-	Fix a bug in pyg_error_exception_check, add a test, Fixes #449879
-
-2007-06-17  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* gobject/pygobject.h: Add a flags field to PyGObject; uses
-	structure space formerly occupied by the now stale "GSList
-	*closures" field.
-
-	* gobject/pygobject.c (pygobject_switch_to_toggle_ref): Do nothing
-	if the wrapper is already in toggle reference mode.  Closes #447271.
-
-	* tests/test_subtype.py: Test case for #447271.
-
-2007-06-17  Sebastien Bacher  <seb128@ubuntu.com>
-
-	* m4/python.m4: use python-config to get python includes
-          (Closes #448173)
-
-2007-06-16  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* gobject/propertyhelper.py,
-	* tests/test_properties.py: Support type=GObject or
-	type=TYPE_OBJECT in the new properties API.
-
-2007-06-06  Yevgen Muntyan  <muntyan@tamu.edu>
-
-	OK'd by Johan
-
-	* gobject/generate-constants.c: Return 0 from main().
-
-	* gobject/Makefile.am: use generate-constants$(EXEEXT) instead
-	of generate-constants in the constants.py target rule.
-
-2007-05-30  Yevgen Muntyan  <muntyan@tamu.edu>
-
-	reviewed by: Gustavo Carneiro
-
-	* autogen.sh: Allow running autogen.sh from outside $srcdir.
-
-2007-05-09  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* tests/Makefile.am (INCLUDES): Idem.
-
-	* gobject/Makefile.am (INCLUDES): Add -D_XOPEN_SOURCE=600 and
-	-D__EXTENSIONS__ to make it compile with c99 and Sun C compiler.
-
-	Fixes #339924: gnome-python doesn't compile on opensolaris.
-
-2007-05-02  Johan Dahlin  <jdahlin@async.com.br>
-
-	* configure.ac: Post-release version bump.
-
-=== 2.13.1 ===
-2007-05-02  Johan Dahlin  <jdahlin@async.com.br>
-
-	* pygobject-2.0-uninstalled.pc.in: Add libdir.
-	Fixes #435132 (Luca Ferretti)
-
-2007-05-01  Johan Dahlin  <johan@gnome.org>
-
-	* gobject/propertyhelper.py:
-	* tests/test_properties.py:
-
-	Store property values in the descriptor per instance, add a test.
-
-	* examples/properties.py:
-	* gobject/Makefile.am:
-	* gobject/__init__.py:
-	* gobject/constants.py.in:
-	* gobject/generate-constants.c: (main):
-	* gobject/propertyhelper.py:
-	* tests/Makefile.am:
-	* tests/test_enum.py:
-	* tests/test_interface.py:
-	* tests/test_properties.py:
-
-	Add a property helper, fixes #338098
-
-2007-04-30  Gustavo J. A. M. Carneiro  <gjc@inescporto.pt>
-
-	* tests/common.py (importModules): Import testhelper first so that
-	g_thread_init is called before init_pygobject.
-
-	* tests/testhelpermodule.c (inittesthelper): Call g_thread_init
-	before init_pygobject.
-
-	* tests/test_subtype.py (TestSubType.testDescriptor): Unit test
-	for the bug below.
-
-	* gobject/pygobject.c (pygobject_setattro): Account for the case
-	when attribute setting doesn't actually create an instance
-	dictionary, in which case pygobject_switch_to_toggle_ref would be
-	called twice, thereby causing gobject error.
-	Fixes #434659
-
-2007-04-29  James Livingstone  <doclivingstone@gmail.com>
-
-	reviewed by: Johan Dahlin  <johan@gnome.org>
-
-	* gobject/pygtype.c: (pyg_value_from_pyobject):
-	* tests/test_signal.py:
-
-	Add a missing else to avoid throwing a TypeError.
-	Includes a test written by Ed Catmur.
-	Fixes #374653
-
-2007-04-29  Johan Dahlin  <johan@gnome.org>
-
-	* gobject/pygtype.c: (pyg_value_array_from_pyobject):
-	* tests/test_gtype.py:
-	* tests/testhelpermodule.c: (_wrap_test_value_array):
-
-	Treat None in a GValueArray as pointer/NULL, patch by
-	Ed Catmur, fixes #352209.
-
-2007-04-29  Loïc Minier  <lool+gnome@via.ecp.fr>
-
-	reviewed by: Johan Dahlin  <johan@gnome.org>
-
-	* autogen.sh:
-
-	Use dirname $0 instead of pwd to compute srcdir in autogen,
-	fixes #409234
-
-2007-04-29  Damien Carbery <damien.carbery@sun.com>
-
-	reviewed by: Johan Dahlin  <johan@gnome.org>
-
-	* tests/test-unknown.c: (test_interface_iface_method):
-
-	Do not return in a void function, fixes #385127
-
-2007-04-29  Johan Dahlin  <johan@gnome.org>
-
-	* gobject/pygflags.c: (pyg_flags_from_gtype):
-	Fix leak, patch by Daniel Berrange. Fixes #428726 (Phil Dumont)
-
-2007-04-29  Damien Carbery <damien.carbery@sun.com>
-
-	reviewed by: Johan Dahlin  <johan@gnome.org>
-
-	* configure.ac:
-	* pygobject-2.0-uninstalled.pc.in:
-
-	Add an uninstalled pkg-config file, fixes #385129
-
-2007-04-29  Johan Dahlin  <johan@gnome.org>
-
-	* README:
-	* configure.ac:
-	* gobject/Makefile.am:
-	* gobject/ffi-marshaller.c: (g_value_to_ffi_type),
-	(g_value_from_ffi_type), (g_cclosure_marshal_generic_ffi):
-	* gobject/ffi-marshaller.h:
-	* gobject/gobjectmodule.c: (create_signal), (init_gobject):
-	* pygobject-2.0.pc.in:
-	* tests/test_signal.py:
-	* tests/testhelpermodule.c: (test1_callback),
-	(test1_callback_swapped), (test2_callback), (test3_callback),
-	(test4_callback), (test_float_callback), (test_double_callback),
-	(test_string_callback), (test_object_callback), (connectcallbacks),
-	(_wrap_connectcallbacks), (inittesthelper):
-
-	Add a generic CClosure marshaller based on ffi.
-	This makes it possible to connect to signals on PyGObjects from C.
-	libffi is now an optional dependency
-	Fixes #353816 (Edward Hervey)
-
-2007-04-23  Gustavo J. A. M. Carneiro  <gjc@inescporto.pt>
-
-	* configure.ac: Post-release version bump.
-
-=== 2.13.0 ===
-2007-04-23  Gustavo J. A. M. Carneiro  <gjc@inescporto.pt>
-
-	* configure.ac: Bump version to 2.13.0.
-
-	* tests/test_properties.py (TestProperties.testMulti): Unit test
-	for get/set_properties.
-
-2007-04-23  Gian Mario Tagliaretti  <gianmt@gnome.org>
-
-	* gobject/pygobject.c: Implemented pygobject_set_properties and
-	pygobject_get_properties in order to set multiple properties using
-	keyword arguments. Fixes 403212
-
-	* docs/reference/pygobject.xml: Docs for the above new methods.
-
-2007-04-14  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* gobject/gobjectmodule.c, gobject/pygobject.h: Add a new
-	pyg_gerror_exception_check API.  Fixes #425242.
-
-	* gobject/gobjectmodule.c (pyg_set_application_name)
-	(pyg_set_prgname): Add wrappers for g_set_application_name and
-	g_set_prgname.  Patch by Havoc Pennington.  Fixes #415853.
-
-	* gobject/pygobject.h: Bug #419379: Modernize init_pygobject: use
-	static inline functions instead of macros.
-
-	* gobject/gobjectmodule.c (init_gobject):
-	* gobject/pygobject-private.h:
-	* gobject/pygobject.c (pygobject_data_free, pygobject_data_new),
-	(pygobject_get_inst_data, pyg_toggle_notify),
-	(pygobject_switch_to_toggle_ref),
-	(pygobject_register_wrapper_full, pygobject_register_wrapper),
-	(pygobject_new_full, pygobject_unwatch_closure),
-	(pygobject_watch_closure, pygobject_dealloc, pygobject_repr),
-	(pygobject_traverse, pygobject_clear, pygobject_weak_ref),
-	(pygobject_setattro, pygobject_weak_ref_traverse),
-	(pygobject_weak_ref_notify, pygobject_weak_ref_clear),
-	(pygobject_weak_ref_dealloc, pygobject_weak_ref_new),
-	(pygobject_weak_ref_unref, pygobject_weak_ref_call):
-	* gobject/pygobject.h:
-	* gobject/pygtype.c (gclosure_from_pyfunc):
-	* tests/test_subtype.py:
-	Bug #320428: Break PyGObject<->GObject reference cycle (patch
-	v7.1; thanks John Ehresman for the help with this patch).
-
-2007-03-17  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* gobject/pygobject.c (pygobject_emit): Fix %ld vs int warning.
-	(pygobject_chain_from_overridden): Idem.
-
-2007-03-06  Richard Hult  <richard@imendio.com>
-
-	* configure.ac: Fix the docs option so that it's possible to disable
-	building the docs.
-
-2007-03-03  Edward Hervey  <edward@fluendo.com>
-
-	* gobject/pygobject.c: (set_property_from_pspec):
-	Release the GIL when calling g_object_set_property, since setting a
-	property might trigger some code that might come back in python land.
-	Fixes #395048
-
-2007-01-09  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* configure.ac:  Turn the option --disable-docs into --enable-docs.
-	* docs/Makefile.am:  Tread --enable-docs like --enable-gtk-doc in
-	gtk+, i.e. do not ever build docs unless requested, but always
-	install them if they are found already built.
-
-2006-12-14  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* autogen.sh: Make this work with automake 1.10 too.
-
-2006-11-18  Johan Dahlin  <jdahlin@async.com.br>
-
-	* configure.ac: Post release version bump
-
-=== 2.12.3 ===
-2006-11-18  Johan Dahlin  <jdahlin@async.com.br>
-
-	* NEWS: Update
-
-	* gobject/pygoptiongroup.c (pyg_option_group_dealloc):
-	* tests/test_option.py (TestOption.testBadConstructor):
-	Make sure an exception is raised when we pass in invalid arguments
-	to the optiongroup constructor, add a test. #364576 (Laszlo Pandy)
-
-	* gobject/pygobject.c (pygobject_register_class): set __module__ on
-	gobject derived types, fixes #376099 (Osmo Salomaa)
-
-2006-11-18  Yevgen Muntyan  <muntyan@tamu.edu>
-
-	reviewed by: Johan Dahlin  <johan@gnome.org>
-
-	* gobject/gobjectmodule.c: (create_property):
-	* gobject/pygparamspec.c: (pyg_param_spec_getattr):
-	* tests/test_properties.py:
-
-	Avoid truncating in pyg_param_spec_getattr, add test for all non-float
-	numeric types. Fixes #353943
-
-2006-11-18  Johan Dahlin  <jdahlin@async.com.br>
-
-	* gobject/pygtype.c (gclosure_from_pyfunc): Use PyObject_Cmp instead
-	of comparing function closure addresses, which makes it possible
-	to use any callable and not just functions.
-	Fixes #375589 (Dima)
-
-2006-10-13  John Finlay  <finlay@moeraki.com>
-
-	* docs/Makefile.am (HTML_FILES): Remove
-	html/pygobject-reference-copyright.html.
-	Fixes #361906 (Marc-Andre Lureau)
-
-2006-10-11  John Finlay  <finlay@moeraki.com>
-
-	* docs/reference/pygobject-introduction.xml: Remove Copyright and
-	License section.
-
-	* docs/reference/pygobject-ref.xml: Remove author info
-
-2006-10-05  Cedric Gustin  <cedric.gustin@gmail.com>
-
-	* dsextras.py (Template) (TemplateExtension): Add
-	py_ssize_t_clean flag to be passed to codegen.SourceWriter.
-
-2006-10-04  Cedric Gustin  <cedric.gustin@gmail.com>
-
-	* Makefile.am: Add pygobject_postinstall.py to EXTRA_DIST.
-
-2006-10-03  Johan Dahlin  <jdahlin@async.com.br>
-
-	* configure.ac: Post release version bump
-
-=== 2.12.2 ===
-2006-10-03  Johan Dahlin  <jdahlin@async.com.br>
-
-	* NEWS:
-	* configure.ac: 2.12.2
-
-2006-10-03  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* gobject/Makefile.am:
-	* gobject/gobjectmodule.c: (add_signals), (add_properties),
-	(pyg_signal_new), (pyg_object_new), (get_handler_priority),
-	(pyg_io_add_watch), (pyg_spawn_async), (pyg_add_emission_hook),
-	(pyg_remove_emission_hook), (pyg_filename_from_utf8),
-	(_pyg_strv_to_gvalue):
-	* gobject/pygiochannel.c: (py_io_channel_write_chars),
-	(py_io_channel_write_lines):
-	* gobject/pygobject-private.h:
-	* gobject/pygobject.c: (PyGProps_length), (pygobject_init),
-	(pygobject_connect), (pygobject_connect_after),
-	(pygobject_connect_object), (pygobject_connect_object_after),
-	(pygobject_disconnect), (pygobject_handler_is_connected),
-	(pygobject_handler_block), (pygobject_handler_unblock),
-	(pygobject_emit), (pygobject_chain_from_overridden):
-	* gobject/pygoptioncontext.c: (pyg_option_context_parse):
-	* gobject/pygtype.c: (pyg_value_from_pyobject):
-
-	Python 2.5 and 64 bits fixes (Py_ssize_t), closes bug #338487.
-
-	* gobject/pygenum.c (pyg_enum_repr): Const warning fix.
-
-2006-09-29  Johan Dahlin  <jdahlin@async.com.br>
-
-	* pygtk.py: LGPL, not GPL header
-
-2006-09-24  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* gobject/pygobject.h (init_pygobject_check): Add parentheses
-	"around && within ||" to please gcc.
-
-2006-09-21  Cedric Gustin  <cedric.gustin@gmail.com>
-
-	* dsextras.py: Catch ImportError exception when codegen is not
-	available: disable Template and TemplateExtension, redirect the
-	user to the pygtk installer and raise a NameError
-	exception. check_date has also been rewritten and now uses
-	distutils.dep_util.newer_group(). defs files can also be built
-	using createdefs by passing tuples as keyword argument to Template
-	(see for example the gdk and gtk templates in setup.py).
-	* setup.py: Changed the way the VERSION macro is defined on win32.
-	Also install the html reference documentation, the xsl files and
-	fixxref.
-	* pygobject_postinstall.py: Set the value of DATADIR in
-	fixxref.py. Add functions to install shortcuts in the Start menu
-	to the reference manual (currently disabled: see bug #353849).
-
-2006-09-16  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* tests/test_signal.py (TestEmissionHook.testCallbackReturnFalse)
-	(TestEmissionHook.testCallbackReturnTrue)
-	(TestEmissionHook.testCallbackReturnTrueButRemove): Add a few more
-	emission hook tests.
-
-	* gobject/gobjectmodule.c (pyg_add_emission_hook): One too many
-	DECREF on 'extra_args'.
-
-2006-09-12  John Ehresman  <jpe@wingware.com>
-
-	* gobject/pygobject.h (init_pygobject_check): Declare variables
-	at start of code block
-
-2006-09-06  Johan Dahlin  <jdahlin@async.com.br>
-
-	* gobject/pygmainloop.c (pyg_signal_watch_prepare): Increase the timeout
-	to 1000ms instead of 100.
-
-=== 2.12.1 ===
-2006-09-04  Johan Dahlin  <jdahlin@async.com.br>
-
-	* gobject/pygobject.h (_PYGOBJECT_H_): Corrected version check,
-	(Sebastian Dröge, #354364)
-
-	* configure.ac: Post release version bump
-
-=== 2.12.0 ===
-2006-09-04  Johan Dahlin  <jdahlin@async.com.br>
-
-	* NEWS:
-	* configure.ac: 2.12.0
-
-2006-08-28  Johan Dahlin  <jdahlin@async.com.br>
-
-	* docs/Makefile.am: Install html files regardless even when passing
-	in --disable-docs, fixes #353159 (Matthias Clasen)
-
-2006-08-27  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* configure.ac: Post-release version bump.
-
-=== 2.11.4 ===
-2006-08-27  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* NEWS: Update.
-
-	* gobject/gobjectmodule.c (pyg_type_register): Correct a bug in
-	the code that checks if parent already implements an interface or not.
-
-	* tests/test-unknown.c (test_interface_base_init),
-	(test_interface_get_type): Add a property to the interface, for
-	better testing.
-	(test_unknown_get_property),
-	(test_unknown_set_property, test_unknown_class_init): Add a
-	property to the class as required by the interface.
-
-	* tests/test_interface.py: More thorough interface testing, with
-	properties and test both the case of implementing an interface
-	from scratch, and re-implementing and interface that a parent
-	already implements.
-
-2006-08-27  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* gobject/gobjectmodule.c (pygobject__g_instance_init): If
-	necessary, attach the GObject to the PyGObject here.
-	(pygobject_constructv): Cope with the fact that wrapper->obj may
-	have already been set due to the change above.
-
-	* tests/test_signal.py: Add test case fixed by the changes above,
-	basically calling self.emit() inside do_set_property called
-	implicitly by the constructor due to a CONSTRUCT property.
-
-	Fixes bug 353039: "Failure in signal emission during
-	do_set_property invoked from constructor".
-
-2006-08-26  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* gobject/gobjectmodule.c (pyg_type_register): Fix type
-	registration once more to account for all corner cases.  This time
-	we register interfaces in two stages: first, before properties and
-	signals are registered, we register the interfaces that are
-	already implemented in the parent type and are being overridden;
-	second, after registration of properties and signals, we register
-	the remaining interfaces.
-
-2006-08-21  Johan Dahlin  <jdahlin@async.com.br>
-
-	* docs/Makefile.am (EXTRA_DIST): Remove build_stamp, include generated .html
-	in the distributed tarball. Remove builddate.xml, reference directory and fixxref.py
-	dependencies to avoid regenerating the tarball when it's not needed.
-
-	* configure.ac: Post release version bump
-
-=== 2.11.3 ===
-2006-08-21  Johan Dahlin  <jdahlin@async.com.br>
-
-	* NEWS: Update
-
-	* Makefile.am:
-	* docs/Makefile.am:
-	Always install the xsl files & css files, regardless if the
-	documentation was actually built or not. Also clean it up considerably.
-
-2006-08-17  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* gobject/gobjectmodule.c (pyg_type_register): Move the interface
-	registration code up, to run before properties and signals
-	registration, because glib doesn't allow us to add interfaces
-	after the first call to g_class_ref.
-
-2006-08-16  John Finlay  <finlay@moeraki.com>
-
-	* docs/reference/pygobject-functions.xml: Update docs for
-	gobject functions.
-
-2006-08-15  Murray Cumming  <murrayc@murrayc.com>
-
-	* gobject/pygobject-private.h:
-	* gobject/pygobject.h:
-	Replace uses of typename with type_name, because that is a
-	reserved C++ keyword. This was breaking compilation of Glom
-	due its use in the new type_register_custom function pointer in
-	pygobject.h.
-
-2006-08-12  John Finlay  <finlay@moeraki.com>
-
-	* pygobject-2.0.pc.in: Add reference to installed pygobject docs
-	* docs/Makefile.am: Add install of style.css
-	* docs/xsl/html.xsl: Define stylesheet as style.css
-	* docs/style.css: Add.
-
-2006-08-10  John Finlay  <finlay@moeraki.com>
-
-	* docs/reference/entities.docbook.in:
-	* docs/reference/pygobject-ref.xml:
-	* docs/Makefile.am:
-	* configure.ac:
-	Use builddate.xml for the builddate entity and have builddate.xml be
-	updated when the docs are built not during configure time.
-
-2006-08-08  Johan Dahlin  <jdahlin@async.com.br>
-
-	* configure.ac:  Post release version bump.
-
-=== 2.11.2 ===
-2006-08-08  Johan Dahlin  <jdahlin@async.com.br>
-
-	* NEWS: Update
-
-2006-08-07  Johan Dahlin  <jdahlin@async.com.br>
-
-	* docs/Makefile.am ($(HTML_DATA)): Fix parallel build
-	(#350225, Ed Catmur)
-
-2006-08-06  Johan Dahlin  <johan@gnome.org>
-
-	* m4/as-expand.m4: New file to workaround automake silliness
-
-	* docs/xsl/fixxref.py.in: New script
-
-	* docs/Makefile.am (XSLFILES): Add fixxref.py script, moved in from
-	PyGTK.
-
-	* docs/xsl/html.xsl: Do not use shade.verbatim, set the background
-	color and border as a normal html tag to avoid an external
-	stylesheet.
-
-2006-08-04  Johan Dahlin  <jdahlin@async.com.br>
-
-	* configure.ac: Post release version bump
-
-=== 2.11.1 ===
-2006-08-04  Johan Dahlin  <jdahlin@async.com.br>
-
-	* NEWS: Update
-
-	* README: Update, some s/PyGTK/PyGObject/
-
-	* configure.ac:
-	* docs/Makefile.am:
-	* docs/reference/.cvsignore:
-	* docs/reference/entities.docbook.in:
-	* docs/reference/pygobject-ref.xml:
-	Clean up the build date/version mess I created.
-	Now it's created during configure time and properly included in
-	the docbook files. Also make sure distcheck passes
-
-2006-08-04  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* configure.in: Add hack to disable libtool checking for g++ and
-	g77 (copied from libglade).
-
-2006-07-29  John Finlay  <finlay@moeraki.com>
-
-	* gobject/pygobject.h (pyg_param_gvalue_from_pyobject): Fix define
-	to point to the correct function pointer field.
-
-2006-07-29  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* gobject/pygflags.c (pyg_flags_add): idem.
-
-	* gobject/pygenum.c (pyg_enum_add): Give a more explicit error
-	message when the gtype is not an enum.
-
-2006-07-25  Johan Dahlin  <jdahlin@async.com.br>
-
-	* gobject/pygobject.h (init_pygobject_check): Add a macro to easily
-	check the installed pygobject version.
-
-	* gobject/pygflags.c (pyg_flags_add)
-	* gobject/pygenum.c (pyg_enum_add): Duplicate the string before
-	sending it to python. Fixes GCC warnings.
-
-2006-07-24  John Finlay  <finlay@moeraki.com>
-
-	* gobject/pygflags.c (pyg_flags_get_first_value_name)
-	(pyg_flags_get_first_value_nick): Avoid segfault when
-	g_flags_get_first_value returns NULL.
-
-2006-07-20  John Finlay  <finlay@moeraki.com>
-
-	* docs/Makefile.am: Make version.xml dependent on config.h
-	Make builddate.xml dependent on REFERENCE_DEPS. Add builddate.xml to
-	build_stamp and pdf dependencies. Add pdf files to cleanup.
-
-2006-07-20  Johan Dahlin  <jdahlin@async.com.br>
-
-	* configure.ac:
-	* docs/Makefile.am:
-	* docs/reference/.cvsignore:
-	* docs/reference/version.xml.in:
-	Generate builddate.xml and version.xml at build time instead on
-	configure time, add proper dependencies.
-
-2006-07-19  John Finlay  <finlay@moeraki.com>
-
-	* docs/Makefile.am: Use more portable date generator.
-
-	* docs/xsl/ref-html-style.xsl: Add book to list of indexed items.
-
-	* docs/xsl/html.xsl: Output xref links for unknown links.
-
-	* docs/xsl/ref-html-style.xsl: Include refsect1 and refsect2 in
-	indexed items but only if they have ids.
-
-	* configure.ac (AC_CONFIG_FILES) : Add docs/reference/version.xml
-
-	* docs/reference/pygobject-ref.xml: Add pygobject-introduction.xml
-	and version and builddate entities. Remove commented out items.
-
-	* docs/Makefile.am: Add reference/pygobject-introduction.xml and
-	 reference/version.xml.in
-
-2006-07-18  Johan Dahlin  <johan@gnome.org>
-
-	* docs/Makefile.am (HTMLdir): Install book in $datadir/gtk-doc/html
-
-2006-07-13  Johan Dahlin  <jdahlin@async.com.br>
-
-	* gobject/gobjectmodule.c: (pyg_type_from_name),
-	(get_type_name_for_class):
-	* gobject/pygobject-private.h:
-	* gobject/pygobject.c: (pygobject_new_with_interfaces),
-	(pygobject_lookup_class), (pygobject_emit):
-	* gobject/pygobject.h:
-	* gobject/pygtype.c: (_wrap_g_type_from_name),
-	(pyg_type_from_object), (pyg_type_register_custom_callback),
-	(pyg_type_get_custom), (_pyg_type_from_name):
-	Add infrastructure for lazy type registration, fixes #346947
-
-2006-07-13  Gustavo J. A. M. Carneiro  <gjc@inescporto.pt>
-
-	* m4/python.m4: Properly quote AM_CHECK_PYMOD definition.
-
-	* gobject/pygoptioncontext.c (pyg_option_context_parse): Fix mem
-	leak.
-
-2006-07-12  Johan Dahlin  <jdahlin@async.com.br>
-
-	* Makefile.am:
-	* configure.ac:
-	* docs/.cvsignore:
-	* docs/Makefile.am:
-	* docs/common.xsl:
-	* docs/devhelp.xsl:
-	* docs/html.xsl:
-	* docs/pdf-style.xsl:
-	* docs/pdf.xsl:
-	* docs/ref-html-style.xsl:
-	* docs/reference/.cvsignore:
-	* docs/reference/pygobject-classes.xml:
-	* docs/reference/pygobject-constants.xml:
-	* docs/reference/pygobject-functions.xml:
-	* docs/reference/pygobject-gboxed.xml:
-	* docs/reference/pygobject-ginterface.xml:
-	* docs/reference/pygobject-gpointer.xml:
-	* docs/reference/pygobject-maincontext.xml:
-	* docs/reference/pygobject-mainloop.xml:
-	* docs/reference/pygobject-ref.xml:
-	* docs/reference/pygobject.xml:
-	Import GObject part of John Finlay's PyGTK Reference Manual, copy
-	over infrastructure from the pygtk-web module.
-
-2006-07-12  Gustavo J. A. M. Carneiro  <gjc@inescporto.pt>
-
-	* configure.ac: Post-release version bump to 2.11.1.
-
-=== PyGObject 2.11.0 ===
-2006-07-09  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* gobject/gobjectmodule.c (pyg_type_register): Make interface_data
-	point to the python type before adding the interface to the new
-	type.  This should fix interface implementation (actually I
-	thought such code had already been added earlier but can't find it
-	now and it is obviously needed...)
-	(pyg_type_register): move the code that needs g_type_class_ref
-	until after interface registration (more code that I already wrote
-	in the past but got lost).
-
-2006-07-05  John Finlay  <finlay@moeraki.com>
-
-	* gobject/pygiochannel.c (py_io_channel_init): Fix message typo.
-
-2006-06-28  Cedric Gustin  <cedric.gustin@gmail.com>
-
-	* dsextras.py (InstallData): Set datarootdir in .pc file.
-
-	* pygobject_postinstall.py (replace_prefix): Do not parse
-	pygtk-codegen-2.0 as it is part of pygtk.
-
-	* setup.py: Create gobject extension as gobject._gobject. Add
-	pygoptioncontext.c and pygoptiongroup.c to the list of source
-	files. Add option.py to the module files. Changed name of
-	distutils package from pygtk to pygobject.
-
-2006-06-24  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* gobject/gobjectmodule.c (pyg_filename_from_utf8): Wrap
-	g_filename_from_utf8.
-
-	* tests/test_signal.py (TestClosures.testGString): Add unit test
-	for signals using the type TYPE_GSTRING.
-
-	* gobject/pygtype.c (pyg_value_as_pyobject)
-	(pyg_value_from_pyobject): Implement conversion code for the type
-	G_TYPE_GSTRING.
-
-	* gobject/gobjectmodule.c (pyg_filename_display_basename)
-	(pyg_filename_display_name): Add bindings for
-	g_filename_display_basename and g_filename_display_name.
-	(init_gobject): Add a TYPE_GSTRING definition.
-
-	* gobject/pygobject.h,
-	* gobject/pygobject-private.h: Make pyg_constant_strip_prefix
-	receive and return const gchar*, to indicate it does not change
-	the string.  Unfortunately since PyModule_AddIntConst is broken in
-	python < 2.5 this introduces const warnings elsewhere :-(
-
-	* gobject/gobjectmodule.c (pyg_flags_add_constants)
-	(pyg_enum_add_constants): Fix const warnings.
-
-2006-06-23  John Finlay  <finlay@moeraki.com>
-
-	* gobject/gobjectmodule.c (pyg_object_class_list_properties)
-	(pyg_signal_list_ids, pyg_signal_lookup, pyg_signal_query): Add
-	support for retrieving signal and propertie info from interface types.
-
-2006-06-04  Johan Dahlin  <johan@gnome.org>
-
-	* gobject/gobjectmodule.c (pyg_spawn_async)
-	(pyg_signal_new): Fix two leaks in error cases, found by
-	Coverity.
-
-2006-05-28  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* tests/test_subtype.py: Uncomment Johan's "subsubtype" test case.
-
-	* gobject/gobjectmodule.c (pygobject__g_instance_init): Pass the
-	g_class to pygobject_new_full, because during the instance init
-	function instances are temporarily assigned the parent's GType.
-
-	* gobject/pygobject-private.h,
-	* gobject/pygobject.c (pygobject_new_full): Make
-	pygobject_new_full accept an optional g_class parameter; If
-	present, the GType is extracted from the class instead of from the
-	instance.
-
-2006-05-20  Yevgen Muntyan  <muntyan@tamu.edu>
-
-	reviewed by: Gustavo Carneiro
-
-	* gobject/pygobject.c (pygobject_init, pygobject_get_property),
-	(pygobject_set_property): Bug 341174: Be more specific in
-	set/get_property error messages.
-
-2006-05-07  Yevgen Muntyan  <muntyan@tamu.edu>
-
-	reviewed by: Gustavo Carneiro
-
-	* gobject/gobjectmodule.c (_log_func, add_warning_redirection),
-	(remove_handler, disable_warning_redirections, init_gobject):
-	* gobject/pygobject.h:  Add new pyg_add_warning_redirection and
-	pyg_disable_warning_redirections APIs (bug #323786 again).
-
-2006-05-07  Johan Dahlin  <johan@gnome.org>
-
-	* Makefile.am (CLEANFILES): Remove pygtk.py, it's not
-	auto-generated any longer. Thanks to Kjartan for noticing.
-
-2006-05-07  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* gobject/pygoptioncontext.c:
-	s/sizeof(PyGMainContext)/sizeof(PyGOptionContext)/ (copy-paste error).
-
-2006-05-01  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* gobject/gobjectmodule.c (pyg_pid_close): Add a close() method
-	to the GPid wrapper.
-
-	* gobject/gobjectmodule.c (pyg_pid_free, pyg_pid_new),
-	(pyg_spawn_async, init_gobject): Wrap GPid in an object whose
-	destructor calls g_spawn_close_pid.  Fixes #340160.
-
-2006-04-29  Johannes Hölzl <johannes.hoelzl@gmx.de>
-
-	reviewed by: Johan Dahlin  <jdahlin@async.com.br>
-
-	* examples/Makefile.am:
-	* examples/option.py:
-	* gobject/Makefile.am:
-	* gobject/gobjectmodule.c: (init_gobject):
-	* gobject/option.py:
-	* gobject/pygobject-private.h:
-	* gobject/pygoptioncontext.c: (pyg_option_context_init),
-	(pyg_option_context_dealloc), (pyg_option_context_parse),
-	(pyg_option_context_set_help_enabled),
-	(pyg_option_context_get_help_enabled),
-	(pyg_option_context_set_ignore_unknown_options),
-	(pyg_option_context_get_ignore_unknown_options),
-	(pyg_option_context_set_main_group),
-	(pyg_option_context_get_main_group),
-	(pyg_option_context_add_group), (pyg_option_context_compare),
-	(pyg_option_context_new):
-	* gobject/pygoptiongroup.c: (check_if_owned), (destroy_g_group),
-	(pyg_option_group_init), (pyg_option_group_dealloc), (arg_func),
-	(pyg_option_group_add_entries),
-	(pyg_option_group_set_translation_domain),
-	(pyg_option_group_compare), (pyg_option_group_transfer_group),
-	(pyg_option_group_new):
-	* tests/test_option.py:
-
-	Add support for GOption, fixes #163645
-
-2006-04-29  Johan Dahlin  <jdahlin@async.com.br>
-
-	* gobject/pygtype.c (gclosure_from_pyfunc):
-
-	* gobject/pygobject.c (pygobject_disconnect_by_func)
-	(pygobject_handler_block_by_func)
-	(pygobject_handler_unblock_by_func):
-
-	* tests/test_signal.py (TestEmissionHook._callback):
-
-	Fix #154845, add tests and a private method.
-
-2006-04-23  John Ehresman   <jpe@wingware.com>
-
-	reviewed by: Gustavo
-
-	* Makefile.am:
-	* pygtk.py:
-	* pygtk.py.in:
-	Bug 338945: Make pygtk.py relocatable
-
-2006-04-18  John Ehresman   <jpe@wingware.com>
-
-	* dsextras.py: Add compiler / linker flags from pkgconfig-2.0.pc
-	by default, with an override mechanism.  Filter out -lc & -lm if
-	compiling with msvc.
-
-	* setup.py: Change C extension name to _gobject and don't use the
-	pkgconfig-2.0.pc when compiling
-
-2006-04-15  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* gobject/__init__.py (_PyGObject_API): Copy _PyGObject_API from
-	gobject._gobject into gobject in order to preserve binary
-	compatibility with 3rd party modules.
-
-	* gobject/pygobject.h (init_pygobject): Import gobject, gobject._gobject.
-
-	* gobject/Makefile.am: Fix pygobject installation dir: install
-	both _gobject.la and __init__.py into
-	$(pyexecdir)/gtk-2.0/gobject.
-
-2006-04-11  Johan Dahlin  <jdahlin@async.com.br>
-
-	* gobject/gobjectmodule.c (init_gobject):
-	* gobject/__init__.py:
-	Move over almost all GType constants from C to Python.
-
-2006-04-11  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* gobject/__init__.py:
-	* gobject/gobjectmodule.c (_wrap_pyg_type_register),
-	(pyg__install_metaclass, init_gobject):  GObjectMeta now moved to
-	python-land (__init__.py).
-
-	* gobject/pygobject-private.h:
-	* gobject/pygobject.c (pygobject_register_class):
-	PyGObject_MetaType is now a pointer, not structure.
-
-	* gobject/gobjectmodule.c (_wrap_pyg_type_register): Add optional
-	type name parameter.
-
-	* tests/common.py (importModule): Include original exception
-	string in the raised SystemExit.
-
-2006-04-11  Johan Dahlin  <jdahlin@async.com.br>
-
-	* gobject/.cvsignore:
-	* gobject/Makefile.am:
-	* gobject/__init__.py:
-	* gobject/gobjectmodule.c: (init_gobject):
-	* gobject/pygobject.h:
-	* tests/Makefile.am:
-	* tests/common.py:
-
-	Turn gobject into a package; move _gobject to gobject._gobject and
-	add gobject/__init__.py. Update macros and testsuite.
-
-2006-04-11  Johan Dahlin  <jdahlin@async.com.br>
-
-	* configure.ac: Post release version bump
-
-=== PyGObject 2.10.1 ===
-2006-04-11  Johan Dahlin  <jdahlin@async.com.br>
-
-	* NEWS: Update
-
-2006-04-11  Andy Wingo  <wingo@pobox.com>
-
-	reviewed by: Johan Dahlin  <jdahlin@async.com.br>
-
-	* gobject/gobjectmodule.c (create_property): Parse unsigned int64
-	constraints in param spec declaration using the "K" ParseTuple
-	format unit, not L -- allows the full range of the datatype to be
-	parsed. K format unit added in python 2.3.
-
-2006-04-01  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* tests/test_properties.py: Add test for #335854.
-
-	* pygtk.py.in (require): For version == '2.0', use a hardcoded
-	pygtk path, recorded during build.
-
-	* gobject/gobjectmodule.c (_pyg_strv_to_gvalue): Don't allow
-	arbitrary sequences, only tuple or list, since a string is a
-	sequence too.
-	(pyg_object_new): Add a bit more detail to the exception string.
-
-2006-01-16  Johan Dahlin  <johan@gnome.org>
-
-	* Makefile.am: Include dsextras.py in the dist and install it.
-
-2006-03-19  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* gobject/pygobject.c (pygobject_new_with_interfaces): Remove
-	comment "It will currently not filter out interfaces already
-	implemented by it parents.", since it is no longer true since
-	2006-01-13.
-
-=== PyGObject 2.10.0 ===
-2006-01-16  Johan Dahlin  <johan@gnome.org>
-
-	* NEWS: Update
-
-2006-03-09 Michael Smith  <msmith@fluendo.com>
-
-	reviewed by: Johan Dahlin  <jdahlin@async.com.br>
-
-	* gobject/pygenum.c: (pyg_enum_new), (pyg_enum_from_gtype),
-	(pyg_enum_add):
-	* gobject/pygflags.c: (pyg_flags_new), (pyg_flags_from_gtype),
-	(pyg_flags_add):
-	Plug a couple of leaks, fixes #334027.
-
-2006-01-19  Johan Dahlin  <johan@gnome.org>
-
-	* configure.ac (export_dynamic):
-	* Makefile.am (egg):
-	Add a make egg target
-
-2006-01-16  Johan Dahlin  <johan@gnome.org>
-
-	* configure.ac: Post release version bump
-
-=== PyGObject 2.9.1 ===
-2006-01-16  Johan Dahlin  <johan@gnome.org>
-
-	* NEWS: Update
-
-2006-01-15  Christopher Aillon  <caillon@redhat.com>
-
-	* gobject/gobjectmodule.c (pyg_strv_to_gvalue):
-	Don't call g_value_init since the other *_to_gvalue
-	methods expect an already inited GValue
-
-2006-01-14  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* gobject/gobjectmodule.c (iowatch_marshal): Warn if io callback
-	returns None: almost always this is an error.
-
-2006-01-13  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
-
-	* gobject/pygobject.c (pygobject_register_class): Change strategy
-	a bit: don't ignore bases; use but augment it with missing bases
-	extracted in runtime.
-
-	* gobject/pygobject.c (pygobject_register_class): Don't use the
-	passed in 'bases' parameter; instead find out in runtime the bases
-	for any given gtype.
-	(pyg_type_get_bases, pygobject_new_with_interfaces): Refactor code
-	that dynamically discovers bases into a separate function;
-	Override tp_dealloc, tp_alloc, tp_free, tp_traverse, and tp_clear,
-	inherit them again from the parent type, since type_new inside
-	Python core sets them to hardcoded functions subtype_xxx.  Also
-	call py_parent_type->ob_type, instead of fixed &PyType_Type.
-	(pygobject_clear): Change a g_message to g_warning.
-
-2006-01-13  Johan Dahlin  <jdahlin@async.com.br>
-
-	* gobject/gobjectmodule.c: (pyg_io_add_watch),
-	(marshal_emission_hook), (pyg_add_emission_hook),
-	(pyg_remove_emission_hook):
-	* gobject/pygobject.c:
-	* tests/test_signal.py:
-
-	Add add/remove_emission_hook and tests. Fixes #325977
-
-2006-01-11  Gustavo J. A. M. Carneiro  <gjc@inescporto.pt>
-
-	* gobject/gobjectmodule.c (_pyg_signal_accumulator),
-	(create_signal, pyg_signal_accumulator_true_handled),
-	(initgobject): Bug 155380 -- Add support for signal accumulators.
-
-	* tests/runtests.py: Add 'test_enum', 'test_conversion' to
-	SKIP_FILES, since they depend on pygtk modules so don't work
-	anymore.  This should be eventually fixed, though.
-
-	* tests/test_signal.py: Test signal accumulators.
-
-	* gobject/pygtype.c (object_doc_descr_get): Reorder
-	properties/signals documentation more nicely: signals + properties
-	from each type are presented, with types ranging from the leaf
-	types to the base types.
-
-	* configure.ac: Branch, bump version to 2.9.1.
-
-=== PyGObject 2.8.0 ===
-2006-01-09  Johan Dahlin  <jdahlin@async.com.br>
-
-	* MANIFEST.in:
-	* Makefile.am:
-	* tests/Makefile.am:
-
-	Make dist/distcheck work again
-
-2006-01-09  Johan Dahlin  <jdahlin@async.com.br>
-
-	* setup.py: Add distutils support
-
-	* dsextras.py (get_m4_define): Check for configure.ac aswell.
-
-	* .cvsignore:
-	* AUTHORS:
-	* COPYING:
-	* INSTALL:
-	* Makefile.am:
-	* PKG-INFO.in:
-	* README:
-	* autogen.sh:
-	* configure.ac:
-	* examples/.cvsignore:
-	* examples/Makefile.am:
-	* gobject/gobjectmodule.c: (initgobject):
-	* m4/jhflags.m4:
-	* m4/python.m4:
-	* pygobject-2.0.pc.in:
-	* tests/Makefile.am:
-	* tests/common.py:
-	* tests/leak.glade:
-	* tests/runtests.py:
-	* tests/test_actiongroup.py:
-	* tests/test_dialog.py:
-	* tests/test_gdk.py:
-	* tests/test_gdkevent.py:
-	* tests/test_glade.py:
-	* tests/test_gtype.py:
-	* tests/test_liststore.py:
-	* tests/test_radiobutton.py:
-	* tests/test_signal.py:
-	* tests/test_subtype.py:
-	* tests/test_textview.py:
-	* tests/test_thread.py:
-	* tests/testhelpermodule.c: (test_type_get_type),
-	(_wrap_test_g_object_new):
-	* tests/testmodule.py:
-
-	Split out PyGObject from PyGTK.
diff --git a/INSTALL b/INSTALL
index 23e5f25..d60e29a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,236 +1,370 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation,
+Inc.
 
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 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.  Some packages provide this
+'INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
 
-   The `configure' shell script attempts to guess correct values for
+   The 'configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
+those values to create a 'Makefile' in each directory of the package.
+It may also create one or more '.h' files containing system-dependent
+definitions.  Finally, it creates a shell script 'config.status' that
 you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
+file 'config.log' containing compiler output (useful mainly for
+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
+   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
 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
-diffs or instructions to the address given in the `README' so they can
+to figure out how 'configure' could check whether to do them, and mail
+diffs or instructions to the address given in the 'README' so they can
 be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
+some point 'config.cache' contains results you don't want to keep, you
 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'.
+   The file 'configure.ac' (or 'configure.in') is used to create
+'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:
+   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.
+  1. 'cd' to the directory containing the package's source code and type
+     './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.
+  2. Type 'make' to compile the package.
 
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
+  3. Optionally, type 'make check' to run any self-tests that come with
+     the package, generally using the just-built uninstalled binaries.
 
-  4. Type `make install' to install the programs and any data files and
-     documentation.
+  4. Type 'make install' to install the programs and any data files and
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the 'make install' phase executed with root
+     privileges.
 
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
+  5. Optionally, type 'make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior 'make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
+     source code directory by typing 'make clean'.  To also remove the
+     files that 'configure' created (so you can compile the package for
+     a different kind of computer), type 'make distclean'.  There is
+     also a 'make maintainer-clean' target, but that is intended mainly
      for the package's developers.  If you use it, you may have to get
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
+  7. Often, you can also type 'make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like 'make install' and 'make uninstall' work correctly.
+     This target is generally not run by end users.
+
 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
+   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 `..'.
+the 'configure' script.  'configure' automatically checks for the
+source code in the directory that 'configure' is in and in '..'.  This
+is known as a "VPATH" build.
+
+   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.
 
-   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.
+   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
-`/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'.
+   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', where PREFIX must be an
+absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+pass the option '--exec-prefix=PREFIX' to 'configure', the package uses
 PREFIX as the prefix for installing programs and libraries.
 Documentation and other data files still use the regular prefix.
 
    In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+options like '--bindir=DIR' to specify different values for particular
+kinds of files.  Run 'configure --help' for a list of the directories
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of '${prefix}', so that
+specifying just '--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to 'configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+'make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+'${prefix}'.  Any directories that were specified during 'configure',
+but not in terms of '${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the 'DESTDIR' variable.  For
+example, 'make install DESTDIR=/alternate/directory' will prepend
+'/alternate/directory' before all installation names.  The approach of
+'DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of '${prefix}'
+at 'configure' time.
 
 Optional Features
 =================
 
-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
-`README' should mention any `--enable-' and `--with-' options that the
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving 'configure' the
+option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'.
+
+   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
+'README' should mention any '--enable-' and '--with-' options that the
 package recognizes.
 
-   For packages that use the X Window System, `configure' can usually
+   For packages that use the X Window System, 'configure' can usually
 find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
+you can use the 'configure' options '--x-includes=DIR' and
+'--x-libraries=DIR' to specify their locations.
+
+   Some packages offer the ability to configure how verbose the
+execution of 'make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with 'make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with 'make V=0'.
+
+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 -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   HP-UX 'make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as 'configure' are involved.  Use GNU 'make'
+instead.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its '<wchar.h>' 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"
+
+   On Solaris, don't put '/usr/ucb' early in your 'PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in '/usr/bin'.  So, if you need '/usr/ucb'
+in your 'PATH', put it _after_ '/usr/bin'.
+
+   On Haiku, software installed for all users goes in '/boot/common',
+not '/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
 
 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
-`--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:
+   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:
 
      CPU-COMPANY-SYSTEM
 
 where SYSTEM can have one of these forms:
 
-     OS KERNEL-OS
+     OS
+     KERNEL-OS
 
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
+   See the file 'config.sub' for the possible values of each field.  If
+'config.sub' isn't included in this package, then this package doesn't
 need to know the machine type.
 
    If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
+use the option '--target=TYPE' to select the type of system they will
 produce code for.
 
    If you want to _use_ a cross compiler, that generates code for a
 platform different from the build platform, you should specify the
 "host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
+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'.
-`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.
-A warning: not all `configure' scripts look for a site script.
+   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.
+A warning: not all 'configure' scripts look for a site script.
 
 Defining Variables
 ==================
 
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
+   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
-them in the `configure' command line, using `VAR=value'.  For example:
+them in the 'configure' command line, using 'VAR=value'.  For example:
 
      ./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:
+causes the specified 'gcc' to be used as the C compiler (unless it is
+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 limitation.  Until the limitation is lifted, 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 ./configure CONFIG_SHELL=/bin/bash
 
-`configure' Invocation
+'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 all of the options to 'configure', and exit.
 
-`--help'
-`-h'
-     Print a summary 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'
-     Print the version of Autoconf used to generate the `configure'
+'--version'
+'-V'
+     Print the version of Autoconf used to generate the 'configure'
      script, and exit.
 
-`--cache-file=FILE'
+'--cache-file=FILE'
      Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     traditionally 'config.cache'.  FILE defaults to '/dev/null' to
      disable caching.
 
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
+'--config-cache'
+'-C'
+     Alias for '--cache-file=config.cache'.
 
-`--quiet'
-`--silent'
-`-q'
+'--quiet'
+'--silent'
+'-q'
      Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
+     suppress all normal output, redirect it to '/dev/null' (any error
      messages will still be shown).
 
-`--srcdir=DIR'
+'--srcdir=DIR'
      Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
+     '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.
 
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
+'--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.
diff --git a/Makefile.am b/Makefile.am
index 2fb8783..eccb79a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 AUTOMAKE_OPTIONS = 1.7
 
-SUBDIRS = examples gi tests
+SUBDIRS = examples gi tests pygtkcompat
 
 PLATFORM_VERSION = 3.0
 
@@ -9,7 +9,6 @@ CLEANFILES = \
 	`find "$(builddir)" -type f -name "*.pyc" -print`
 
 EXTRA_DIST = \
-	ChangeLog.pre-2.18 \
 	pygobject-$(PLATFORM_VERSION).pc.in \
 	PKG-INFO \
 	PKG-INFO.in \
@@ -145,3 +144,5 @@ check.nemiver:
 
 check.valgrind:
 	cd tests && $(MAKE) check.valgrind
+
+@GNOME_CODE_COVERAGE_RULES@
diff --git a/Makefile.in b/Makefile.in
index 9b644c7..fc397cd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -62,8 +62,10 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	depcomp install-sh ltmain.sh missing py-compile
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \
-	$(top_srcdir)/m4/jhflags.m4 $(top_srcdir)/m4/python.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/jhflags.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.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 \
@@ -186,6 +188,9 @@ CAIRO_LIBS = @CAIRO_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -203,6 +208,7 @@ EXEEXT = @EXEEXT@
 FFI_CFLAGS = @FFI_CFLAGS@
 FFI_LIBS = @FFI_LIBS@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
 GI_CFLAGS = @GI_CFLAGS@
@@ -222,6 +228,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBFFI_PC = @LIBFFI_PC@
@@ -231,7 +238,6 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -331,13 +337,12 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = 1.7
-SUBDIRS = examples gi tests
+SUBDIRS = examples gi tests pygtkcompat
 PLATFORM_VERSION = 3.0
 CLEANFILES = \
 	`find "$(builddir)" -type f -name "*.pyc" -print`
 
 EXTRA_DIST = \
-	ChangeLog.pre-2.18 \
 	pygobject-$(PLATFORM_VERSION).pc.in \
 	PKG-INFO \
 	PKG-INFO.in \
@@ -391,7 +396,7 @@ all: config.h
 .SUFFIXES:
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -418,9 +423,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	$(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
 
@@ -431,7 +436,7 @@ config.h: stamp-h1
 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: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
+$(srcdir)/config.h.in:  $(am__configure_deps) 
 	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
 	rm -f stamp-h1
 	touch $@
@@ -1054,6 +1059,8 @@ check.nemiver:
 check.valgrind:
 	cd tests && $(MAKE) check.valgrind
 
+@GNOME_CODE_COVERAGE_RULES@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/NEWS b/NEWS
index cdfc07c..af8b4e9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,50 @@
+3.7.2   19-Nov-2012
+	- [API change] Drop almost all static GLib bindings and replace them
+	  with proper introspection. This gets rid of several cases where the
+	  PyGObject API was not matching the real GLib API, makes the full GLib
+	  API available through introspection, and makes the code smaller,
+	  easier to maintain. For backwards compatibility, overrides are
+	  provided to emulate the old static binding API, but this will throw a
+	  PyGIDeprecationWarning for the cases that diverge from the official
+	  API (in particular, GLib.io_add_watch() and GLib.child_watch_add()
+	  being called without a priority argument). (Martin Pitt, Simon Feltman)
+	- [API change] Deprecate calling GLib API through the GObject
+	  namespace. This has always been a misnomer with introspection, and
+	  will be removed in a later version; for now this throws a
+	  PyGIDeprecationWarning.
+        - [API change] Do not bind gobject_get_data() and gobject_set_data().
+	  These have been deprecated for a cycle, now dropped entirely.
+	  (Steve Frécinaux) (#641944)
+	- [API change] Deprecate void pointer fields as general PyObject
+	  storage. (Simon Feltman) (#683599)
+        - Add support for GVariant properties (Martin Pitt)
+        - Add type checking to GVariant argument assignment (Martin Pitt)
+        - Fix marshalling of arrays of struct pointers to Python (Carlos Garnacho) (#678620)
+        - Fix Gdk.Atom to have a proper str() and repr() (Martin Pitt) (#678620)
+        - Make sure g_value_set_boxed does not cause a buffer overrun with GStrvs (Simon Feltman) (#688232)
+        - Fix leaks with GValues holding boxed and object types (Simon Feltman) (#688137)
+        - Add doc strings showing method signatures for gi methods (Simon Feltman) (#681967)
+        - Set Property instance doc string and blurb to getter doc string (Simon Feltman) (#688025)
+        - Add GObject.G_MINSSIZE (Martin Pitt)
+        - Fix marshalling of GByteArrays (Martin Pitt)
+        - Fix marshalling of ssize_t to smaller ints (Martin Pitt)
+	- Add support for lcov code coverage, and add a lot of missing
+	  GIMarshallingTests and g-i Regress tests. (Martin Pitt)
+        - pygi-convert: remove deprecated GLib → GObject conversions (Jose Rostagno)
+        - Add support for overriding GObject.Object (Simon Feltman) (#672727)
+        - Add --with-python configure option (Martin Pitt)
+	- Do not prefer unversioned "python" when configuring, as some distros
+	  have "python" as Python 3. Use Python 3 by default if available. Add
+	  --with-python configure option as an alternative to setting $PYTHON,
+	  whic is more discoverable. (Martin Pitt)
+        - Fix property lookup in class hierarchy (Daniel Drake) (#686942)
+        - Move property and signal creation into _class_init() (Martin Pitt) (#686149)
+        - Fix duplicate symbols error on OSX (John Ralls)
+        - [API add] Add get_introspection_module for getting un-overridden modules (Simon Feltman) (#686828)
+        - Work around wrong 64 bit constants in GLib Gir (Martin Pitt) (#685022)
+        - Mark GLib.Source.get_current_time() as deprecated (Martin Pitt)
+        - Fix OverflowError in source_remove() (Martin Pitt) (#684526)
+
 3.7.1   22-Oct-2012
         - Bump version to 3.7.1; let's follow the real GNOME versioning from
           now on (Martin Pitt)
diff --git a/PKG-INFO b/PKG-INFO
index 4efa081..f99ebc9 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: PyGObject
-Version: 3.7.1
+Version: 3.7.2
 Summary: Python bindings for GObject
 Home-page: http://www.pygtk.org/
 Author: James Henstridge
@@ -8,7 +8,7 @@ Author-email: james@daa.com.au
 Maintainer: Johan Dahlin
 Maintainer-email: johan@gnome.org
 License: GNU LGPL
-Download-url: ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/3.7/pygobject-3.7.1.tar.gz
+Download-url: ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/3.7/pygobject-3.7.2.tar.gz
 Description: Python bindings for GLib and GObject
 Platform: POSIX, Windows
 Classifier: Development Status :: 5 - Production/Stable
diff --git a/README b/README
index 9faf852..38fd863 100644
--- a/README
+++ b/README
@@ -36,17 +36,16 @@ New versions of this package can be found at:
 Mailing list
 ============
 
-pygobject share mailing list with pygtk. You can subscribe to it through
-the web interface:
-  http://www.daa.com.au/mailman/listinfo/pygtk
+pygobject development is discussed on the GNOME python-hackers mailing list.
+You can subscribe to it through the web interface:
 
+  https://mail.gnome.org/mailman/listinfo/python-hackers-list/
 
 Requirements
 ============
   * C compiler (GCC and MSVC supported)
-  * Python 2.3.5 or higher
-  * Glib 2.22.4 or higher
-  * GIO 2.22.4 or higher
+  * Python 2.6 or higher
+  * Glib/Gio 2.34.2 or higher
   * libffi (optional)
 
 Copyright Information
@@ -66,12 +65,15 @@ build, it should be as simple as running:
     $ make
     $ make install
 
-If your Python interpreter isn't in the path, or is not called
-"python", you can set the PYTHON environment variable to the full path
-of the interpreter:
+By default, configure searches for a few well-known Python interpreter
+names, such as "python3", "python2", "python2.7", or "python".  If your
+Python interpreter isn't in the path, or is not called "python", you can
+configure pygobject to build against that with --with-python=<path> or
+setting the PYTHON environment variable:
 
-    $ PYTHON=/prefix/bin/python
-    $ export PYTHON
+   $ ./configure --with-python=python3
+   $ PYTHON=python3.2 ./configure
+   $ ./configure --with-python=~/my-patched-python/python
 
 If configure can't find GTK+, you may need to set the PKG_CONFIG_PATH
 environment variable to help it find the libraries.
@@ -96,7 +98,9 @@ Getting Help
 ============
 
 If you have questions about programming with PyGObject, you might want to
-send a message to the mailing list (information on subscribing is
-above).  Alternatively, your question may be answered in the PyGTK FAQ:
+check the documentation on
 
-    http://www.async.com.br/faq/pygtk/?req=index
+  https://live.gnome.org/PyGObject/
+
+If that does not help, send a message to the mailing list (information on
+subscribing is above), or join #python on irc.gnome.org.
diff --git a/aclocal.m4 b/aclocal.m4
index bc0e79b..9bc175c 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -20,6 +20,539 @@ 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
+
+dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject,
+dnl gthread, or gio is specified in MODULES, pass to pkg-config
+dnl
+AC_DEFUN([AM_PATH_GLIB_2_0],
+[dnl 
+dnl Get the cflags and libraries from pkg-config
+dnl
+AC_ARG_ENABLE(glibtest, [  --disable-glibtest      do not try to compile and run a test GLIB program],
+		    , enable_glibtest=yes)
+
+  pkg_config_args=glib-2.0
+  for module in . $4
+  do
+      case "$module" in
+         gmodule) 
+             pkg_config_args="$pkg_config_args gmodule-2.0"
+         ;;
+         gmodule-no-export) 
+             pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
+         ;;
+         gobject) 
+             pkg_config_args="$pkg_config_args gobject-2.0"
+         ;;
+         gthread) 
+             pkg_config_args="$pkg_config_args gthread-2.0"
+         ;;
+         gio*) 
+             pkg_config_args="$pkg_config_args $module-2.0"
+         ;;
+      esac
+  done
+
+  PKG_PROG_PKG_CONFIG([0.16])
+
+  no_glib=""
+
+  if test "x$PKG_CONFIG" = x ; then
+    no_glib=yes
+    PKG_CONFIG=no
+  fi
+
+  min_glib_version=ifelse([$1], ,2.0.0,$1)
+  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
+
+  if test x$PKG_CONFIG != xno ; then
+    ## don't try to run the test against uninstalled libtool libs
+    if $PKG_CONFIG --uninstalled $pkg_config_args; then
+	  echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
+	  enable_glibtest=no
+    fi
+
+    if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
+	  :
+    else
+	  no_glib=yes
+    fi
+  fi
+
+  if test x"$no_glib" = x ; then
+    GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
+    GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
+    GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+    GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0`
+
+    GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
+    GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
+    glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x$enable_glibtest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $GLIB_CFLAGS"
+      LIBS="$GLIB_LIBS $LIBS"
+dnl
+dnl Now check if the installed GLIB is sufficiently new. (Also sanity
+dnl checks the results of pkg-config to some extent)
+dnl
+      rm -f conf.glibtest
+      AC_TRY_RUN([
+#include <glib.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int 
+main ()
+{
+  unsigned int major, minor, micro;
+  char *tmp_version;
+
+  fclose (fopen ("conf.glibtest", "w"));
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup("$min_glib_version");
+  if (sscanf(tmp_version, "%u.%u.%u", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_glib_version");
+     exit(1);
+   }
+
+  if ((glib_major_version != $glib_config_major_version) ||
+      (glib_minor_version != $glib_config_minor_version) ||
+      (glib_micro_version != $glib_config_micro_version))
+    {
+      printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
+             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
+             glib_major_version, glib_minor_version, glib_micro_version);
+      printf ("*** was found! If pkg-config was correct, then it is best\n");
+      printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
+      printf("*** to point to the correct configuration files\n");
+    } 
+  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
+	   (glib_minor_version != GLIB_MINOR_VERSION) ||
+           (glib_micro_version != GLIB_MICRO_VERSION))
+    {
+      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
+	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+	     glib_major_version, glib_minor_version, glib_micro_version);
+    }
+  else
+    {
+      if ((glib_major_version > major) ||
+        ((glib_major_version == major) && (glib_minor_version > minor)) ||
+        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n",
+               glib_major_version, glib_minor_version, glib_micro_version);
+        printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n",
+	       major, minor, micro);
+        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
+        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_glib" = x ; then
+     AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     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/"
+     else
+       if test -f conf.glibtest ; then
+        :
+       else
+          echo "*** Could not run GLIB test program, checking why..."
+          ac_save_CFLAGS="$CFLAGS"
+          ac_save_LIBS="$LIBS"
+          CFLAGS="$CFLAGS $GLIB_CFLAGS"
+          LIBS="$LIBS $GLIB_LIBS"
+          AC_TRY_LINK([
+#include <glib.h>
+#include <stdio.h>
+],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
+        [ 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"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          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" ],
+        [ 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."])
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GLIB_CFLAGS=""
+     GLIB_LIBS=""
+     GLIB_GENMARSHAL=""
+     GOBJECT_QUERY=""
+     GLIB_MKENUMS=""
+     GLIB_COMPILE_RESOURCES=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(GLIB_CFLAGS)
+  AC_SUBST(GLIB_LIBS)
+  AC_SUBST(GLIB_GENMARSHAL)
+  AC_SUBST(GOBJECT_QUERY)
+  AC_SUBST(GLIB_MKENUMS)
+  AC_SUBST(GLIB_COMPILE_RESOURCES)
+  rm -f conf.glibtest
+])
+
+dnl GNOME_CODE_COVERAGE
+dnl
+dnl Defines CODE_COVERAGE_CFLAGS and CODE_COVERAGE_LDFLAGS which should be
+dnl included in the CFLAGS and LIBS/LDFLAGS variables of every build target
+dnl (program or library) which should be built with code coverage support.
+dnl Also defines GNOME_CODE_COVERAGE_RULES which should be substituted in your
+dnl Makefile; and $enable_code_coverage which can be used in subsequent
+dnl configure output.
+dnl
+dnl Note that all optimisation flags in CFLAGS must be disabled when code
+dnl coverage is enabled.
+dnl
+dnl Derived from Makefile.decl in GLib, originally licenced under LGPLv2.1+.
+dnl This file is licenced under GPLv3. For the full gnome-common licence
+dnl (GPLv3), see the COPYING file.
+dnl
+dnl Usage example:
+dnl configure.ac:
+dnl    GNOME_CODE_COVERAGE
+dnl
+dnl Makefile.am:
+dnl    @GNOME_CODE_COVERAGE_RULES@
+dnl    my_program_LIBS = … $(CODE_COVERAGE_LDFLAGS) …
+dnl    my_program_CFLAGS = … $(CODE_COVERAGE_CFLAGS) …
+dnl
+dnl This results in a “check-code-coverage” rule being added to any Makefile.am
+dnl which includes “@GNOME_CODE_COVERAGE_RULES@” (assuming the module has been
+dnl configured with --enable-code-coverage). Running `make check-code-coverage`
+dnl in that directory will run the module’s test suite (`make check`) and build
+dnl a code coverage report detailing the code which was touched, then print the
+dnl URI for the report.
+
+AC_DEFUN([GNOME_CODE_COVERAGE],[
+	dnl Check for --enable-code-coverage
+	AC_MSG_CHECKING([whether to build with code coverage support])
+	AC_ARG_ENABLE([code-coverage], AS_HELP_STRING([--enable-code-coverage], [Whether to enable code coverage support]),, enable_code_coverage=no)
+	AM_CONDITIONAL([CODE_COVERAGE_ENABLED], [test x$enable_code_coverage = xyes])
+	AC_SUBST([CODE_COVERAGE_ENABLED], [$enable_code_coverage])
+	AC_MSG_RESULT($enable_code_coverage)
+
+	AS_IF([ test "$enable_code_coverage" = "yes" ], [
+		dnl Check if gcc is being used
+		AS_IF([ test "$GCC" = "no" ], [
+			AC_MSG_ERROR([not compiling with gcc, which is required for gcov code coverage])
+		])
+
+		# List of supported lcov versions.
+		lcov_version_list="1.6 1.7 1.8 1.9"
+
+		AC_CHECK_PROG([LCOV], [lcov], [lcov])
+		AC_CHECK_PROG([GENHTML], [genhtml], [genhtml])
+
+		AS_IF([ test "$LCOV" ], [
+			AC_CACHE_CHECK([for lcov version], gnome_cv_lcov_version, [
+				gnome_cv_lcov_version=invalid
+				lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'`
+				for lcov_check_version in $lcov_version_list; do
+					if test "$lcov_version" = "$lcov_check_version"; then
+						gnome_cv_lcov_version="$lcov_check_version (ok)"
+					fi
+				done
+			])
+		], [
+			lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list"
+			AC_MSG_ERROR([$lcov_msg])
+		])
+
+		case $gnome_cv_lcov_version in
+			""|invalid[)]
+				lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)."
+				AC_MSG_ERROR([$lcov_msg])
+				LCOV="exit 0;"
+			;;
+		esac
+
+		AS_IF([ test -z "$GENHTML" ], [
+			AC_MSG_ERROR([Could not find genhtml from the lcov package])
+		])
+
+		dnl Build the code coverage flags
+		CODE_COVERAGE_CFLAGS="-O0 -g -fprofile-arcs -ftest-coverage"
+		CODE_COVERAGE_LDFLAGS="-lgcov"
+
+		AC_SUBST([CODE_COVERAGE_CFLAGS])
+		AC_SUBST([CODE_COVERAGE_LDFLAGS])
+	])
+
+GNOME_CODE_COVERAGE_RULES='
+# Code coverage
+#
+# Optional:
+#  - CODE_COVERAGE_DIRECTORY: Top-level directory for code coverage reporting.
+#    (Default: $(top_builddir))
+#  - CODE_COVERAGE_OUTPUT_FILE: Filename and path for the .info file generated
+#    by lcov for code coverage. (Default:
+#    $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info)
+#  - CODE_COVERAGE_OUTPUT_DIRECTORY: Directory for generated code coverage
+#    reports to be created. (Default:
+#    $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage)
+#  - CODE_COVERAGE_LCOV_OPTIONS: Extra options to pass to the lcov instance.
+#    (Default: empty)
+#  - CODE_COVERAGE_GENHTML_OPTIONS: Extra options to pass to the genhtml
+#    instance. (Default: empty)
+#
+# The generated report will be titled using the $(PACKAGE_NAME) and
+# $(PACKAGE_VERSION). In order to add the current git hash to the title,
+# use the git-version-gen script, available online.
+
+# Optional variables
+CODE_COVERAGE_DIRECTORY ?= $(top_builddir)
+CODE_COVERAGE_OUTPUT_FILE ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info
+CODE_COVERAGE_OUTPUT_DIRECTORY ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage
+CODE_COVERAGE_LCOV_OPTIONS ?=
+CODE_COVERAGE_GENHTML_OPTIONS ?=
+
+# Use recursive makes in order to ignore errors during check
+check-code-coverage:
+ifdef CODE_COVERAGE_ENABLED
+	-$(MAKE) $(AM_MAKEFLAGS) -k check
+	$(MAKE) $(AM_MAKEFLAGS) code-coverage-capture
+else
+	@echo "Need to reconfigure with --enable-code-coverage"
+endif
+
+# Capture code coverage data
+code-coverage-capture: code-coverage-capture-hook
+ifdef CODE_COVERAGE_ENABLED
+	$(LCOV) --directory $(CODE_COVERAGE_DIRECTORY) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_OPTIONS)
+	$(LCOV) --directory $(CODE_COVERAGE_DIRECTORY) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" --output-file "$(CODE_COVERAGE_OUTPUT_FILE)"
+	-rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp
+	LANG=C $(GENHTML) --prefix $(CODE_COVERAGE_DIRECTORY) --output-directory "$(CODE_COVERAGE_OUTPUT_DIRECTORY)" --title "$(PACKAGE_NAME)-$(PACKAGE_VERSION) Code Coverage" --legend --show-details "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_GENHTML_OPTIONS)
+	@echo "file://$(abs_builddir)/$(CODE_COVERAGE_OUTPUT_DIRECTORY)/index.html"
+else
+	@echo "Need to reconfigure with --enable-code-coverage"
+endif
+
+# Hook rule executed before code-coverage-capture, overridable by the user
+code-coverage-capture-hook:
+
+clean: code-coverage-clean
+code-coverage-clean:
+	-$(LCOV) --directory $(top_builddir) -z
+	-rm -rf $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_FILE).tmp $(CODE_COVERAGE_OUTPUT_DIRECTORY)
+	-find . -name "*.gcda" -o -name "*.gcov" -delete
+
+GITIGNOREFILES ?=
+GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY)
+
+DISTCHECK_CONFIGURE_FLAGS ?=
+DISTCHECK_CONFIGURE_FLAGS += --disable-code-coverage
+
+.PHONY: check-code-coverage code-coverage-capture code-coverage-capture-hook code-coverage-clean
+'
+
+	AC_SUBST([GNOME_CODE_COVERAGE_RULES])
+	m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([GNOME_CODE_COVERAGE_RULES])])
+])
+
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
+# 
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_default([$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+   	AC_MSG_RESULT([no])
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+        ])
+elif test $pkg_failed = untried; then
+     	AC_MSG_RESULT([no])
+	m4_default([$4], [AC_MSG_FAILURE(
+[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.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	$3
+fi[]dnl
+])# PKG_CHECK_MODULES
+
 # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
 # Foundation, Inc.
 #
@@ -635,46 +1168,6 @@ 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, 2008,
-# 2011 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 5
-
-# AM_MAINTAINER_MODE([DEFAULT-MODE])
-# ----------------------------------
-# Control maintainer-specific portions of Makefiles.
-# Default is to disable them, unless `enable' is passed literally.
-# For symmetry, `disable' may be passed as well.  Anyway, the user
-# can override the default with the --enable/--disable switch.
-AC_DEFUN([AM_MAINTAINER_MODE],
-[m4_case(m4_default([$1], [disable]),
-       [enable], [m4_define([am_maintainer_other], [disable])],
-       [disable], [m4_define([am_maintainer_other], [enable])],
-       [m4_define([am_maintainer_other], [enable])
-        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
-  AC_ARG_ENABLE([maintainer-mode],
-[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer],
-      [USE_MAINTAINER_MODE=$enableval],
-      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
-  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST([MAINT])dnl
-]
-)
-
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
 # Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
@@ -1360,8985 +1853,9 @@ AC_SUBST([am__untar])
 
 m4_include([m4/as-ac-expand.m4])
 m4_include([m4/jhflags.m4])
+m4_include([m4/libtool.m4])
+m4_include([m4/ltoptions.m4])
+m4_include([m4/ltsugar.m4])
+m4_include([m4/ltversion.m4])
+m4_include([m4/lt~obsolete.m4])
 m4_include([m4/python.m4])
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-# 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.
-
-m4_define([_LT_COPYING], [dnl
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-])
-
-# serial 57 LT_INIT
-
-
-# LT_PREREQ(VERSION)
-# ------------------
-# Complain and exit if this libtool version is less that VERSION.
-m4_defun([LT_PREREQ],
-[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
-       [m4_default([$3],
-		   [m4_fatal([Libtool version $1 or higher is required],
-		             63)])],
-       [$2])])
-
-
-# _LT_CHECK_BUILDDIR
-# ------------------
-# Complain if the absolute build directory name contains unusual characters
-m4_defun([_LT_CHECK_BUILDDIR],
-[case `pwd` in
-  *\ * | *\	*)
-    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-esac
-])
-
-
-# LT_INIT([OPTIONS])
-# ------------------
-AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-AC_BEFORE([$0], [LT_LANG])dnl
-AC_BEFORE([$0], [LT_OUTPUT])dnl
-AC_BEFORE([$0], [LTDL_INIT])dnl
-m4_require([_LT_CHECK_BUILDDIR])dnl
-
-dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-dnl unless we require an AC_DEFUNed macro:
-AC_REQUIRE([LTOPTIONS_VERSION])dnl
-AC_REQUIRE([LTSUGAR_VERSION])dnl
-AC_REQUIRE([LTVERSION_VERSION])dnl
-AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-m4_require([_LT_PROG_LTMAIN])dnl
-
-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
-
-dnl Parse OPTIONS
-_LT_SET_OPTIONS([$0], [$1])
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-_LT_SETUP
-
-# Only expand once:
-m4_define([LT_INIT])
-])# LT_INIT
-
-# Old names:
-AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-])
-
-
-# _LT_FILEUTILS_DEFAULTS
-# ----------------------
-# It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
-m4_defun([_LT_FILEUTILS_DEFAULTS],
-[: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-])# _LT_FILEUTILS_DEFAULTS
-
-
-# _LT_SETUP
-# ---------
-m4_defun([_LT_SETUP],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
-
-_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
-dnl
-_LT_DECL([], [host_alias], [0], [The host system])dnl
-_LT_DECL([], [host], [0])dnl
-_LT_DECL([], [host_os], [0])dnl
-dnl
-_LT_DECL([], [build_alias], [0], [The build system])dnl
-_LT_DECL([], [build], [0])dnl
-_LT_DECL([], [build_os], [0])dnl
-dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-test -z "$LN_S" && LN_S="ln -s"
-_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
-dnl
-AC_REQUIRE([LT_CMD_MAX_LEN])dnl
-_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
-_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
-dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
-m4_require([_LT_CMD_RELOAD])dnl
-m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
-m4_require([_LT_CMD_OLD_ARCHIVE])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_WITH_SYSROOT])dnl
-
-_LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-])
-if test -n "${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-_LT_CHECK_OBJDIR
-
-m4_require([_LT_TAG_COMPILER])dnl
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-_LT_CC_BASENAME([$compiler])
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    _LT_PATH_MAGIC
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-LT_SUPPORTED_TAG([CC])
-_LT_LANG_C_CONFIG
-_LT_LANG_DEFAULT_CONFIG
-_LT_CONFIG_COMMANDS
-])# _LT_SETUP
-
-
-# _LT_PREPARE_SED_QUOTE_VARS
-# --------------------------
-# Define a few sed substitution that help us do robust quoting.
-m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
-[# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-])
-
-# _LT_PROG_LTMAIN
-# ---------------
-# Note that this code is called both from `configure', and `config.status'
-# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
-# `config.status' has no value for ac_aux_dir unless we are using Automake,
-# so we pass a copy along to make sure it has a sensible value anyway.
-m4_defun([_LT_PROG_LTMAIN],
-[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
-_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-ltmain="$ac_aux_dir/ltmain.sh"
-])# _LT_PROG_LTMAIN
-
-
-
-# So that we can recreate a full libtool script including additional
-# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the `libtool'
-# label.
-
-
-# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
-# ----------------------------------------
-# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL_INIT],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_INIT])
-
-
-# _LT_CONFIG_LIBTOOL([COMMANDS])
-# ------------------------------
-# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
-
-
-# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
-# -----------------------------------------------------
-m4_defun([_LT_CONFIG_SAVE_COMMANDS],
-[_LT_CONFIG_LIBTOOL([$1])
-_LT_CONFIG_LIBTOOL_INIT([$2])
-])
-
-
-# _LT_FORMAT_COMMENT([COMMENT])
-# -----------------------------
-# Add leading comment marks to the start of each line, and a trailing
-# full-stop to the whole comment if one is not present already.
-m4_define([_LT_FORMAT_COMMENT],
-[m4_ifval([$1], [
-m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
-              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
-)])
-
-
-
-
-
-# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
-# -------------------------------------------------------------------
-# CONFIGNAME is the name given to the value in the libtool script.
-# VARNAME is the (base) name used in the configure script.
-# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-# VARNAME.  Any other value will be used directly.
-m4_define([_LT_DECL],
-[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
-    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
-	[m4_ifval([$1], [$1], [$2])])
-    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
-    m4_ifval([$4],
-	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
-    lt_dict_add_subkey([lt_decl_dict], [$2],
-	[tagged?], [m4_ifval([$5], [yes], [no])])])
-])
-
-
-# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
-# --------------------------------------------------------
-m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
-
-
-# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_tag_varnames],
-[_lt_decl_filter([tagged?], [yes], $@)])
-
-
-# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
-# ---------------------------------------------------------
-m4_define([_lt_decl_filter],
-[m4_case([$#],
-  [0], [m4_fatal([$0: too few arguments: $#])],
-  [1], [m4_fatal([$0: too few arguments: $#: $1])],
-  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
-  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
-  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
-])
-
-
-# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
-# --------------------------------------------------
-m4_define([lt_decl_quote_varnames],
-[_lt_decl_filter([value], [1], $@)])
-
-
-# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_dquote_varnames],
-[_lt_decl_filter([value], [2], $@)])
-
-
-# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_varnames_tagged],
-[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...])
-# ------------------------------------------------
-m4_define([lt_decl_all_varnames],
-[_$0(m4_quote(m4_default([$1], [[, ]])),
-     m4_if([$2], [],
-	   m4_quote(lt_decl_varnames),
-	m4_quote(m4_shift($@))))[]dnl
-])
-m4_define([_lt_decl_all_varnames],
-[lt_join($@, lt_decl_varnames_tagged([$1],
-			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
-])
-
-
-# _LT_CONFIG_STATUS_DECLARE([VARNAME])
-# ------------------------------------
-# Quote a variable value, and forward it to `config.status' so that its
-# declaration there will have the same value as in `configure'.  VARNAME
-# must have a single quote delimited value for this to work.
-m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
-
-
-# _LT_CONFIG_STATUS_DECLARATIONS
-# ------------------------------
-# We delimit libtool config variables with single quotes, so when
-# we write them to config.status, we have to be sure to quote all
-# embedded single quotes properly.  In configure, this macro expands
-# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-#
-#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
-m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
-    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAGS
-# ----------------
-# Output comment and list of tags supported by the script
-m4_defun([_LT_LIBTOOL_TAGS],
-[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-available_tags="_LT_TAGS"dnl
-])
-
-
-# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
-# -----------------------------------
-# Extract the dictionary values for VARNAME (optionally with TAG) and
-# expand to a commented shell variable setting:
-#
-#    # Some comment about what VAR is for.
-#    visible_name=$lt_internal_name
-m4_define([_LT_LIBTOOL_DECLARE],
-[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
-					   [description])))[]dnl
-m4_pushdef([_libtool_name],
-    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
-m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
-    [0], [_libtool_name=[$]$1],
-    [1], [_libtool_name=$lt_[]$1],
-    [2], [_libtool_name=$lt_[]$1],
-    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
-m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
-])
-
-
-# _LT_LIBTOOL_CONFIG_VARS
-# -----------------------
-# Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
-# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
-# section) are produced by _LT_LIBTOOL_TAG_VARS.
-m4_defun([_LT_LIBTOOL_CONFIG_VARS],
-[m4_foreach([_lt_var],
-    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAG_VARS(TAG)
-# -------------------------
-m4_define([_LT_LIBTOOL_TAG_VARS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
-
-
-# _LT_TAGVAR(VARNAME, [TAGNAME])
-# ------------------------------
-m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
-
-
-# _LT_CONFIG_COMMANDS
-# -------------------
-# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
-# variables for single and double quote escaping we saved from calls
-# to _LT_DECL, we can put quote escaped variables declarations
-# into `config.status', and then the shell code to quote escape them in
-# for loops in `config.status'.  Finally, any additional code accumulated
-# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
-m4_defun([_LT_CONFIG_COMMANDS],
-[AC_PROVIDE_IFELSE([LT_OUTPUT],
-	dnl If the libtool generation code has been placed in $CONFIG_LT,
-	dnl instead of duplicating it all over again into config.status,
-	dnl then we will have config.status run $CONFIG_LT later, so it
-	dnl needs to know what name is stored there:
-        [AC_CONFIG_COMMANDS([libtool],
-            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
-    dnl If the libtool generation code is destined for config.status,
-    dnl expand the accumulated commands and init code now:
-    [AC_CONFIG_COMMANDS([libtool],
-        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
-])#_LT_CONFIG_COMMANDS
-
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
-[
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-_LT_CONFIG_STATUS_DECLARATIONS
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$[]1
-_LTECHO_EOF'
-}
-
-# Quote evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-_LT_OUTPUT_LIBTOOL_INIT
-])
-
-# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
-# ------------------------------------
-# Generate a child script FILE with all initialization necessary to
-# reuse the environment learned by the parent script, and make the
-# file executable.  If COMMENT is supplied, it is inserted after the
-# `#!' sequence but before initialization text begins.  After this
-# macro, additional text can be appended to FILE to form the body of
-# the child script.  The macro ends with non-zero status if the
-# file could not be fully written (such as if the disk is full).
-m4_ifdef([AS_INIT_GENERATED],
-[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
-[m4_defun([_LT_GENERATED_FILE_INIT],
-[m4_require([AS_PREPARE])]dnl
-[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
-[lt_write_fail=0
-cat >$1 <<_ASEOF || lt_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-$2
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$1 <<\_ASEOF || lt_write_fail=1
-AS_SHELL_SANITIZE
-_AS_PREPARE
-exec AS_MESSAGE_FD>&1
-_ASEOF
-test $lt_write_fail = 0 && chmod +x $1[]dnl
-m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
-
-# LT_OUTPUT
-# ---------
-# This macro allows early generation of the libtool script (before
-# AC_OUTPUT is called), incase it is used in configure for compilation
-# tests.
-AC_DEFUN([LT_OUTPUT],
-[: ${CONFIG_LT=./config.lt}
-AC_MSG_NOTICE([creating $CONFIG_LT])
-_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
-[# Run this file to recreate a libtool stub with the current configuration.])
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-lt_cl_silent=false
-exec AS_MESSAGE_LOG_FD>>config.log
-{
-  echo
-  AS_BOX([Running $as_me.])
-} >&AS_MESSAGE_LOG_FD
-
-lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
-for use in further configure time tests before the real libtool is
-generated.
-
-Usage: $[0] [[OPTIONS]]
-
-  -h, --help      print this help, then exit
-  -V, --version   print version number, then exit
-  -q, --quiet     do not print progress messages
-  -d, --debug     don't remove temporary files
-
-Report bugs to <bug-libtool@gnu.org>."
-
-lt_cl_version="\
-m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
-configured by $[0], generated by m4_PACKAGE_STRING.
-
-Copyright (C) 2011 Free Software Foundation, Inc.
-This config.lt script is free software; the Free Software Foundation
-gives unlimited permision to copy, distribute and modify it."
-
-while test $[#] != 0
-do
-  case $[1] in
-    --version | --v* | -V )
-      echo "$lt_cl_version"; exit 0 ;;
-    --help | --h* | -h )
-      echo "$lt_cl_help"; exit 0 ;;
-    --debug | --d* | -d )
-      debug=: ;;
-    --quiet | --q* | --silent | --s* | -q )
-      lt_cl_silent=: ;;
-
-    -*) AC_MSG_ERROR([unrecognized option: $[1]
-Try \`$[0] --help' for more information.]) ;;
-
-    *) AC_MSG_ERROR([unrecognized argument: $[1]
-Try \`$[0] --help' for more information.]) ;;
-  esac
-  shift
-done
-
-if $lt_cl_silent; then
-  exec AS_MESSAGE_FD>/dev/null
-fi
-_LTEOF
-
-cat >>"$CONFIG_LT" <<_LTEOF
-_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AC_MSG_NOTICE([creating $ofile])
-_LT_OUTPUT_LIBTOOL_COMMANDS
-AS_EXIT(0)
-_LTEOF
-chmod +x "$CONFIG_LT"
-
-# configure is writing to config.log, but config.lt does its own redirection,
-# appending to config.log, which fails on DOS, as config.log is still kept
-# open by configure.  Here we exec the FD to /dev/null, effectively closing
-# config.log, so it can be properly (re)opened and appended to by config.lt.
-lt_cl_success=:
-test "$silent" = yes &&
-  lt_config_lt_args="$lt_config_lt_args --quiet"
-exec AS_MESSAGE_LOG_FD>/dev/null
-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-exec AS_MESSAGE_LOG_FD>>config.log
-$lt_cl_success || AS_EXIT(1)
-])# LT_OUTPUT
-
-
-# _LT_CONFIG(TAG)
-# ---------------
-# If TAG is the built-in tag, create an initial libtool script with a
-# default configuration from the untagged config vars.  Otherwise add code
-# to config.status for appending the configuration named by TAG from the
-# matching tagged config vars.
-m4_defun([_LT_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_CONFIG_SAVE_COMMANDS([
-  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
-  m4_if(_LT_TAG, [C], [
-    # See if we are running on zsh, and set the options which allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile="${ofile}T"
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-_LT_COPYING
-_LT_LIBTOOL_TAGS
-
-# ### BEGIN LIBTOOL CONFIG
-_LT_LIBTOOL_CONFIG_VARS
-_LT_LIBTOOL_TAG_VARS
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-  _LT_PROG_LTMAIN
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
-     || (rm -f "$cfgfile"; exit 1)
-
-  _LT_PROG_REPLACE_SHELLFNS
-
-   mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-],
-[cat <<_LT_EOF >> "$ofile"
-
-dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
-dnl in a comment (ie after a #).
-# ### BEGIN LIBTOOL TAG CONFIG: $1
-_LT_LIBTOOL_TAG_VARS(_LT_TAG)
-# ### END LIBTOOL TAG CONFIG: $1
-_LT_EOF
-])dnl /m4_if
-],
-[m4_if([$1], [], [
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
-    RM='$RM'
-    ofile='$ofile'], [])
-])dnl /_LT_CONFIG_SAVE_COMMANDS
-])# _LT_CONFIG
-
-
-# LT_SUPPORTED_TAG(TAG)
-# ---------------------
-# Trace this macro to discover what tags are supported by the libtool
-# --tag option, using:
-#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
-AC_DEFUN([LT_SUPPORTED_TAG], [])
-
-
-# C support is built-in for now
-m4_define([_LT_LANG_C_enabled], [])
-m4_define([_LT_TAGS], [])
-
-
-# LT_LANG(LANG)
-# -------------
-# Enable libtool support for the given language if not already enabled.
-AC_DEFUN([LT_LANG],
-[AC_BEFORE([$0], [LT_OUTPUT])dnl
-m4_case([$1],
-  [C],			[_LT_LANG(C)],
-  [C++],		[_LT_LANG(CXX)],
-  [Go],			[_LT_LANG(GO)],
-  [Java],		[_LT_LANG(GCJ)],
-  [Fortran 77],		[_LT_LANG(F77)],
-  [Fortran],		[_LT_LANG(FC)],
-  [Windows Resource],	[_LT_LANG(RC)],
-  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
-    [_LT_LANG($1)],
-    [m4_fatal([$0: unsupported language: "$1"])])])dnl
-])# LT_LANG
-
-
-# _LT_LANG(LANGNAME)
-# ------------------
-m4_defun([_LT_LANG],
-[m4_ifdef([_LT_LANG_]$1[_enabled], [],
-  [LT_SUPPORTED_TAG([$1])dnl
-  m4_append([_LT_TAGS], [$1 ])dnl
-  m4_define([_LT_LANG_]$1[_enabled], [])dnl
-  _LT_LANG_$1_CONFIG($1)])dnl
-])# _LT_LANG
-
-
-m4_ifndef([AC_PROG_GO], [
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-m4_defun([AC_PROG_GO],
-[AC_LANG_PUSH(Go)dnl
-AC_ARG_VAR([GOC],     [Go compiler command])dnl
-AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
-_AC_ARG_VAR_LDFLAGS()dnl
-AC_CHECK_TOOL(GOC, gccgo)
-if test -z "$GOC"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
-  fi
-fi
-if test -z "$GOC"; then
-  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
-fi
-])#m4_defun
-])#m4_ifndef
-
-
-# _LT_LANG_DEFAULT_CONFIG
-# -----------------------
-m4_defun([_LT_LANG_DEFAULT_CONFIG],
-[AC_PROVIDE_IFELSE([AC_PROG_CXX],
-  [LT_LANG(CXX)],
-  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_F77],
-  [LT_LANG(F77)],
-  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_FC],
-  [LT_LANG(FC)],
-  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
-
-dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
-dnl pulling things in needlessly.
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-  [LT_LANG(GCJ)],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-    [LT_LANG(GCJ)],
-    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
-      [LT_LANG(GCJ)],
-      [m4_ifdef([AC_PROG_GCJ],
-	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([A][M_PROG_GCJ],
-	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([LT_PROG_GCJ],
-	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
-
-AC_PROVIDE_IFELSE([AC_PROG_GO],
-  [LT_LANG(GO)],
-  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
-
-AC_PROVIDE_IFELSE([LT_PROG_RC],
-  [LT_LANG(RC)],
-  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
-])# _LT_LANG_DEFAULT_CONFIG
-
-# Obsolete macros:
-AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
-AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
-AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
-AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
-dnl AC_DEFUN([AC_LIBTOOL_F77], [])
-dnl AC_DEFUN([AC_LIBTOOL_FC], [])
-dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
-dnl AC_DEFUN([AC_LIBTOOL_RC], [])
-
-
-# _LT_TAG_COMPILER
-# ----------------
-m4_defun([_LT_TAG_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
-_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
-_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
-_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_TAG_COMPILER
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-m4_defun([_LT_COMPILER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-m4_defun([_LT_LINKER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-])# _LT_LINKER_BOILERPLATE
-
-# _LT_REQUIRED_DARWIN_CHECKS
-# -------------------------
-m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
-  case $host_os in
-    rhapsody* | darwin*)
-    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-    AC_CHECK_TOOL([LIPO], [lipo], [:])
-    AC_CHECK_TOOL([OTOOL], [otool], [:])
-    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
-    _LT_DECL([], [DSYMUTIL], [1],
-      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
-    _LT_DECL([], [NMEDIT], [1],
-      [Tool to change global to local symbols on Mac OS X])
-    _LT_DECL([], [LIPO], [1],
-      [Tool to manipulate fat objects and archives on Mac OS X])
-    _LT_DECL([], [OTOOL], [1],
-      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
-    _LT_DECL([], [OTOOL64], [1],
-      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
-
-    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-      [lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	# If there is a non-empty error log, and "single_module"
-	# appears in it, assume the flag caused a linker warning
-        if test -s conftest.err && $GREP single_module conftest.err; then
-	  cat conftest.err >&AS_MESSAGE_LOG_FD
-	# Otherwise, if the output was created with a 0 exit code from
-	# the compiler, it worked.
-	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&AS_MESSAGE_LOG_FD
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi])
-
-    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-      [lt_cv_ld_exported_symbols_list],
-      [lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-	[lt_cv_ld_exported_symbols_list=yes],
-	[lt_cv_ld_exported_symbols_list=no])
-	LDFLAGS="$save_LDFLAGS"
-    ])
-
-    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
-      [lt_cv_ld_force_load=no
-      cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
-      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
-      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
-      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
-      cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
-      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-      _lt_result=$?
-      if test -s conftest.err && $GREP force_load conftest.err; then
-	cat conftest.err >&AS_MESSAGE_LOG_FD
-      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
-	lt_cv_ld_force_load=yes
-      else
-	cat conftest.err >&AS_MESSAGE_LOG_FD
-      fi
-        rm -f conftest.err libconftest.a conftest conftest.c
-        rm -rf conftest.dSYM
-    ])
-    case $host_os in
-    rhapsody* | darwin1.[[012]])
-      _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
-      # 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?
-      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' ;;
-	10.[[012]]*)
-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-])
-
-
-# _LT_DARWIN_LINKER_FEATURES([TAG])
-# ---------------------------------
-# Checks for linker and compiler features on darwin
-m4_defun([_LT_DARWIN_LINKER_FEATURES],
-[
-  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_automatic, $1)=yes
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
-                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
-  else
-    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-  fi
-  _LT_TAGVAR(link_all_deplibs, $1)=yes
-  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-  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=func_echo_all
-    _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}"
-    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-    m4_if([$1], [CXX],
-[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-    fi
-],[])
-  else
-  _LT_TAGVAR(ld_shlibs, $1)=no
-  fi
-])
-
-# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
-# ----------------------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-# Store the results from the different compilers for each TAGNAME.
-# Allow to override them for all tags through lt_cv_aix_libpath.
-m4_defun([_LT_SYS_MODULE_PATH_AIX],
-[m4_require([_LT_DECL_SED])dnl
-if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
-  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
-  lt_aix_libpath_sed='[
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }]'
-  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi],[])
-  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
-  fi
-  ])
-  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
-fi
-])# _LT_SYS_MODULE_PATH_AIX
-
-
-# _LT_SHELL_INIT(ARG)
-# -------------------
-m4_define([_LT_SHELL_INIT],
-[m4_divert_text([M4SH-INIT], [$1
-])])# _LT_SHELL_INIT
-
-
-
-# _LT_PROG_ECHO_BACKSLASH
-# -----------------------
-# Find how we can fake an echo command that does not interpret backslash.
-# In particular, with Autoconf 2.60 or later we add some code to the start
-# of the generated configure script which will find a shell with a builtin
-# printf (which we can use as an echo command).
-m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-AC_MSG_CHECKING([how to print strings])
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='printf %s\n'
-else
-  # Use this function as a fallback that always works.
-  func_fallback_echo ()
-  {
-    eval 'cat <<_LTECHO_EOF
-$[]1
-_LTECHO_EOF'
-  }
-  ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO "$*" 
-}
-
-case "$ECHO" in
-  printf*) AC_MSG_RESULT([printf]) ;;
-  print*) AC_MSG_RESULT([print -r]) ;;
-  *) AC_MSG_RESULT([cat]) ;;
-esac
-
-m4_ifdef([_AS_DETECT_SUGGESTED],
-[_AS_DETECT_SUGGESTED([
-  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
-    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-    PATH=/empty FPATH=/empty; export PATH FPATH
-    test "X`printf %s $ECHO`" = "X$ECHO" \
-      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
-
-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
-])# _LT_PROG_ECHO_BACKSLASH
-
-
-# _LT_WITH_SYSROOT
-# ----------------
-AC_DEFUN([_LT_WITH_SYSROOT],
-[AC_MSG_CHECKING([for sysroot])
-AC_ARG_WITH([sysroot],
-[  --with-sysroot[=DIR] Search for dependent libraries within DIR
-                        (or the compiler's sysroot if not specified).],
-[], [with_sysroot=no])
-
-dnl lt_sysroot will always be passed unquoted.  We quote it here
-dnl in case the user passed a directory name.
-lt_sysroot=
-case ${with_sysroot} in #(
- yes)
-   if test "$GCC" = yes; then
-     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-   fi
-   ;; #(
- /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
-   ;; #(
- no|'')
-   ;; #(
- *)
-   AC_MSG_RESULT([${with_sysroot}])
-   AC_MSG_ERROR([The sysroot must be an absolute path.])
-   ;;
-esac
-
- AC_MSG_RESULT([${lt_sysroot:-no}])
-_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
-[dependent libraries, and in which our libraries should be installed.])])
-
-# _LT_ENABLE_LOCK
-# ---------------
-m4_defun([_LT_ENABLE_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
-  [AS_HELP_STRING([--disable-libtool-lock],
-    [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-	HPUX_IA64_MODE="32"
-	;;
-      *ELF-64*)
-	HPUX_IA64_MODE="64"
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -melf32bsmip"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -melf32bmipn32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -melf64bmip"
-	;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -32"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -n32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -64"
-	  ;;
-      esac
-    fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_i386_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
-	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
-	    LD="${LD-ld} -m elf32ppclinux"
-	    ;;
-	  s390x-*linux*)
-	    LD="${LD-ld} -m elf_s390"
-	    ;;
-	  sparc64-*linux*)
-	    LD="${LD-ld} -m elf32_sparc"
-	    ;;
-	esac
-	;;
-      *64-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
-	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
-	    LD="${LD-ld} -m elf64ppc"
-	    ;;
-	  s390*-*linux*|s390*-*tpf*)
-	    LD="${LD-ld} -m elf64_s390"
-	    ;;
-	  sparc*-*linux*)
-	    LD="${LD-ld} -m elf64_sparc"
-	    ;;
-	esac
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_PUSH(C)
-     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_POP])
-  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"
-  fi
-  ;;
-*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*)
-        case $host in
-        i?86-*-solaris*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        sparc*-*-solaris*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-        esac
-        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
-        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-          LD="${LD-ld}_sol2"
-        fi
-        ;;
-      *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
-
-need_locks="$enable_libtool_lock"
-])# _LT_ENABLE_LOCK
-
-
-# _LT_PROG_AR
-# -----------
-m4_defun([_LT_PROG_AR],
-[AC_CHECK_TOOLS(AR, [ar], false)
-: ${AR=ar}
-: ${AR_FLAGS=cru}
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
-
-AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
-  [lt_cv_ar_at_file=no
-   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
-     [echo conftest.$ac_objext > conftest.lst
-      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
-      AC_TRY_EVAL([lt_ar_try])
-      if test "$ac_status" -eq 0; then
-	# Ensure the archiver fails upon bogus file names.
-	rm -f conftest.$ac_objext libconftest.a
-	AC_TRY_EVAL([lt_ar_try])
-	if test "$ac_status" -ne 0; then
-          lt_cv_ar_at_file=@
-        fi
-      fi
-      rm -f conftest.* libconftest.a
-     ])
-  ])
-
-if test "x$lt_cv_ar_at_file" = xno; then
-  archiver_list_spec=
-else
-  archiver_list_spec=$lt_cv_ar_at_file
-fi
-_LT_DECL([], [archiver_list_spec], [1],
-  [How to feed a file listing to the archiver])
-])# _LT_PROG_AR
-
-
-# _LT_CMD_OLD_ARCHIVE
-# -------------------
-m4_defun([_LT_CMD_OLD_ARCHIVE],
-[_LT_PROG_AR
-
-AC_CHECK_TOOL(STRIP, strip, :)
-test -z "$STRIP" && STRIP=:
-_LT_DECL([], [STRIP], [1], [A symbol stripping program])
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-test -z "$RANLIB" && RANLIB=:
-_LT_DECL([], [RANLIB], [1],
-    [Commands used to install an old-style archive])
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
-fi
-
-case $host_os in
-  darwin*)
-    lock_old_archive_extraction=yes ;;
-  *)
-    lock_old_archive_extraction=no ;;
-esac
-_LT_DECL([], [old_postinstall_cmds], [2])
-_LT_DECL([], [old_postuninstall_cmds], [2])
-_LT_TAGDECL([], [old_archive_cmds], [2],
-    [Commands used to build an old-style archive])
-_LT_DECL([], [lock_old_archive_extraction], [0],
-    [Whether to use a lock for old archive extraction])
-])# _LT_CMD_OLD_ARCHIVE
-
-
-# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([_LT_COMPILER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -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:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   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.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       $2=yes
-     fi
-   fi
-   $RM conftest*
-])
-
-if test x"[$]$2" = xyes; then
-    m4_if([$5], , :, [$5])
-else
-    m4_if([$6], , :, [$6])
-fi
-])# _LT_COMPILER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
-
-
-# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                  [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------
-# Check whether the given linker option works
-AC_DEFUN([_LT_LINKER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $3"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         $2=yes
-       fi
-     else
-       $2=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-])
-
-if test x"[$]$2" = xyes; then
-    m4_if([$4], , :, [$4])
-else
-    m4_if([$5], , :, [$5])
-fi
-])# _LT_LINKER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
-
-
-# LT_CMD_MAX_LEN
-#---------------
-AC_DEFUN([LT_CMD_MAX_LEN],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-  i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  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,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  mint*)
-    # On MiNT this can take a long time and run out of memory.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  os2*)
-    # The test takes a long time on OS/2.
-    lt_cv_sys_max_cmd_len=8192
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
-	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-])
-if test -n $lt_cv_sys_max_cmd_len ; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
-  AC_MSG_RESULT(none)
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-_LT_DECL([], [max_cmd_len], [0],
-    [What is the maximum length of a command?])
-])# LT_CMD_MAX_LEN
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
-
-
-# _LT_HEADER_DLFCN
-# ----------------
-m4_defun([_LT_HEADER_DLFCN],
-[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
-])# _LT_HEADER_DLFCN
-
-
-# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ----------------------------------------------------------------
-m4_defun([_LT_TRY_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
-  [$4]
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-[#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisbility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}]
-_LT_EOF
-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) $1 ;;
-      x$lt_dlneed_uscore) $2 ;;
-      x$lt_dlunknown|x*) $3 ;;
-    esac
-  else :
-    # compilation failed
-    $3
-  fi
-fi
-rm -fr conftest*
-])# _LT_TRY_DLOPEN_SELF
-
-
-# LT_SYS_DLOPEN_SELF
-# ------------------
-AC_DEFUN([LT_SYS_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32* | cegcc*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-    ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-    ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ])
-    ;;
-
-  *)
-    AC_CHECK_FUNC([shl_load],
-	  [lt_cv_dlopen="shl_load"],
-      [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
-	[AC_CHECK_FUNC([dlopen],
-	      [lt_cv_dlopen="dlopen"],
-	  [AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-	    [AC_CHECK_LIB([svld], [dlopen],
-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
-	      ])
-	    ])
-	  ])
-	])
-      ])
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    AC_CACHE_CHECK([whether a program can dlopen itself],
-	  lt_cv_dlopen_self, [dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-    ])
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-	  lt_cv_dlopen_self_static, [dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-      ])
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-_LT_DECL([dlopen_support], [enable_dlopen], [0],
-	 [Whether dlopen is supported])
-_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
-	 [Whether dlopen of programs is supported])
-_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
-	 [Whether dlopen of statically linked programs is supported])
-])# LT_SYS_DLOPEN_SELF
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
-
-
-# _LT_COMPILER_C_O([TAGNAME])
-# ---------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler.
-# This macro does not hard code the compiler like AC_PROG_CC_C_O.
-m4_defun([_LT_COMPILER_C_O],
-[m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -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:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-     fi
-   fi
-   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-])
-_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
-	[Does compiler simultaneously support -c and -o options?])
-])# _LT_COMPILER_C_O
-
-
-# _LT_COMPILER_FILE_LOCKS([TAGNAME])
-# ----------------------------------
-# Check to see if we can do hard links to lock some files if needed
-m4_defun([_LT_COMPILER_FILE_LOCKS],
-[m4_require([_LT_ENABLE_LOCK])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_COMPILER_C_O([$1])
-
-hard_links="nottested"
-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  AC_MSG_CHECKING([if we can lock with hard links])
-  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
-  AC_MSG_RESULT([$hard_links])
-  if test "$hard_links" = no; then
-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
-])# _LT_COMPILER_FILE_LOCKS
-
-
-# _LT_CHECK_OBJDIR
-# ----------------
-m4_defun([_LT_CHECK_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-_LT_DECL([], [objdir], [0],
-         [The name of the directory that contains temporary libtool files])dnl
-m4_pattern_allow([LT_OBJDIR])dnl
-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
-  [Define to the sub-directory in which libtool stores uninstalled libraries.])
-])# _LT_CHECK_OBJDIR
-
-
-# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
-# --------------------------------------
-# Check hardcoding attributes.
-m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
-   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
-   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-
-  # We can hardcode non-existent directories.
-  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
-    # Linking always hardcodes the temporary library directory.
-    _LT_TAGVAR(hardcode_action, $1)=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_TAGVAR(hardcode_action, $1)=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  _LT_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
-
-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
-   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-_LT_TAGDECL([], [hardcode_action], [0],
-    [How to hardcode a shared library path into an executable])
-])# _LT_LINKER_HARDCODE_LIBPATH
-
-
-# _LT_CMD_STRIPLIB
-# ----------------
-m4_defun([_LT_CMD_STRIPLIB],
-[m4_require([_LT_DECL_EGREP])
-striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-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"
-  AC_MSG_RESULT([yes])
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP" ; then
-      striplib="$STRIP -x"
-      old_striplib="$STRIP -S"
-      AC_MSG_RESULT([yes])
-    else
-      AC_MSG_RESULT([no])
-    fi
-    ;;
-  *)
-    AC_MSG_RESULT([no])
-    ;;
-  esac
-fi
-_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
-_LT_DECL([], [striplib], [1])
-])# _LT_CMD_STRIPLIB
-
-
-# _LT_SYS_DYNAMIC_LINKER([TAG])
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-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
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-AC_MSG_CHECKING([dynamic linker characteristics])
-m4_if([$1],
-	[], [
-if test "$GCC" = yes; then
-  case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
-  esac
-  case $host_os in
-    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
-    *) lt_sed_strip_eq="s,=/,/,g" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-  case $lt_search_path_spec in
-  *\;*)
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-    ;;
-  *)
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-    ;;
-  esac
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-}'`
-  # AWK program above erroneously prepends '/' to C:/dos/paths
-  # for these hosts.
-  case $host_os in
-    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
-  esac
-  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[[4-9]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[[01]] | aix4.[[01]].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[[45]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-m4_if([$1], [],[
-      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl*)
-    # Native MSVC
-    libname_spec='$name'
-    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-    library_names_spec='${libname}.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec="$LIB"
-      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
-      ;;
-    esac
-
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
-    ;;
-
-  *)
-    # Assume MSVC wrapper
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    dynamic_linker='Win32 ld.exe'
-    ;;
-  esac
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-m4_if([$1], [],[
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[[23]].*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2.*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
-  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-  postinstall_cmds='chmod 555 $lib'
-  # or fails outright, so override atomically:
-  install_override_mode=555
-  ;;
-
-interix[[3-9]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux # correct to gnu/linux during the next big refactor
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-
-  # Some binutils ld are patched to set DT_RUNPATH
-  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
-    [lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
-	 [lt_cv_shlibpath_overrides_runpath=yes])])
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-    ])
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[[89]] | openbsd2.[[89]].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux # correct to gnu/linux during the next big refactor
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  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
-  ;;
-
-uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-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
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-_LT_DECL([], [variables_saved_for_relink], [1],
-    [Variables whose values should be saved in libtool wrapper scripts and
-    restored at link time])
-_LT_DECL([], [need_lib_prefix], [0],
-    [Do we need the "lib" prefix for modules?])
-_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
-_LT_DECL([], [version_type], [0], [Library versioning type])
-_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
-_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
-_LT_DECL([], [shlibpath_overrides_runpath], [0],
-    [Is shlibpath searched before the hard-coded library search path?])
-_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
-_LT_DECL([], [library_names_spec], [1],
-    [[List of archive names.  First name is the real one, the rest are links.
-    The last name is the one that the linker finds with -lNAME]])
-_LT_DECL([], [soname_spec], [1],
-    [[The coded name of the library, if different from the real name]])
-_LT_DECL([], [install_override_mode], [1],
-    [Permission mode override for installation of shared libraries])
-_LT_DECL([], [postinstall_cmds], [2],
-    [Command to use after installation of a shared archive])
-_LT_DECL([], [postuninstall_cmds], [2],
-    [Command to use after uninstallation of a shared archive])
-_LT_DECL([], [finish_cmds], [2],
-    [Commands used to finish a libtool library installation in a directory])
-_LT_DECL([], [finish_eval], [1],
-    [[As "finish_cmds", except a single script fragment to be evaled but
-    not shown]])
-_LT_DECL([], [hardcode_into_libs], [0],
-    [Whether we should hardcode library paths into libraries])
-_LT_DECL([], [sys_lib_search_path_spec], [2],
-    [Compile-time system search path for libraries])
-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
-    [Run-time system search path for libraries])
-])# _LT_SYS_DYNAMIC_LINKER
-
-
-# _LT_PATH_TOOL_PREFIX(TOOL)
-# --------------------------
-# find a file program which can recognize shared library
-AC_DEFUN([_LT_PATH_TOOL_PREFIX],
-[m4_require([_LT_DECL_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] |  ?:[\\/]*])
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="m4_if([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-_LT_DECL([], [MAGIC_CMD], [0],
-	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
-])# _LT_PATH_TOOL_PREFIX
-
-# Old name:
-AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
-
-
-# _LT_PATH_MAGIC
-# --------------
-# find a file program which can recognize a shared library
-m4_defun([_LT_PATH_MAGIC],
-[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])# _LT_PATH_MAGIC
-
-
-# LT_PATH_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([LT_PATH_LD],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
-
-AC_ARG_WITH([gnu-ld],
-    [AS_HELP_STRING([--with-gnu-ld],
-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])dnl
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-_LT_PATH_LD_GNU
-AC_SUBST([LD])
-
-_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
-])# LT_PATH_LD
-
-# Old names:
-AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
-AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_LD], [])
-dnl AC_DEFUN([AC_PROG_LD], [])
-
-
-# _LT_PATH_LD_GNU
-#- --------------
-m4_defun([_LT_PATH_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# _LT_PATH_LD_GNU
-
-
-# _LT_CMD_RELOAD
-# --------------
-# find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-m4_defun([_LT_CMD_RELOAD],
-[AC_CACHE_CHECK([for $LD option to reload object files],
-  lt_cv_ld_reload_flag,
-  [lt_cv_ld_reload_flag='-r'])
-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
-  cygwin* | mingw* | pw32* | cegcc*)
-    if test "$GCC" != yes; then
-      reload_cmds=false
-    fi
-    ;;
-  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
-_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_TAGDECL([], [reload_cmds], [2])dnl
-])# _LT_CMD_RELOAD
-
-
-# _LT_CHECK_MAGIC_METHOD
-# ----------------------
-# how to check for library dependencies
-#  -- 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'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[[4-9]]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[[45]]*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
-  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    # Keep this pattern in sync with the one in func_win32_libid.
-    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  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
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-haiku*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[[3-9]]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd* | netbsdelf*-gnu)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-])
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
-  case $host_os in
-  mingw* | pw32*)
-    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
-      want_nocaseglob=yes
-    else
-      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
-    fi
-    ;;
-  esac
-fi
-
-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
-
-_LT_DECL([], [deplibs_check_method], [1],
-    [Method to check whether dependent libraries are shared objects])
-_LT_DECL([], [file_magic_cmd], [1],
-    [Command to use when deplibs_check_method = "file_magic"])
-_LT_DECL([], [file_magic_glob], [1],
-    [How to find potential files when deplibs_check_method = "file_magic"])
-_LT_DECL([], [want_nocaseglob], [1],
-    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
-])# _LT_CHECK_MAGIC_METHOD
-
-
-# LT_PATH_NM
-# ----------
-# find the pathname to a BSD- or MS-compatible name lister
-AC_DEFUN([LT_PATH_NM],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  : ${lt_cv_path_NM=no}
-fi])
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$DUMPBIN"; then :
-    # Let the user override the test.
-  else
-    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
-    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
-    *COFF*)
-      DUMPBIN="$DUMPBIN -symbols"
-      ;;
-    *)
-      DUMPBIN=:
-      ;;
-    esac
-  fi
-  AC_SUBST([DUMPBIN])
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
-  fi
-fi
-test -z "$NM" && NM=nm
-AC_SUBST([NM])
-_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
-
-AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
-  [lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
-  cat conftest.out >&AS_MESSAGE_LOG_FD
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*])
-])# LT_PATH_NM
-
-# Old names:
-AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
-AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_NM], [])
-dnl AC_DEFUN([AC_PROG_NM], [])
-
-# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-# --------------------------------
-# how to determine the name of the shared library
-# associated with a specific link library.
-#  -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
-[m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
-m4_require([_LT_DECL_DLLTOOL])
-AC_CACHE_CHECK([how to associate runtime and link libraries],
-lt_cv_sharedlib_from_linklib_cmd,
-[lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
-  # two different shell functions defined in ltmain.sh
-  # decide which to use based on capabilities of $DLLTOOL
-  case `$DLLTOOL --help 2>&1` in
-  *--identify-strict*)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
-    ;;
-  *)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
-    ;;
-  esac
-  ;;
-*)
-  # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
-  ;;
-esac
-])
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
-_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
-    [Command to associate shared and link libraries])
-])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-
-
-# _LT_PATH_MANIFEST_TOOL
-# ----------------------
-# locate the manifest tool
-m4_defun([_LT_PATH_MANIFEST_TOOL],
-[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
-  [lt_cv_path_mainfest_tool=no
-  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
-  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-    lt_cv_path_mainfest_tool=yes
-  fi
-  rm -f conftest*])
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
-  MANIFEST_TOOL=:
-fi
-_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
-])# _LT_PATH_MANIFEST_TOOL
-
-
-# LT_LIB_M
-# --------
-# check for math library
-AC_DEFUN([LT_LIB_M],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
-  ;;
-esac
-AC_SUBST([LIBM])
-])# LT_LIB_M
-
-# Old name:
-AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_CHECK_LIBM], [])
-
-
-# _LT_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------
-m4_defun([_LT_COMPILER_NO_RTTI],
-[m4_require([_LT_TAG_COMPILER])dnl
-
-_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
-  case $cc_basename in
-  nvcc*)
-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
-  esac
-
-  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-    lt_cv_prog_compiler_rtti_exceptions,
-    [-fno-rtti -fno-exceptions], [],
-    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
-	[Compiler flag to turn off builtin functions])
-])# _LT_COMPILER_NO_RTTI
-
-
-# _LT_CMD_GLOBAL_SYMBOLS
-# ----------------------
-m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[[BCDT]]'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='[[ABCDGISTW]]'
-  ;;
-hpux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDEGRST]]'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris*)
-  symcode='[[BDRT]]'
-  ;;
-sco3.2v5*)
-  symcode='[[DT]]'
-  ;;
-sysv4.2uw2*)
-  symcode='[[DT]]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[[ABDT]]'
-  ;;
-sysv4)
-  symcode='[[DFNSTU]]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[[ABCDGIRSTW]]' ;;
-esac
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK ['"\
-"     {last_section=section; section=\$ 3};"\
-"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-"     {if(hide[section]) next};"\
-"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-"     ' prfx=^$ac_symprfx]"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<_LT_EOF > conftest.$ac_ext
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT@&t@_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data.  */
-# define LT@&t@_DLSYM_CONST
-#else
-# define LT@&t@_DLSYM_CONST const
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	  cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-LT@&t@_DLSYM_CONST struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[[]] =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	  cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_globsym_save_LIBS=$LIBS
-	  lt_globsym_save_CFLAGS=$CFLAGS
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS=$lt_globsym_save_LIBS
-	  CFLAGS=$lt_globsym_save_CFLAGS
-	else
-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-    fi
-  else
-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  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
-  AC_MSG_RESULT(failed)
-else
-  AC_MSG_RESULT(ok)
-fi
-
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
-  nm_file_list_spec='@'
-fi
-
-_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
-    [Take the output of nm and produce a listing of raw symbols and C names])
-_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
-    [Transform the output of nm in a proper C declaration])
-_LT_DECL([global_symbol_to_c_name_address],
-    [lt_cv_sys_global_symbol_to_c_name_address], [1],
-    [Transform the output of nm in a C name address pair])
-_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
-    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
-    [Transform the output of nm in a C name address pair when lib prefix is needed])
-_LT_DECL([], [nm_file_list_spec], [1],
-    [Specify filename containing input files for $NM])
-]) # _LT_CMD_GLOBAL_SYMBOLS
-
-
-# _LT_COMPILER_PIC([TAGNAME])
-# ---------------------------
-m4_defun([_LT_COMPILER_PIC],
-[m4_require([_LT_TAG_COMPILER])dnl
-_LT_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_TAGVAR(lt_prog_compiler_static, $1)=
-
-m4_if([$1], [CXX], [
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    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
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-      ;;
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
-      ;;
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # 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*)
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-    *qnx* | *nto*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix[[4-9]]*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	else
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-      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).
-	m4_if([$1], [GCJ], [],
-	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-	;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    if test "$host_cpu" != ia64; then
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      interix*)
-	# This is c89, which is MS Visual C++ (no shared libs)
-	# Anyone wants to do a port?
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  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,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  cxx*)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
-	    # IBM XL 8.0, 9.0 on PPC and BlueGene
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd* | netbsdelf*-gnu)
-	;;
-      *qnx* | *nto*)
-        # QNX uses GNU C++, but need to define -shared option too, otherwise
-        # it will coredump.
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-        ;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      vxworks*)
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-	;;
-    esac
-  fi
-],
-[
-  if test "$GCC" = yes; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    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
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
-      ;;
-
-    hpux*)
-      # 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*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
-      fi
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      else
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    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], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC (with -KPIC) is the default.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-      case $cc_basename in
-      # 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'
-	;;
-      nagfor*)
-	# NAG Fortran compiler
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-        ;;
-      ccc*)
-        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-        # All Alpha code is PIC.
-        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-        ;;
-      xl* | bgxl* | bgf* | mpixl*)
-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
-	  ;;
-	*Sun\ F* | *Sun*Fortran*)
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	  ;;
-	*Sun\ C*)
-	  # Sun C 5.9
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  ;;
-        *Intel*\ [[CF]]*Compiler*)
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	  ;;
-	*Portland\ Group*)
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # All OSF/1 code is PIC.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    rdos*)
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    unicos*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-    esac
-  fi
-])
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-    ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
-    ;;
-esac
-
-AC_CACHE_CHECK([for $compiler option to produce PIC],
-  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
-  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
-    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
-    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
-    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
-     "" | " "*) ;;
-     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-     esac],
-    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
-	[Additional compiler flags for building library objects])
-
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-	[How to pass a linker flag through the compiler])
-#
-# Check to make sure the static flag actually works.
-#
-wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
-_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
-  $lt_tmp_static_flag,
-  [],
-  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
-_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
-	[Compiler flag to prevent dynamic linking])
-])# _LT_COMPILER_PIC
-
-
-# _LT_LINKER_SHLIBS([TAGNAME])
-# ----------------------------
-# See if the linker supports building shared libraries.
-m4_defun([_LT_LINKER_SHLIBS],
-[AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-m4_if([$1], [CXX], [
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-  case $host_os in
-  aix[[4-9]]*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    # Also, AIX nm treats weak defined symbols like other global defined
-    # symbols, whereas GNU nm marks them as "W".
-    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    else
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-    ;;
-  cygwin* | mingw* | cegcc*)
-    case $cc_basename in
-    cl*)
-      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-      ;;
-    *)
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
-      ;;
-    esac
-    ;;
-  linux* | k*bsd*-gnu | gnu*)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-    ;;
-  *)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-    ;;
-  esac
-], [
-  runpath_var=
-  _LT_TAGVAR(allow_undefined_flag, $1)=
-  _LT_TAGVAR(always_export_symbols, $1)=no
-  _LT_TAGVAR(archive_cmds, $1)=
-  _LT_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_TAGVAR(compiler_needs_object, $1)=no
-  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_TAGVAR(hardcode_automatic, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
-  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_TAGVAR(inherit_rpath, $1)=no
-  _LT_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_TAGVAR(module_cmds, $1)=
-  _LT_TAGVAR(module_expsym_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  _LT_TAGVAR(include_expsyms, $1)=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-dnl Note also adjust exclude_expsyms for C++ above.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  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++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  linux* | k*bsd*-gnu | gnu*)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-    ;;
-  esac
-
-  _LT_TAGVAR(ld_shlibs, $1)=yes
-
-  # On some targets, GNU ld is compatible enough with the native linker
-  # that we're better off using the native interface for both.
-  lt_use_gnu_ld_interface=no
-  if test "$with_gnu_ld" = yes; then
-    case $host_os in
-      aix*)
-	# The AIX port of GNU ld has always aspired to compatibility
-	# with the native linker.  However, as the warning in the GNU ld
-	# block says, versions before 2.19.5* couldn't really create working
-	# shared libraries, regardless of the interface used.
-	case `$LD -v 2>&1` in
-	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
-	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
-	  *)
-	    lt_use_gnu_ld_interface=yes
-	    ;;
-	esac
-	;;
-      *)
-	lt_use_gnu_ld_interface=yes
-	;;
-    esac
-  fi
-
-  if test "$lt_use_gnu_ld_interface" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
-      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[[3-9]]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.19, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    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'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=no
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    haiku*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    interix[[3-9]]*)
-      _LT_TAGVAR(hardcode_direct, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
-	case $cc_basename in
-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
-      then
-	tmp_addflag=' $pic_flag'
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
-        pgcc*)				# Portland Group C compiler
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95* | pgfortran*)
-					# Portland Group f77 and f90 compilers
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  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]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
-	  tmp_sharedflag='-qmkshrobj'
-	  tmp_addflag= ;;
-	nvcc*)	# Cuda Compiler Driver 2.2
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-	  ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-        if test "x$supports_anon_versioning" = xyes; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-        fi
-
-	case $cc_basename in
-	xlf* | bgf* | bgxlf* | mpixlf*)
-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	  fi
-	  ;;
-	esac
-      else
-        _LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  # For security reasons, it is highly recommended that you always
-	  # use absolute paths for naming shared libraries, and exclude the
-	  # DT_RUNPATH tag from executables and libraries.  But doing so
-	  # requires that you compile everything twice, which is a pain.
-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-
-    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
-      runpath_var=
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	_LT_TAGVAR(hardcode_direct, $1)=unsupported
-      fi
-      ;;
-
-    aix[[4-9]]*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	# Also, AIX nm treats weak defined symbols like other global
-	# defined symbols, whereas GNU nm marks them as "W".
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	else
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	  for ld_flag in $LDFLAGS; do
-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-	    aix_use_runtimelinking=yes
-	    break
-	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      _LT_TAGVAR(archive_cmds, $1)=''
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[[012]]|aix4.[[012]].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	  # We have reworked collect2
-	  :
-	  else
-	  # We have old collect2
-	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-	_LT_TAGVAR(link_all_deplibs, $1)=no
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	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
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        _LT_SYS_MODULE_PATH_AIX([$1])
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-      else
-	if test "$host_cpu" = ia64; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 _LT_SYS_MODULE_PATH_AIX([$1])
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  if test "$with_gnu_ld" = yes; then
-	    # We only use this code for GNU lds that support --whole-archive.
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	  else
-	    # Exported symbols can be pulled into shared objects from archives
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	  fi
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    bsdi[[45]]*)
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-      ;;
-
-    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
-      # no search path for DLLs.
-      case $cc_basename in
-      cl*)
-	# Native MSVC
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	_LT_TAGVAR(always_export_symbols, $1)=yes
-	_LT_TAGVAR(file_list_spec, $1)='@'
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	  else
-	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	  fi~
-	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	  linknames='
-	# The linker will not automatically build a static lib if we build a DLL.
-	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-	# Don't use ranlib
-	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-	  lt_tool_outputfile="@TOOL_OUTPUT@"~
-	  case $lt_outputfile in
-	    *.exe|*.EXE) ;;
-	    *)
-	      lt_outputfile="$lt_outputfile.exe"
-	      lt_tool_outputfile="$lt_tool_outputfile.exe"
-	      ;;
-	  esac~
-	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	    $RM "$lt_outputfile.manifest";
-	  fi'
-	;;
-      *)
-	# Assume MSVC wrapper
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-	# The linker will automatically build a .lib file if we build a DLL.
-	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	# FIXME: Should let the user specify the lib program.
-	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-      _LT_DARWIN_LINKER_FEATURES($1)
-      ;;
-
-    dgux*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	_LT_TAGVAR(hardcode_minus_L, $1)=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  _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 $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	m4_if($1, [], [
-	  # Older versions of the 11.00 compiler do not understand -b yet
-	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  _LT_LINKER_OPTION([if $CC understands -b],
-	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
-	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
-	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
-	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  ;;
-	*)
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-	# This should be the same for all languages, so no per-tag cache variable.
-	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
-	  [lt_cv_irix_exported_symbol],
-	  [save_LDFLAGS="$LDFLAGS"
-	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-	   AC_LINK_IFELSE(
-	     [AC_LANG_SOURCE(
-	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
-			      [C++], [[int foo (void) { return 0; }]],
-			      [Fortran 77], [[
-      subroutine foo
-      end]],
-			      [Fortran], [[
-      subroutine foo
-      end]])])],
-	      [lt_cv_irix_exported_symbol=yes],
-	      [lt_cv_irix_exported_symbol=no])
-           LDFLAGS="$save_LDFLAGS"])
-	if test "$lt_cv_irix_exported_symbol" = yes; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-	fi
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(inherit_rpath, $1)=yes
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	     ;;
-	   *)
-	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-	fi
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    os2*)
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	  wlarc=''
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	  ;;
-	*)
-	  wlarc='${wl}'
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	  ;;
-	esac
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      case $host_os in
-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-        ;;
-	motorola)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4.3*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	_LT_TAGVAR(ld_shlibs, $1)=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    esac
-
-    if test x$host_vendor = xsni; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-])
-AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
-
-_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
-_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
-_LT_DECL([], [extract_expsyms_cmds], [2],
-    [The commands to extract the exported symbol list from a shared archive])
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
-  # Assume -lc should be added
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $_LT_TAGVAR(archive_cmds, $1) in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # 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.
-      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
-	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
-	[$RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-	  _LT_TAGVAR(allow_undefined_flag, $1)=
-	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-	  then
-	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	  else
-	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  fi
-	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-	])
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
-    [Whether or not to add -lc for building shared libraries])
-_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
-    [enable_shared_with_static_runtimes], [0],
-    [Whether or not to disallow shared libs when runtime libs are static])
-_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
-    [Compiler flag to allow reflexive dlopens])
-_LT_TAGDECL([], [whole_archive_flag_spec], [1],
-    [Compiler flag to generate shared objects directly from archives])
-_LT_TAGDECL([], [compiler_needs_object], [1],
-    [Whether the compiler copes with passing no objects directly])
-_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
-    [Create an old-style archive from a shared archive])
-_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
-    [Create a temporary old-style archive to link instead of a shared archive])
-_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
-_LT_TAGDECL([], [archive_expsym_cmds], [2])
-_LT_TAGDECL([], [module_cmds], [2],
-    [Commands used to build a loadable module if different from building
-    a shared archive.])
-_LT_TAGDECL([], [module_expsym_cmds], [2])
-_LT_TAGDECL([], [with_gnu_ld], [1],
-    [Whether we are building with GNU ld or not])
-_LT_TAGDECL([], [allow_undefined_flag], [1],
-    [Flag that allows shared libraries with undefined symbols to be built])
-_LT_TAGDECL([], [no_undefined_flag], [1],
-    [Flag that enforces no undefined symbols])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
-    [Flag to hardcode $libdir into a binary during linking.
-    This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_separator], [1],
-    [Whether we need a single "-rpath" flag with a separated argument])
-_LT_TAGDECL([], [hardcode_direct], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-    DIR into the resulting binary])
-_LT_TAGDECL([], [hardcode_direct_absolute], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-    DIR into the resulting binary and the resulting library dependency is
-    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
-    library is relocated])
-_LT_TAGDECL([], [hardcode_minus_L], [0],
-    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
-    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_automatic], [0],
-    [Set to "yes" if building a shared library automatically hardcodes DIR
-    into the library and all subsequent libraries and executables linked
-    against it])
-_LT_TAGDECL([], [inherit_rpath], [0],
-    [Set to yes if linker adds runtime paths of dependent libraries
-    to runtime path list])
-_LT_TAGDECL([], [link_all_deplibs], [0],
-    [Whether libtool must link a program against all its dependency libraries])
-_LT_TAGDECL([], [always_export_symbols], [0],
-    [Set to "yes" if exported symbols are required])
-_LT_TAGDECL([], [export_symbols_cmds], [2],
-    [The commands to list exported symbols])
-_LT_TAGDECL([], [exclude_expsyms], [1],
-    [Symbols that should not be listed in the preloaded symbols])
-_LT_TAGDECL([], [include_expsyms], [1],
-    [Symbols that must always be exported])
-_LT_TAGDECL([], [prelink_cmds], [2],
-    [Commands necessary for linking programs (against libraries) with templates])
-_LT_TAGDECL([], [postlink_cmds], [2],
-    [Commands necessary for finishing linking programs])
-_LT_TAGDECL([], [file_list_spec], [1],
-    [Specify filename containing input files])
-dnl FIXME: Not yet implemented
-dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
-dnl    [Compiler flag to generate thread safe objects])
-])# _LT_LINKER_SHLIBS
-
-
-# _LT_LANG_C_CONFIG([TAG])
-# ------------------------
-# Ensure that the configuration variables for a C compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_C_CONFIG],
-[m4_require([_LT_DECL_EGREP])dnl
-lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-_LT_TAG_COMPILER
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_SYS_DYNAMIC_LINKER($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-  LT_SYS_DLOPEN_SELF
-  _LT_CMD_STRIPLIB
-
-  # Report which library types will actually be built
-  AC_MSG_CHECKING([if libtool supports shared libraries])
-  AC_MSG_RESULT([$can_build_shared])
-
-  AC_MSG_CHECKING([whether to build shared libraries])
-  test "$can_build_shared" = "no" && enable_shared=no
-
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test "$enable_shared" = yes && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix[[4-9]]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
-    fi
-    ;;
-  esac
-  AC_MSG_RESULT([$enable_shared])
-
-  AC_MSG_CHECKING([whether to build static libraries])
-  # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
-  AC_MSG_RESULT([$enable_static])
-
-  _LT_CONFIG($1)
-fi
-AC_LANG_POP
-CC="$lt_save_CC"
-])# _LT_LANG_C_CONFIG
-
-
-# _LT_LANG_CXX_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a C++ compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_CXX_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  AC_PROG_CXXCPP
-else
-  _lt_caught_CXX_error=yes
-fi
-
-AC_LANG_PUSH(C++)
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(compiler_needs_object, $1)=no
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the CXX compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="int some_variable = 0;"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC=$CC
-  lt_save_CFLAGS=$CFLAGS
-  lt_save_LD=$LD
-  lt_save_GCC=$GCC
-  GCC=$GXX
-  lt_save_with_gnu_ld=$with_gnu_ld
-  lt_save_path_LD=$lt_cv_path_LD
-  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-  else
-    $as_unset lt_cv_prog_gnu_ld
-  fi
-  if test -n "${lt_cv_path_LDCXX+set}"; then
-    lt_cv_path_LD=$lt_cv_path_LDCXX
-  else
-    $as_unset lt_cv_path_LD
-  fi
-  test -z "${LDCXX+set}" || LD=$LDCXX
-  CC=${CXX-"c++"}
-  CFLAGS=$CXXFLAGS
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-
-  if test -n "$compiler"; then
-    # We don't want -fno-exception when compiling C++ code, so set the
-    # no_builtin_flag separately
-    if test "$GXX" = yes; then
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-    else
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-    fi
-
-    if test "$GXX" = yes; then
-      # Set up default GNU C++ configuration
-
-      LT_PATH_LD
-
-      # Check if GNU C++ uses GNU ld as the underlying linker, since the
-      # archiving commands below assume that GNU ld is being used.
-      if test "$with_gnu_ld" = yes; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-        # If archive_cmds runs LD, not CC, wlarc should be empty
-        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-        #     investigate it a little bit more. (MM)
-        wlarc='${wl}'
-
-        # ancient GNU ld didn't support --whole-archive et. al.
-        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
-	  $GREP 'no-whole-archive' > /dev/null; then
-          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-        else
-          _LT_TAGVAR(whole_archive_flag_spec, $1)=
-        fi
-      else
-        with_gnu_ld=no
-        wlarc=
-
-        # A generic and very simple default shared library creation
-        # command for GNU C++ for the case where it uses the native
-        # linker, instead of GNU ld.  If possible, this setting should
-        # overridden to take advantage of the native linker features on
-        # the platform it is being used on.
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      fi
-
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
-    else
-      GXX=no
-      with_gnu_ld=no
-      wlarc=
-    fi
-
-    # PORTME: fill in a description of your system's C++ link characteristics
-    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-    _LT_TAGVAR(ld_shlibs, $1)=yes
-    case $host_os in
-      aix3*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-      aix[[4-9]]*)
-        if test "$host_cpu" = ia64; then
-          # On IA64, the linker does run time linking by default, so we don't
-          # have to do anything special.
-          aix_use_runtimelinking=no
-          exp_sym_flag='-Bexport'
-          no_entry_flag=""
-        else
-          aix_use_runtimelinking=no
-
-          # Test if we are trying to use run time linking or normal
-          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-          # need to do runtime linking.
-          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	    for ld_flag in $LDFLAGS; do
-	      case $ld_flag in
-	      *-brtl*)
-	        aix_use_runtimelinking=yes
-	        break
-	        ;;
-	      esac
-	    done
-	    ;;
-          esac
-
-          exp_sym_flag='-bexport'
-          no_entry_flag='-bnoentry'
-        fi
-
-        # When large executables or shared objects are built, AIX ld can
-        # have problems creating the table of contents.  If linking a library
-        # or program results in "error TOC overflow" add -mminimal-toc to
-        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-        _LT_TAGVAR(archive_cmds, $1)=''
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
-        if test "$GXX" = yes; then
-          case $host_os in aix4.[[012]]|aix4.[[012]].*)
-          # We only want to do this on AIX 4.2 and lower, the check
-          # below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	    # We have reworked collect2
-	    :
-	  else
-	    # We have old collect2
-	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	    # It fails to find uninstalled libraries when the uninstalled
-	    # path is not listed in the libpath.  Setting hardcode_minus_L
-	    # to unsupported forces relinking
-	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-          esac
-          shared_flag='-shared'
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag="$shared_flag "'${wl}-G'
-	  fi
-        else
-          # not using gcc
-          if test "$host_cpu" = ia64; then
-	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	  # chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-          else
-	    if test "$aix_use_runtimelinking" = yes; then
-	      shared_flag='${wl}-G'
-	    else
-	      shared_flag='${wl}-bM:SRE'
-	    fi
-          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
-        if test "$aix_use_runtimelinking" = yes; then
-          # Warning - without using the other runtime loading flags (-brtl),
-          # -berok will link without error, but may produce a broken library.
-          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-          # Determine the default libpath from the value encoded in an empty
-          # executable.
-          _LT_SYS_MODULE_PATH_AIX([$1])
-          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-        else
-          if test "$host_cpu" = ia64; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-          else
-	    # Determine the default libpath from the value encoded in an
-	    # empty executable.
-	    _LT_SYS_MODULE_PATH_AIX([$1])
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	    # Warning - without using the other run time loading flags,
-	    # -berok will link without error, but may produce a broken library.
-	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	    if test "$with_gnu_ld" = yes; then
-	      # We only use this code for GNU lds that support --whole-archive.
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    else
-	      # Exported symbols can be pulled into shared objects from archives
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	    fi
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	    # This is similar to how AIX traditionally builds its shared
-	    # libraries.
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-          fi
-        fi
-        ;;
-
-      beos*)
-	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	  # support --undefined.  This deserves some investigation.  FIXME
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
-      chorus*)
-        case $cc_basename in
-          *)
-	  # FIXME: insert proper C++ library support
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	  ;;
-        esac
-        ;;
-
-      cygwin* | mingw* | pw32* | cegcc*)
-	case $GXX,$cc_basename in
-	,cl* | no,cl*)
-	  # Native MSVC
-	  # hardcode_libdir_flag_spec is actually meaningless, as there is
-	  # no search path for DLLs.
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  _LT_TAGVAR(always_export_symbols, $1)=yes
-	  _LT_TAGVAR(file_list_spec, $1)='@'
-	  # Tell ltmain to make .lib files, not .a files.
-	  libext=lib
-	  # Tell ltmain to make .dll files, not .so files.
-	  shrext_cmds=".dll"
-	  # FIXME: Setting linknames here is a bad hack.
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	    else
-	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	    fi~
-	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	    linknames='
-	  # The linker will not automatically build a static lib if we build a DLL.
-	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	  # Don't use ranlib
-	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-	    lt_tool_outputfile="@TOOL_OUTPUT@"~
-	    case $lt_outputfile in
-	      *.exe|*.EXE) ;;
-	      *)
-		lt_outputfile="$lt_outputfile.exe"
-		lt_tool_outputfile="$lt_tool_outputfile.exe"
-		;;
-	    esac~
-	    func_to_tool_file "$lt_outputfile"~
-	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	      $RM "$lt_outputfile.manifest";
-	    fi'
-	  ;;
-	*)
-	  # g++
-	  # _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'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  _LT_TAGVAR(always_export_symbols, $1)=no
-	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	    # If the export-symbols file already is a .def file (1st line
-	    # is EXPORTS), use it as is; otherwise, prepend...
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	      cp $export_symbols $output_objdir/$soname.def;
-	    else
-	      echo EXPORTS > $output_objdir/$soname.def;
-	      cat $export_symbols >> $output_objdir/$soname.def;
-	    fi~
-	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	  else
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	  ;;
-	esac
-	;;
-      darwin* | rhapsody*)
-        _LT_DARWIN_LINKER_FEATURES($1)
-	;;
-
-      dgux*)
-        case $cc_basename in
-          ec++*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          ghcx*)
-	    # Green Hills C++ Compiler
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      freebsd2.*)
-        # C++ shared libraries reported to be fairly broken before
-	# switch to ELF
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      freebsd-elf*)
-        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-        ;;
-
-      freebsd* | dragonfly*)
-        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-        # conventions
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-        ;;
-
-      gnu*)
-        ;;
-
-      haiku*)
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        ;;
-
-      hpux9*)
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				             # but as the default
-				             # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            _LT_TAGVAR(ld_shlibs, $1)=no
-            ;;
-          aCC*)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-            ;;
-          *)
-            if test "$GXX" = yes; then
-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              _LT_TAGVAR(ld_shlibs, $1)=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
-        if test $with_gnu_ld = no; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-          case $host_cpu in
-            hppa*64*|ia64*)
-              ;;
-            *)
-	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-              ;;
-          esac
-        fi
-        case $host_cpu in
-          hppa*64*|ia64*)
-            _LT_TAGVAR(hardcode_direct, $1)=no
-            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-            ;;
-          *)
-            _LT_TAGVAR(hardcode_direct, $1)=yes
-            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					         # but as the default
-					         # location of the library.
-            ;;
-        esac
-
-        case $cc_basename in
-          CC*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          aCC*)
-	    case $host_cpu in
-	      hppa*64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      ia64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      *)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	    esac
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test $with_gnu_ld = no; then
-	        case $host_cpu in
-	          hppa*64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          ia64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          *)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	        esac
-	      fi
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      interix[[3-9]]*)
-	_LT_TAGVAR(hardcode_direct, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-	# Instead, shared libraries are loaded at an image base (0x10000000 by
-	# default) and relocated if they conflict, which is a slow very memory
-	# consuming and fragmenting process.  To avoid this, we pick a random,
-	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	;;
-      irix5* | irix6*)
-        case $cc_basename in
-          CC*)
-	    # SGI C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test "$with_gnu_ld" = no; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	      else
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
-	      fi
-	    fi
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-	    ;;
-        esac
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(inherit_rpath, $1)=yes
-        ;;
-
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-	    ;;
-	  icpc* | ecpc* )
-	    # Intel C++
-	    with_gnu_ld=yes
-	    # version 8.0 and above of icpc choke on multiply defined symbols
-	    # if we add $predep_objects and $postdep_objects, however 7.1 and
-	    # earlier do not add the objects themselves.
-	    case `$CC -V 2>&1` in
-	      *"Version 7."*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	      *)  # Version 8.0 or newer
-	        tmp_idyn=
-	        case $host_cpu in
-		  ia64*) tmp_idyn=' -i_dynamic';;
-		esac
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	    esac
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    ;;
-          pgCC* | pgcpp*)
-            # Portland Group C++ compiler
-	    case `$CC -V` in
-	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
-	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
-	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
-		$RANLIB $oldlib'
-	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	      ;;
-	    *) # Version 6 and above use weak symbols
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	      ;;
-	    esac
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-            ;;
-	  cxx*)
-	    # Compaq C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	    runpath_var=LD_RUN_PATH
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
-	    ;;
-	  xl* | mpixl* | bgxl*)
-	    # IBM XL 8.0 on PPC, with GNU ld
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    if test "x$supports_anon_versioning" = xyes; then
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-		echo "local: *; };" >> $output_objdir/$libname.ver~
-		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	    fi
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	      _LT_TAGVAR(compiler_needs_object, $1)=yes
-
-	      # Not sure whether something based on
-	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-	      # would be better.
-	      output_verbose_link_cmd='func_echo_all'
-
-	      # Archives containing C++ object files must be created using
-	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	      # necessary to make sure instantiated templates are included
-	      # in the archive.
-	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-
-      lynxos*)
-        # FIXME: insert proper C++ library support
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      m88k*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      mvs*)
-        case $cc_basename in
-          cxx*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	  *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	esac
-	;;
-
-      netbsd*)
-        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-	  wlarc=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	fi
-	# Workaround some broken pre-1.5 toolchains
-	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-	;;
-
-      *nto* | *qnx*)
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-	;;
-
-      openbsd2*)
-        # C++ shared libraries are fairly broken
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      openbsd*)
-	if test -f /usr/libexec/ld.so; then
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-	  fi
-	  output_verbose_link_cmd=func_echo_all
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
-      osf3* | osf4* | osf5*)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Archives containing C++ object files must be created using
-	    # the KAI C++ compiler.
-	    case $host in
-	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
-	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
-	    esac
-	    ;;
-          RCC*)
-	    # Rational C++ 2.4.1
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          cxx*)
-	    case $host in
-	      osf3*)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-		;;
-	      *)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	          echo "-hidden">> $lib.exp~
-	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
-	          $RM $lib.exp'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-		;;
-	    esac
-
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	    ;;
-	  *)
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	      case $host in
-	        osf3*)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		  ;;
-	        *)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		  ;;
-	      esac
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	      # Commands to make compiler produce verbose output that lists
-	      # what "hidden" libraries, object files and flags are used when
-	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      psos*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      sunos4*)
-        case $cc_basename in
-          CC*)
-	    # Sun C++ 4.x
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          lcc*)
-	    # Lucid
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      solaris*)
-        case $cc_basename in
-          CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
-	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	    case $host_os in
-	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-	      *)
-		# The compiler driver will combine and reorder linker options,
-		# but understands `-z linker_flag'.
-	        # Supported since Solaris 2.6 (maybe 2.5.1?)
-		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	        ;;
-	    esac
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-
-	    output_verbose_link_cmd='func_echo_all'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	    ;;
-          gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	    # The C++ compiler must be used to create the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    # GNU C++ compiler with Solaris linker
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-	      else
-	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	        # platform.
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-	      fi
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-	      case $host_os in
-		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-		*)
-		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-		  ;;
-	      esac
-	    fi
-	    ;;
-        esac
-        ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      case $cc_basename in
-        CC*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-      esac
-      ;;
-
-      sysv5* | sco3.2v5* | sco5v6*)
-	# Note: We can NOT use -z defs as we might desire, because we do not
-	# link with -lc, and that would cause any symbols used from libc to
-	# always be unresolved, which means just about no library would
-	# ever link correctly.  If we're not using GNU ld we use -z text
-	# though, which does catch some bad symbols but isn't as heavy-handed
-	# as -z defs.
-	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-	_LT_TAGVAR(link_all_deplibs, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-	runpath_var='LD_RUN_PATH'
-
-	case $cc_basename in
-          CC*)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
-	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
-	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
-	      '"$_LT_TAGVAR(reload_cmds, $1)"
-	    ;;
-	  *)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    ;;
-	esac
-      ;;
-
-      tandem*)
-        case $cc_basename in
-          NCC*)
-	    # NonStop-UX NCC 3.20
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      vxworks*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      *)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-    esac
-
-    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-    _LT_TAGVAR(GCC, $1)="$GXX"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-  LDCXX=$LD
-  LD=$lt_save_LD
-  GCC=$lt_save_GCC
-  with_gnu_ld=$lt_save_with_gnu_ld
-  lt_cv_path_LDCXX=$lt_cv_path_LD
-  lt_cv_path_LD=$lt_save_path_LD
-  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
-
-AC_LANG_POP
-])# _LT_LANG_CXX_CONFIG
-
-
-# _LT_FUNC_STRIPNAME_CNF
-# ----------------------
-# func_stripname_cnf prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-#
-# This function is identical to the (non-XSI) version of func_stripname,
-# except this one can be used by m4 code that may be executed by configure,
-# rather than the libtool script.
-m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
-AC_REQUIRE([_LT_DECL_SED])
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
-func_stripname_cnf ()
-{
-  case ${2} in
-  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-  esac
-} # func_stripname_cnf
-])# _LT_FUNC_STRIPNAME_CNF
-
-# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
-# ---------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
-# Dependencies to place before and after the object being linked:
-_LT_TAGVAR(predep_objects, $1)=
-_LT_TAGVAR(postdep_objects, $1)=
-_LT_TAGVAR(predeps, $1)=
-_LT_TAGVAR(postdeps, $1)=
-_LT_TAGVAR(compiler_lib_search_path, $1)=
-
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library.  It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
-int a;
-void foo (void) { a = 0; }
-_LT_EOF
-], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-_LT_EOF
-], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer*4 a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
-public class foo {
-  private int a;
-  public void bar (void) {
-    a = 0;
-  }
-};
-_LT_EOF
-], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
-package foo
-func foo() {
-}
-_LT_EOF
-])
-
-_lt_libdeps_save_CFLAGS=$CFLAGS
-case "$CC $CFLAGS " in #(
-*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
-*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
-esac
-
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  for p in `eval "$output_verbose_link_cmd"`; do
-    case ${prev}${p} in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" ||
-          test $p = "-R"; then
-	 prev=$p
-	 continue
-       fi
-
-       # Expand the sysroot to ease extracting the directories later.
-       if test -z "$prev"; then
-         case $p in
-         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
-         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
-         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
-         esac
-       fi
-       case $p in
-       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
-       esac
-       if test "$pre_test_object_deps_done" = no; then
-	 case ${prev} in
-	 -L | -R)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-	   else
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
-	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
-	 else
-	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
-	 fi
-       fi
-       prev=
-       ;;
-
-    *.lto.$objext) ;; # Ignore GCC LTO objects
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
-	   _LT_TAGVAR(predep_objects, $1)="$p"
-	 else
-	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
-	 fi
-       else
-	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
-	   _LT_TAGVAR(postdep_objects, $1)="$p"
-	 else
-	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$RM -f confest.$objext
-CFLAGS=$_lt_libdeps_save_CFLAGS
-
-# PORTME: override above test on systems where it is broken
-m4_if([$1], [CXX],
-[case $host_os in
-interix[[3-9]]*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  _LT_TAGVAR(predep_objects,$1)=
-  _LT_TAGVAR(postdep_objects,$1)=
-  _LT_TAGVAR(postdeps,$1)=
-  ;;
-
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC* | sunCC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-esac
-])
-
-case " $_LT_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=
-if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
-    [The directories searched by this compiler when creating a shared library])
-_LT_TAGDECL([], [predep_objects], [1],
-    [Dependencies to place before and after the objects being linked to
-    create a shared library])
-_LT_TAGDECL([], [postdep_objects], [1])
-_LT_TAGDECL([], [predeps], [1])
-_LT_TAGDECL([], [postdeps], [1])
-_LT_TAGDECL([], [compiler_lib_search_path], [1],
-    [The library search path used internally by the compiler when linking
-    a shared library])
-])# _LT_SYS_HIDDEN_LIBDEPS
-
-
-# _LT_LANG_F77_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a Fortran 77 compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_F77_CONFIG],
-[AC_LANG_PUSH(Fortran 77)
-if test -z "$F77" || test "X$F77" = "Xno"; then
-  _lt_disable_F77=yes
-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the F77 compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_F77" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  lt_save_CFLAGS=$CFLAGS
-  CC=${F77-"f77"}
-  CFLAGS=$FFLAGS
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-  GCC=$G77
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING([if libtool supports shared libraries])
-    AC_MSG_RESULT([$can_build_shared])
-
-    AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test "$enable_shared" = yes && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[[4-9]]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
-	fi
-        ;;
-    esac
-    AC_MSG_RESULT([$enable_shared])
-
-    AC_MSG_CHECKING([whether to build static libraries])
-    # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
-    AC_MSG_RESULT([$enable_static])
-
-    _LT_TAGVAR(GCC, $1)="$G77"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC="$lt_save_CC"
-  CFLAGS="$lt_save_CFLAGS"
-fi # test "$_lt_disable_F77" != yes
-
-AC_LANG_POP
-])# _LT_LANG_F77_CONFIG
-
-
-# _LT_LANG_FC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for a Fortran compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_FC_CONFIG],
-[AC_LANG_PUSH(Fortran)
-
-if test -z "$FC" || test "X$FC" = "Xno"; then
-  _lt_disable_FC=yes
-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for fc test sources.
-ac_ext=${ac_fc_srcext-f}
-
-# Object file extension for compiled fc test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the FC compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  lt_save_CFLAGS=$CFLAGS
-  CC=${FC-"f95"}
-  CFLAGS=$FCFLAGS
-  compiler=$CC
-  GCC=$ac_cv_fc_compiler_gnu
-
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING([if libtool supports shared libraries])
-    AC_MSG_RESULT([$can_build_shared])
-
-    AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test "$enable_shared" = yes && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[[4-9]]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
-	fi
-        ;;
-    esac
-    AC_MSG_RESULT([$enable_shared])
-
-    AC_MSG_CHECKING([whether to build static libraries])
-    # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
-    AC_MSG_RESULT([$enable_static])
-
-    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-fi # test "$_lt_disable_FC" != yes
-
-AC_LANG_POP
-])# _LT_LANG_FC_CONFIG
-
-
-# _LT_LANG_GCJ_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Java Compiler compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_GCJ_CONFIG],
-[AC_REQUIRE([LT_PROG_GCJ])dnl
-AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GCJ-"gcj"}
-CFLAGS=$GCJFLAGS
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
-_LT_CC_BASENAME([$compiler])
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-
-  _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_GCJ_CONFIG
-
-
-# _LT_LANG_GO_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Go compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_GO_CONFIG],
-[AC_REQUIRE([LT_PROG_GO])dnl
-AC_LANG_SAVE
-
-# Source file extension for Go test sources.
-ac_ext=go
-
-# Object file extension for compiled Go test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="package main; func main() { }"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='package main; func main() { }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GOC-"gccgo"}
-CFLAGS=$GOFLAGS
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
-_LT_CC_BASENAME([$compiler])
-
-# Go did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-
-  _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_GO_CONFIG
-
-
-# _LT_LANG_RC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for the Windows resource compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_RC_CONFIG],
-[AC_REQUIRE([LT_PROG_RC])dnl
-AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=
-CC=${RC-"windres"}
-CFLAGS=
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-if test -n "$compiler"; then
-  :
-  _LT_CONFIG($1)
-fi
-
-GCC=$lt_save_GCC
-AC_LANG_RESTORE
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_RC_CONFIG
-
-
-# LT_PROG_GCJ
-# -----------
-AC_DEFUN([LT_PROG_GCJ],
-[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
-  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
-    [AC_CHECK_TOOL(GCJ, gcj,)
-      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-      AC_SUBST(GCJFLAGS)])])[]dnl
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
-
-
-# LT_PROG_GO
-# ----------
-AC_DEFUN([LT_PROG_GO],
-[AC_CHECK_TOOL(GOC, gccgo,)
-])
-
-
-# LT_PROG_RC
-# ----------
-AC_DEFUN([LT_PROG_RC],
-[AC_CHECK_TOOL(RC, windres,)
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_RC], [])
-
-
-# _LT_DECL_EGREP
-# --------------
-# If we don't have a new enough Autoconf to choose the best grep
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_EGREP],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_REQUIRE([AC_PROG_FGREP])dnl
-test -z "$GREP" && GREP=grep
-_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
-_LT_DECL([], [EGREP], [1], [An ERE matcher])
-_LT_DECL([], [FGREP], [1], [A literal string matcher])
-dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
-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_DLLTOOL
-# ----------------
-# Ensure DLLTOOL variable is set.
-m4_defun([_LT_DECL_DLLTOOL],
-[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
-AC_SUBST([DLLTOOL])
-])
-
-# _LT_DECL_SED
-# ------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-m4_defun([_LT_DECL_SED],
-[AC_PROG_SED
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
-_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
-    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
-])# _LT_DECL_SED
-
-m4_ifndef([AC_PROG_SED], [
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-
-m4_defun([AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-])
-SED=$lt_cv_path_SED
-AC_SUBST([SED])
-AC_MSG_RESULT([$SED])
-])#AC_PROG_SED
-])#m4_ifndef
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_SED], [])
-
-
-# _LT_CHECK_SHELL_FEATURES
-# ------------------------
-# Find out whether the shell is Bourne or XSI compatible,
-# or has some other useful features.
-m4_defun([_LT_CHECK_SHELL_FEATURES],
-[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,b/c, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-AC_MSG_RESULT([$xsi_shell])
-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-
-AC_MSG_CHECKING([whether the shell understands "+="])
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-AC_MSG_RESULT([$lt_shell_append])
-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
-_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
-])# _LT_CHECK_SHELL_FEATURES
-
-
-# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
-# ------------------------------------------------------
-# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
-# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
-m4_defun([_LT_PROG_FUNCTION_REPLACE],
-[dnl {
-sed -e '/^$1 ()$/,/^} # $1 /c\
-$1 ()\
-{\
-m4_bpatsubsts([$2], [$], [\\], [^\([	 ]\)], [\\\1])
-} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-])
-
-
-# _LT_PROG_REPLACE_SHELLFNS
-# -------------------------
-# Replace existing portable implementations of several shell functions with
-# equivalent extended shell implementations where those features are available..
-m4_defun([_LT_PROG_REPLACE_SHELLFNS],
-[if test x"$xsi_shell" = xyes; then
-  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
-    case ${1} in
-      */*) func_dirname_result="${1%/*}${2}" ;;
-      *  ) func_dirname_result="${3}" ;;
-    esac])
-
-  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
-    func_basename_result="${1##*/}"])
-
-  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
-    case ${1} in
-      */*) func_dirname_result="${1%/*}${2}" ;;
-      *  ) func_dirname_result="${3}" ;;
-    esac
-    func_basename_result="${1##*/}"])
-
-  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
-    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-    # positional parameters, so assign one to ordinary parameter first.
-    func_stripname_result=${3}
-    func_stripname_result=${func_stripname_result#"${1}"}
-    func_stripname_result=${func_stripname_result%"${2}"}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
-    func_split_long_opt_name=${1%%=*}
-    func_split_long_opt_arg=${1#*=}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
-    func_split_short_opt_arg=${1#??}
-    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
-    case ${1} in
-      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-      *)    func_lo2o_result=${1} ;;
-    esac])
-
-  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
-
-  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
-
-  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
-fi
-
-if test x"$lt_shell_append" = xyes; then
-  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
-
-  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
-    func_quote_for_eval "${2}"
-dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
-    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
-
-  # Save a `func_append' function call where possible by direct use of '+='
-  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-else
-  # Save a `func_append' function call even when '+=' is not available
-  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
-  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
-fi
-])
-
-# _LT_PATH_CONVERSION_FUNCTIONS
-# -----------------------------
-# Determine which file name conversion functions should be used by
-# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
-# for certain cross-compile configurations and native mingw.
-m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_MSG_CHECKING([how to convert $build file names to $host format])
-AC_CACHE_VAL(lt_cv_to_host_file_cmd,
-[case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
-        ;;
-    esac
-    ;;
-  *-*-cygwin* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_noop
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
-        ;;
-    esac
-    ;;
-  * ) # unhandled hosts (and "normal" native builds)
-    lt_cv_to_host_file_cmd=func_convert_file_noop
-    ;;
-esac
-])
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
-_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
-         [0], [convert $build file names to $host format])dnl
-
-AC_MSG_CHECKING([how to convert $build file names to toolchain format])
-AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
-[#assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
-        ;;
-    esac
-    ;;
-esac
-])
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
-_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
-         [0], [convert $build files to toolchain format])dnl
-])# _LT_PATH_CONVERSION_FUNCTIONS
-
-# Helper functions for option handling.                    -*- Autoconf -*-
-#
-#   Copyright (C) 2004, 2005, 2007, 2008, 2009 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 7 ltoptions.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-
-
-# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-# ------------------------------------------
-m4_define([_LT_MANGLE_OPTION],
-[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
-
-
-# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-# ---------------------------------------
-# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
-# saved as a flag.
-m4_define([_LT_SET_OPTION],
-[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
-m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
-        _LT_MANGLE_DEFUN([$1], [$2]),
-    [m4_warning([Unknown $1 option `$2'])])[]dnl
-])
-
-
-# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
-# ------------------------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-m4_define([_LT_IF_OPTION],
-[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
-
-
-# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
-# -------------------------------------------------------
-# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
-# are set.
-m4_define([_LT_UNLESS_OPTIONS],
-[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
-		      [m4_define([$0_found])])])[]dnl
-m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
-])[]dnl
-])
-
-
-# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-# ----------------------------------------
-# OPTION-LIST is a space-separated list of Libtool options associated
-# with MACRO-NAME.  If any OPTION has a matching handler declared with
-# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
-# the unknown option and exit.
-m4_defun([_LT_SET_OPTIONS],
-[# Set options
-m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-    [_LT_SET_OPTION([$1], _LT_Option)])
-
-m4_if([$1],[LT_INIT],[
-  dnl
-  dnl Simply set some default values (i.e off) if boolean options were not
-  dnl specified:
-  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
-  ])
-  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
-  ])
-  dnl
-  dnl If no reference was made to various pairs of opposing options, then
-  dnl we run the default mode handler for the pair.  For example, if neither
-  dnl `shared' nor `disable-shared' was passed, we enable building of shared
-  dnl archives by default:
-  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
-  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
-  		   [_LT_ENABLE_FAST_INSTALL])
-  ])
-])# _LT_SET_OPTIONS
-
-
-
-# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-# -----------------------------------------
-m4_define([_LT_MANGLE_DEFUN],
-[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
-
-
-# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-# -----------------------------------------------
-m4_define([LT_OPTION_DEFINE],
-[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
-])# LT_OPTION_DEFINE
-
-
-# dlopen
-# ------
-LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
-])
-
-AU_DEFUN([AC_LIBTOOL_DLOPEN],
-[_LT_SET_OPTION([LT_INIT], [dlopen])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `dlopen' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
-
-
-# win32-dll
-# ---------
-# Declare package support for building win32 dll's.
-LT_OPTION_DEFINE([LT_INIT], [win32-dll],
-[enable_win32_dll=yes
-
-case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-esac
-
-test -z "$AS" && AS=as
-_LT_DECL([], [AS],      [1], [Assembler program])dnl
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
-])# win32-dll
-
-AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-_LT_SET_OPTION([LT_INIT], [win32-dll])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `win32-dll' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
-
-
-# _LT_ENABLE_SHARED([DEFAULT])
-# ----------------------------
-# implement the --enable-shared flag, and supports the `shared' and
-# `disable-shared' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_SHARED],
-[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([shared],
-    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
-
-    _LT_DECL([build_libtool_libs], [enable_shared], [0],
-	[Whether or not to build shared libraries])
-])# _LT_ENABLE_SHARED
-
-LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
-])
-
-AC_DEFUN([AC_DISABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], [disable-shared])
-])
-
-AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_SHARED], [])
-dnl AC_DEFUN([AM_DISABLE_SHARED], [])
-
-
-
-# _LT_ENABLE_STATIC([DEFAULT])
-# ----------------------------
-# implement the --enable-static flag, and support the `static' and
-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_STATIC],
-[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([static],
-    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
-
-    _LT_DECL([build_old_libs], [enable_static], [0],
-	[Whether or not to build static libraries])
-])# _LT_ENABLE_STATIC
-
-LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-])
-
-AC_DEFUN([AC_DISABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], [disable-static])
-])
-
-AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_STATIC], [])
-dnl AC_DEFUN([AM_DISABLE_STATIC], [])
-
-
-
-# _LT_ENABLE_FAST_INSTALL([DEFAULT])
-# ----------------------------------
-# implement the --enable-fast-install flag, and support the `fast-install'
-# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_FAST_INSTALL],
-[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([fast-install],
-    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
-
-_LT_DECL([fast_install], [enable_fast_install], [0],
-	 [Whether or not to optimize for fast installation])dnl
-])# _LT_ENABLE_FAST_INSTALL
-
-LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
-
-# Old names:
-AU_DEFUN([AC_ENABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `fast-install' option into LT_INIT's first parameter.])
-])
-
-AU_DEFUN([AC_DISABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `disable-fast-install' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
-dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
-
-
-# _LT_WITH_PIC([MODE])
-# --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
-# LT_INIT options.
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-m4_define([_LT_WITH_PIC],
-[AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [lt_p=${PACKAGE-default}
-    case $withval in
-    yes|no) pic_mode=$withval ;;
-    *)
-      pic_mode=default
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for lt_pkg in $withval; do
-	IFS="$lt_save_ifs"
-	if test "X$lt_pkg" = "X$lt_p"; then
-	  pic_mode=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [pic_mode=default])
-
-test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
-
-_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
-])# _LT_WITH_PIC
-
-LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
-
-# Old name:
-AU_DEFUN([AC_LIBTOOL_PICMODE],
-[_LT_SET_OPTION([LT_INIT], [pic-only])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `pic-only' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
-
-
-m4_define([_LTDL_MODE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
-		 [m4_define([_LTDL_MODE], [nonrecursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [recursive],
-		 [m4_define([_LTDL_MODE], [recursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [subproject],
-		 [m4_define([_LTDL_MODE], [subproject])])
-
-m4_define([_LTDL_TYPE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [installable],
-		 [m4_define([_LTDL_TYPE], [installable])])
-LT_OPTION_DEFINE([LTDL_INIT], [convenience],
-		 [m4_define([_LTDL_TYPE], [convenience])])
-
-# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
-#
-# 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 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])])
-
-
-# lt_join(SEP, ARG1, [ARG2...])
-# -----------------------------
-# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
-# associated separator.
-# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-# versions in m4sugar had bugs.
-m4_define([lt_join],
-[m4_if([$#], [1], [],
-       [$#], [2], [[$2]],
-       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
-m4_define([_lt_join],
-[m4_if([$#$2], [2], [],
-       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
-
-
-# lt_car(LIST)
-# lt_cdr(LIST)
-# ------------
-# Manipulate m4 lists.
-# These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
-m4_define([lt_car], [[$1]])
-m4_define([lt_cdr],
-[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
-       [$#], 1, [],
-       [m4_dquote(m4_shift($@))])])
-m4_define([lt_unquote], $1)
-
-
-# lt_append(MACRO-NAME, STRING, [SEPARATOR])
-# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
-# Note that neither SEPARATOR nor STRING are expanded; they are appended
-# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-# than defined and empty).
-#
-# This macro is needed until we can rely on Autoconf 2.62, since earlier
-# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-m4_define([lt_append],
-[m4_define([$1],
-	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
-
-
-
-# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
-# ----------------------------------------------------------
-# 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(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])
-# -----------------------------------------------------------------------
-# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
-# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
-m4_define([lt_if_append_uniq],
-[m4_ifdef([$1],
-	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
-		 [lt_append([$1], [$2], [$3])$4],
-		 [$5])],
-	  [lt_append([$1], [$2], [$3])$4])])
-
-
-# lt_dict_add(DICT, KEY, VALUE)
-# -----------------------------
-m4_define([lt_dict_add],
-[m4_define([$1($2)], [$3])])
-
-
-# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-# --------------------------------------------
-m4_define([lt_dict_add_subkey],
-[m4_define([$1($2:$3)], [$4])])
-
-
-# lt_dict_fetch(DICT, KEY, [SUBKEY])
-# ----------------------------------
-m4_define([lt_dict_fetch],
-[m4_ifval([$3],
-	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
-    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
-
-
-# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
-# -----------------------------------------------------------------
-m4_define([lt_if_dict_fetch],
-[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
-	[$5],
-    [$6])])
-
-
-# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
-# --------------------------------------------------------------
-m4_define([lt_dict_filter],
-[m4_if([$5], [], [],
-  [lt_join(m4_quote(m4_default([$4], [[, ]])),
-           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
-		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
-])
-
-# ltversion.m4 -- version numbers			-*- Autoconf -*-
-#
-#   Copyright (C) 2004 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 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.
-
-# @configure_input@
-
-# serial 3337 ltversion.m4
-# This file is part of GNU Libtool
-
-m4_define([LT_PACKAGE_VERSION], [2.4.2])
-m4_define([LT_PACKAGE_REVISION], [1.3337])
-
-AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.2'
-macro_revision='1.3337'
-_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-_LT_DECL(, macro_revision, 0)
-])
-
-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
-#
-#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 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 lt~obsolete.m4
-
-# These exist entirely to fool aclocal when bootstrapping libtool.
-#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
-# which have later been changed to m4_define as they aren't part of the
-# exported API, or moved to Autoconf or Automake where they belong.
-#
-# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
-# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
-# using a macro with the same name in our local m4/libtool.m4 it'll
-# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
-# and doesn't know about Autoconf macros at all.)
-#
-# So we provide this file, which has a silly filename so it's always
-# included after everything else.  This provides aclocal with the
-# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
-# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
-#
-# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
-# Yes, that means every name once taken will need to remain here until
-# we give up compatibility with versions before 1.7, at which point
-# we need to keep only those names which we still refer to.
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
-
-m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
-m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
-m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
-m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
-m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
-m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
-m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
-m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
-m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
-m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
-m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
-m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
-m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
-m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
-m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
-m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
-m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
-m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
-m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
-m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
-m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
-m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
-m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
-m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
-m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
-m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
-m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
-m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
-m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
-m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
-m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
-m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
-m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
-m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
-m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
-m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
-m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
-m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
-m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
-m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
-m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
-m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
-m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
-m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
-m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
-m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
-m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
-m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
-
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_default([$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
-    pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
-    PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes ],
-		     [pkg_failed=yes])
- else
-    pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-   	AC_MSG_RESULT([no])
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	m4_default([$4], [AC_MSG_ERROR(
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT])[]dnl
-        ])
-elif test $pkg_failed = untried; then
-     	AC_MSG_RESULT([no])
-	m4_default([$4], [AC_MSG_FAILURE(
-[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.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
-        ])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	$3
-fi[]dnl
-])# PKG_CHECK_MODULES
-
-# Configure paths for GLIB
-# Owen Taylor     1997-2001
-
-dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject,
-dnl gthread, or gio is specified in MODULES, pass to pkg-config
-dnl
-AC_DEFUN([AM_PATH_GLIB_2_0],
-[dnl 
-dnl Get the cflags and libraries from pkg-config
-dnl
-AC_ARG_ENABLE(glibtest, [  --disable-glibtest      do not try to compile and run a test GLIB program],
-		    , enable_glibtest=yes)
-
-  pkg_config_args=glib-2.0
-  for module in . $4
-  do
-      case "$module" in
-         gmodule) 
-             pkg_config_args="$pkg_config_args gmodule-2.0"
-         ;;
-         gmodule-no-export) 
-             pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
-         ;;
-         gobject) 
-             pkg_config_args="$pkg_config_args gobject-2.0"
-         ;;
-         gthread) 
-             pkg_config_args="$pkg_config_args gthread-2.0"
-         ;;
-         gio*) 
-             pkg_config_args="$pkg_config_args $module-2.0"
-         ;;
-      esac
-  done
-
-  PKG_PROG_PKG_CONFIG([0.16])
-
-  no_glib=""
-
-  if test "x$PKG_CONFIG" = x ; then
-    no_glib=yes
-    PKG_CONFIG=no
-  fi
-
-  min_glib_version=ifelse([$1], ,2.0.0,$1)
-  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-
-  if test x$PKG_CONFIG != xno ; then
-    ## don't try to run the test against uninstalled libtool libs
-    if $PKG_CONFIG --uninstalled $pkg_config_args; then
-	  echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
-	  enable_glibtest=no
-    fi
-
-    if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
-	  :
-    else
-	  no_glib=yes
-    fi
-  fi
-
-  if test x"$no_glib" = x ; then
-    GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
-    GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
-    GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-    GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0`
-
-    GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
-    GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
-    glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_glibtest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GLIB_CFLAGS"
-      LIBS="$GLIB_LIBS $LIBS"
-dnl
-dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-dnl checks the results of pkg-config to some extent)
-dnl
-      rm -f conf.glibtest
-      AC_TRY_RUN([
-#include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int 
-main ()
-{
-  unsigned int major, minor, micro;
-  char *tmp_version;
-
-  fclose (fopen ("conf.glibtest", "w"));
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_glib_version");
-  if (sscanf(tmp_version, "%u.%u.%u", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_glib_version");
-     exit(1);
-   }
-
-  if ((glib_major_version != $glib_config_major_version) ||
-      (glib_minor_version != $glib_config_minor_version) ||
-      (glib_micro_version != $glib_config_micro_version))
-    {
-      printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
-             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
-             glib_major_version, glib_minor_version, glib_micro_version);
-      printf ("*** was found! If pkg-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-      printf("*** to point to the correct configuration files\n");
-    } 
-  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
-	   (glib_minor_version != GLIB_MINOR_VERSION) ||
-           (glib_micro_version != GLIB_MICRO_VERSION))
-    {
-      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
-	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     glib_major_version, glib_minor_version, glib_micro_version);
-    }
-  else
-    {
-      if ((glib_major_version > major) ||
-        ((glib_major_version == major) && (glib_minor_version > minor)) ||
-        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n",
-               glib_major_version, glib_minor_version, glib_micro_version);
-        printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
-        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_glib" = x ; then
-     AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     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/"
-     else
-       if test -f conf.glibtest ; then
-        :
-       else
-          echo "*** Could not run GLIB test program, checking why..."
-          ac_save_CFLAGS="$CFLAGS"
-          ac_save_LIBS="$LIBS"
-          CFLAGS="$CFLAGS $GLIB_CFLAGS"
-          LIBS="$LIBS $GLIB_LIBS"
-          AC_TRY_LINK([
-#include <glib.h>
-#include <stdio.h>
-],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
-        [ 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"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          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" ],
-        [ 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."])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GLIB_CFLAGS=""
-     GLIB_LIBS=""
-     GLIB_GENMARSHAL=""
-     GOBJECT_QUERY=""
-     GLIB_MKENUMS=""
-     GLIB_COMPILE_RESOURCES=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GLIB_CFLAGS)
-  AC_SUBST(GLIB_LIBS)
-  AC_SUBST(GLIB_GENMARSHAL)
-  AC_SUBST(GOBJECT_QUERY)
-  AC_SUBST(GLIB_MKENUMS)
-  AC_SUBST(GLIB_COMPILE_RESOURCES)
-  rm -f conf.glibtest
-])
-
diff --git a/configure b/configure
index 72d7f6b..52e1300 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for pygobject 3.7.1.
+# Generated by GNU Autoconf 2.69 for pygobject 3.7.2.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=pygobject>.
 #
@@ -591,10 +591,10 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='pygobject'
 PACKAGE_TARNAME='pygobject'
-PACKAGE_VERSION='3.7.1'
-PACKAGE_STRING='pygobject 3.7.1'
+PACKAGE_VERSION='3.7.2'
+PACKAGE_STRING='pygobject 3.7.2'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=pygobject'
-PACKAGE_URL=''
+PACKAGE_URL='https://live.gnome.org/PyGObject/'
 
 ac_unique_file="gi/gimodule.c"
 # Factoring default headers for most tests.
@@ -637,6 +637,14 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+GNOME_CODE_COVERAGE_RULES
+CODE_COVERAGE_LDFLAGS
+CODE_COVERAGE_CFLAGS
+GENHTML
+LCOV
+CODE_COVERAGE_ENABLED
+CODE_COVERAGE_ENABLED_FALSE
+CODE_COVERAGE_ENABLED_TRUE
 INTROSPECTION_COMPILER
 INTROSPECTION_SCANNER
 ENABLE_CAIRO_FALSE
@@ -732,9 +740,6 @@ build_os
 build_vendor
 build_cpu
 build
-MAINT
-MAINTAINER_MODE_FALSE
-MAINTAINER_MODE_TRUE
 am__untar
 am__tar
 AMTAR
@@ -808,7 +813,6 @@ ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_silent_rules
-enable_maintainer_mode
 enable_static
 enable_shared
 with_pic
@@ -817,10 +821,12 @@ enable_dependency_tracking
 with_gnu_ld
 with_sysroot
 enable_libtool_lock
+with_python
 enable_thread
 enable_glibtest
 with_ffi
 enable_cairo
+enable_code_coverage
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1385,7 +1391,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures pygobject 3.7.1 to adapt to many kinds of systems.
+\`configure' configures pygobject 3.7.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1455,7 +1461,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of pygobject 3.7.1:";;
+     short | recursive ) echo "Configuration of pygobject 3.7.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1465,8 +1471,6 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-silent-rules          less verbose build output (undo: `make V=1')
   --disable-silent-rules         verbose build output (undo: `make V=0')
-  --disable-maintainer-mode  disable make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer
   --enable-static[=PKGS]  build static libraries [default=no]
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-fast-install[=PKGS]
@@ -1478,6 +1482,7 @@ Optional Features:
   --disable-glibtest      do not try to compile and run a test GLIB program
   --enable-cairo          Enable Cairo bindings using introspection
                           information
+  --enable-code-coverage  Whether to enable code coverage support
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1487,6 +1492,9 @@ Optional Packages:
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot=DIR Search for dependent libraries within DIR
                         (or the compiler's sysroot if not specified).
+  --with-python=PATH      Path to Python interpreter; searches $PATH if only a
+                          program name is given; if not given, searches for a
+                          few standard names such as "python3" or "python2"
   --without-ffi           Disable libffi support
 
 Some influential environment variables:
@@ -1522,6 +1530,7 @@ Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
 Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=pygobject>.
+pygobject home page: <https://live.gnome.org/PyGObject/>.
 _ACEOF
 ac_status=$?
 fi
@@ -1584,7 +1593,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-pygobject configure 3.7.1
+pygobject configure 3.7.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1862,7 +1871,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by pygobject $as_me 3.7.1, which was
+It was created by pygobject $as_me 3.7.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2226,9 +2235,9 @@ $as_echo "#define PYGOBJECT_MINOR_VERSION 7" >>confdefs.h
 PYGOBJECT_MINOR_VERSION=7
 
 
-$as_echo "#define PYGOBJECT_MICRO_VERSION 1" >>confdefs.h
+$as_echo "#define PYGOBJECT_MICRO_VERSION 2" >>confdefs.h
 
-PYGOBJECT_MICRO_VERSION=1
+PYGOBJECT_MICRO_VERSION=2
 
 
 ac_config_headers="$ac_config_headers config.h"
@@ -2739,7 +2748,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='pygobject'
- VERSION='3.7.1'
+ VERSION='3.7.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2780,29 +2789,6 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-    # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then :
-  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=yes
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
-$as_echo "$USE_MAINTAINER_MODE" >&6; }
-   if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-
-  MAINT=$MAINTAINER_MODE_TRUE
-
-
-
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 
 # Make sure we can run config.sub.
@@ -2918,342 +2904,6 @@ else
 fi
 
 
-# Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then :
-  enableval=$enable_static; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_static=no
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-enable_win32_dll=yes
-
-case $host in
-*-*-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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AS+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AS="${ac_tool_prefix}as"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AS=$ac_cv_prog_AS
-if test -n "$AS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
-$as_echo "$AS" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AS+:} false; then :
-  $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.
-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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AS="as"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AS=$ac_cv_prog_ac_ct_AS
-if test -n "$ac_ct_AS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
-$as_echo "$ac_ct_AS" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_AS" = x; then
-    AS="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AS=$ac_ct_AS
-  fi
-else
-  AS="$ac_cv_prog_AS"
-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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-$as_echo "$DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
-  $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.
-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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-$as_echo "$ac_ct_DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DLLTOOL" = x; then
-    DLLTOOL="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DLLTOOL=$ac_ct_DLLTOOL
-  fi
-else
-  DLLTOOL="$ac_cv_prog_DLLTOOL"
-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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJDUMP+:} false; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OBJDUMP" = x; then
-    OBJDUMP="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OBJDUMP=$ac_ct_OBJDUMP
-  fi
-else
-  OBJDUMP="$ac_cv_prog_OBJDUMP"
-fi
-
-  ;;
-esac
-
-test -z "$AS" && AS=as
-
-
-
-
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-
-
-
-
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-
-
-
-
-
-
 
 case `pwd` in
   *\ * | *\	*)
@@ -5447,10 +5097,6 @@ freebsd* | dragonfly*)
   fi
   ;;
 
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -5489,7 +5135,7 @@ irix5* | irix6* | nonstopux*)
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -7737,10 +7383,338 @@ done
 
 
 # Set options
+enable_dlopen=yes
+enable_win32_dll=yes
+
+case $host in
+*-*-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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AS+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AS"; then
+  ac_cv_prog_AS="$AS" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AS="${ac_tool_prefix}as"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AS=$ac_cv_prog_AS
+if test -n "$AS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+$as_echo "$AS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AS+:} false; then :
+  $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.
+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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AS="as"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AS=$ac_cv_prog_ac_ct_AS
+if test -n "$ac_ct_AS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
+$as_echo "$ac_ct_AS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_AS" = x; then
+    AS="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AS=$ac_ct_AS
+  fi
+else
+  AS="$ac_cv_prog_AS"
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+  $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.
+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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OBJDUMP+:} false; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+  ;;
+esac
+
+test -z "$AS" && AS=as
+
+
+
+
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+# Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then :
+  enableval=$enable_static; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_static=no
+fi
+
+
+
+
+
+
 
 
 
-        enable_dlopen=no
 
 
 
@@ -8165,6 +8139,10 @@ _lt_linker_boilerplate=`cat conftest.err`
 $RM -r conftest*
 
 
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
 if test -n "$compiler"; then
 
 lt_prog_compiler_no_builtin_flag=
@@ -8377,7 +8355,7 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -10547,17 +10525,6 @@ freebsd* | dragonfly*)
   esac
   ;;
 
-gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
 haiku*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
@@ -10674,7 +10641,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
@@ -11720,1378 +11687,6 @@ CC="$lt_save_CC"
 # Only expand once:
 
 
-: ${CONFIG_LT=./config.lt}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
-$as_echo "$as_me: creating $CONFIG_LT" >&6;}
-as_write_fail=0
-cat >"$CONFIG_LT" <<_ASEOF || as_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate a libtool stub with the current configuration.
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>"$CONFIG_LT" <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_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
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  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
-    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
-  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
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# 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.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-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 -pR'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -pR'
-  fi
-else
-  as_ln_s='cp -pR'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-## --------------------------------- ##
-## Main body of "$CONFIG_LT" script. ##
-## --------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x "$CONFIG_LT"
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-lt_cl_silent=false
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-
-lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
-for use in further configure time tests before the real libtool is
-generated.
-
-Usage: $0 [OPTIONS]
-
-  -h, --help      print this help, then exit
-  -V, --version   print version number, then exit
-  -q, --quiet     do not print progress messages
-  -d, --debug     don't remove temporary files
-
-Report bugs to <bug-libtool@gnu.org>."
-
-lt_cl_version="\
-pygobject config.lt 3.7.1
-configured by $0, generated by GNU Autoconf 2.69.
-
-Copyright (C) 2011 Free Software Foundation, Inc.
-This config.lt script is free software; the Free Software Foundation
-gives unlimited permision to copy, distribute and modify it."
-
-while test $# != 0
-do
-  case $1 in
-    --version | --v* | -V )
-      echo "$lt_cl_version"; exit 0 ;;
-    --help | --h* | -h )
-      echo "$lt_cl_help"; exit 0 ;;
-    --debug | --d* | -d )
-      debug=: ;;
-    --quiet | --q* | --silent | --s* | -q )
-      lt_cl_silent=: ;;
-
-    -*) as_fn_error $? "unrecognized option: $1
-Try \`$0 --help' for more information." "$LINENO" 5 ;;
-
-    *) as_fn_error $? "unrecognized argument: $1
-Try \`$0 --help' for more information." "$LINENO" 5 ;;
-  esac
-  shift
-done
-
-if $lt_cl_silent; then
-  exec 6>/dev/null
-fi
-_LTEOF
-
-cat >>"$CONFIG_LT" <<_LTEOF
-
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
-AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
-DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
-SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
-ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
-PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
-host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
-host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
-host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
-build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
-build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
-build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
-SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
-Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
-GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
-EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
-FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
-LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
-NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
-LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
-exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
-file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
-want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
-sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
-AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
-archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
-STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
-lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
-CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
-compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
-GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
-nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
-lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
-objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
-need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
-MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
-LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
-libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
-postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
-need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
-version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
-install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
-striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
-
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-
-# Quote evaled strings.
-for var in AS \
-DLLTOOL \
-OBJDUMP \
-SHELL \
-ECHO \
-PATH_SEPARATOR \
-SED \
-GREP \
-EGREP \
-FGREP \
-LD \
-NM \
-LN_S \
-lt_SP2NL \
-lt_NL2SP \
-reload_flag \
-deplibs_check_method \
-file_magic_cmd \
-file_magic_glob \
-want_nocaseglob \
-sharedlib_from_linklib_cmd \
-AR \
-AR_FLAGS \
-archiver_list_spec \
-STRIP \
-RANLIB \
-CC \
-CFLAGS \
-compiler \
-lt_cv_sys_global_symbol_pipe \
-lt_cv_sys_global_symbol_to_cdecl \
-lt_cv_sys_global_symbol_to_c_name_address \
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-nm_file_list_spec \
-lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_pic \
-lt_prog_compiler_wl \
-lt_prog_compiler_static \
-lt_cv_prog_compiler_c_o \
-need_locks \
-MANIFEST_TOOL \
-DSYMUTIL \
-NMEDIT \
-LIPO \
-OTOOL \
-OTOOL64 \
-shrext_cmds \
-export_dynamic_flag_spec \
-whole_archive_flag_spec \
-compiler_needs_object \
-with_gnu_ld \
-allow_undefined_flag \
-no_undefined_flag \
-hardcode_libdir_flag_spec \
-hardcode_libdir_separator \
-exclude_expsyms \
-include_expsyms \
-file_list_spec \
-variables_saved_for_relink \
-libname_spec \
-library_names_spec \
-soname_spec \
-install_override_mode \
-finish_eval \
-old_striplib \
-striplib; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in reload_cmds \
-old_postinstall_cmds \
-old_postuninstall_cmds \
-old_archive_cmds \
-extract_expsyms_cmds \
-old_archive_from_new_cmds \
-old_archive_from_expsyms_cmds \
-archive_cmds \
-archive_expsym_cmds \
-module_cmds \
-module_expsym_cmds \
-export_symbols_cmds \
-prelink_cmds \
-postlink_cmds \
-postinstall_cmds \
-postuninstall_cmds \
-finish_cmds \
-sys_lib_search_path_spec \
-sys_lib_dlsearch_path_spec; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-ac_aux_dir='$ac_aux_dir'
-xsi_shell='$xsi_shell'
-lt_shell_append='$lt_shell_append'
-
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
-    RM='$RM'
-    ofile='$ofile'
-
-
-
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $ofile" >&5
-$as_echo "$as_me: creating $ofile" >&6;}
-
-
-    # See if we are running on zsh, and set the options which allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile="${ofile}T"
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-# The names of the tagged configurations supported by this script.
-available_tags=""
-
-# ### BEGIN LIBTOOL CONFIG
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Assembler program.
-AS=$lt_AS
-
-# DLL creation program.
-DLLTOOL=$lt_DLLTOOL
-
-# Object dumper program.
-OBJDUMP=$lt_OBJDUMP
-
-# Which release of libtool.m4 was used?
-macro_version=$macro_version
-macro_revision=$macro_revision
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# What type of objects to build.
-pic_mode=$pic_mode
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# An echo program that protects backslashes.
-ECHO=$lt_ECHO
-
-# The PATH separator for the build system.
-PATH_SEPARATOR=$lt_PATH_SEPARATOR
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="\$SED -e 1s/^X//"
-
-# A grep program that handles long lines.
-GREP=$lt_GREP
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# A literal string matcher.
-FGREP=$lt_FGREP
-
-# A BSD- or MS-compatible name lister.
-NM=$lt_NM
-
-# Whether we need soft or hard links.
-LN_S=$lt_LN_S
-
-# What is the maximum length of a command?
-max_cmd_len=$max_cmd_len
-
-# Object file suffix (normally "o").
-objext=$ac_objext
-
-# Executable file suffix (normally "").
-exeext=$exeext
-
-# whether the shell understands "unset".
-lt_unset=$lt_unset
-
-# turn spaces into newlines.
-SP2NL=$lt_lt_SP2NL
-
-# turn newlines into spaces.
-NL2SP=$lt_lt_NL2SP
-
-# convert \$build file names to \$host format.
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-
-# convert \$build files to toolchain format.
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method = "file_magic".
-file_magic_cmd=$lt_file_magic_cmd
-
-# How to find potential files when deplibs_check_method = "file_magic".
-file_magic_glob=$lt_file_magic_glob
-
-# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
-want_nocaseglob=$lt_want_nocaseglob
-
-# Command to associate shared and link libraries.
-sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
-
-# The archiver.
-AR=$lt_AR
-
-# Flags to create an archive.
-AR_FLAGS=$lt_AR_FLAGS
-
-# How to feed a file listing to the archiver.
-archiver_list_spec=$lt_archiver_list_spec
-
-# A symbol stripping program.
-STRIP=$lt_STRIP
-
-# Commands used to install an old-style archive.
-RANLIB=$lt_RANLIB
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Whether to use a lock for old archive extraction.
-lock_old_archive_extraction=$lock_old_archive_extraction
-
-# A C compiler.
-LTCC=$lt_CC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_CFLAGS
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration.
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair.
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# Transform the output of nm in a C name address pair when lib prefix is needed.
-global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-
-# Specify filename containing input files for \$NM.
-nm_file_list_spec=$lt_nm_file_list_spec
-
-# The root where to search for dependent libraries,and in which our libraries should be installed.
-lt_sysroot=$lt_sysroot
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# Used to examine libraries when file_magic_cmd begins with "file".
-MAGIC_CMD=$MAGIC_CMD
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Manifest tool.
-MANIFEST_TOOL=$lt_MANIFEST_TOOL
-
-# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
-DSYMUTIL=$lt_DSYMUTIL
-
-# Tool to change global to local symbols on Mac OS X.
-NMEDIT=$lt_NMEDIT
-
-# Tool to manipulate fat objects and archives on Mac OS X.
-LIPO=$lt_LIPO
-
-# ldd/readelf like tool for Mach-O binaries on Mac OS X.
-OTOOL=$lt_OTOOL
-
-# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
-OTOOL64=$lt_OTOOL64
-
-# Old archive suffix (normally "a").
-libext=$libext
-
-# Shared library suffix (normally ".so").
-shrext_cmds=$lt_shrext_cmds
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at link time.
-variables_saved_for_relink=$lt_variables_saved_for_relink
-
-# Do we need the "lib" prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Library versioning type.
-version_type=$version_type
-
-# Shared library runtime path variable.
-runpath_var=$runpath_var
-
-# Shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Permission mode override for installation of shared libraries.
-install_override_mode=$lt_install_override_mode
-
-# Command to use after installation of a shared archive.
-postinstall_cmds=$lt_postinstall_cmds
-
-# Command to use after uninstallation of a shared archive.
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# As "finish_cmds", except a single script fragment to be evaled but
-# not shown.
-finish_eval=$lt_finish_eval
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Compile-time system search path for libraries.
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-
-# The linker used to build libraries.
-LD=$lt_LD
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# Commands used to build an old-style archive.
-old_archive_cmds=$lt_old_archive_cmds
-
-# A language specific compiler.
-CC=$lt_compiler
-
-# Is the compiler the GNU compiler?
-with_gcc=$GCC
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc
-
-# Whether or not to disallow shared libs when runtime libs are static.
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
-
-# Whether the compiler copes with passing no objects directly.
-compiler_needs_object=$lt_compiler_needs_object
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-
-# Commands used to build a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-
-# Commands used to build a loadable module if different from building
-# a shared archive.
-module_cmds=$lt_module_cmds
-module_expsym_cmds=$lt_module_expsym_cmds
-
-# Whether we are building with GNU ld or not.
-with_gnu_ld=$lt_with_gnu_ld
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
-
-# Flag that enforces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-
-# Whether we need a single "-rpath" flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary.
-hardcode_direct=$hardcode_direct
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
-# library is relocated.
-hardcode_direct_absolute=$hardcode_direct_absolute
-
-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-# into the resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-# into the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-# Set to "yes" if building a shared library automatically hardcodes DIR
-# into the library and all subsequent libraries and executables linked
-# against it.
-hardcode_automatic=$hardcode_automatic
-
-# Set to yes if linker adds runtime paths of dependent libraries
-# to runtime path list.
-inherit_rpath=$inherit_rpath
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
-
-# Set to "yes" if exported symbols are required.
-always_export_symbols=$always_export_symbols
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
-
-# Commands necessary for linking programs (against libraries) with templates.
-prelink_cmds=$lt_prelink_cmds
-
-# Commands necessary for finishing linking programs.
-postlink_cmds=$lt_postlink_cmds
-
-# Specify filename containing input files.
-file_list_spec=$lt_file_list_spec
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
-     || (rm -f "$cfgfile"; exit 1)
-
-  if test x"$xsi_shell" = xyes; then
-  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
-func_dirname ()\
-{\
-\    case ${1} in\
-\      */*) func_dirname_result="${1%/*}${2}" ;;\
-\      *  ) func_dirname_result="${3}" ;;\
-\    esac\
-} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_basename ()$/,/^} # func_basename /c\
-func_basename ()\
-{\
-\    func_basename_result="${1##*/}"\
-} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
-func_dirname_and_basename ()\
-{\
-\    case ${1} in\
-\      */*) func_dirname_result="${1%/*}${2}" ;;\
-\      *  ) func_dirname_result="${3}" ;;\
-\    esac\
-\    func_basename_result="${1##*/}"\
-} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
-func_stripname ()\
-{\
-\    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
-\    # positional parameters, so assign one to ordinary parameter first.\
-\    func_stripname_result=${3}\
-\    func_stripname_result=${func_stripname_result#"${1}"}\
-\    func_stripname_result=${func_stripname_result%"${2}"}\
-} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
-func_split_long_opt ()\
-{\
-\    func_split_long_opt_name=${1%%=*}\
-\    func_split_long_opt_arg=${1#*=}\
-} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
-func_split_short_opt ()\
-{\
-\    func_split_short_opt_arg=${1#??}\
-\    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
-} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
-func_lo2o ()\
-{\
-\    case ${1} in\
-\      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
-\      *)    func_lo2o_result=${1} ;;\
-\    esac\
-} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_xform ()$/,/^} # func_xform /c\
-func_xform ()\
-{\
-    func_xform_result=${1%.*}.lo\
-} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_arith ()$/,/^} # func_arith /c\
-func_arith ()\
-{\
-    func_arith_result=$(( $* ))\
-} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_len ()$/,/^} # func_len /c\
-func_len ()\
-{\
-    func_len_result=${#1}\
-} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-fi
-
-if test x"$lt_shell_append" = xyes; then
-  sed -e '/^func_append ()$/,/^} # func_append /c\
-func_append ()\
-{\
-    eval "${1}+=\\${2}"\
-} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
-func_append_quoted ()\
-{\
-\    func_quote_for_eval "${2}"\
-\    eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
-} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  # Save a `func_append' function call where possible by direct use of '+='
-  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-else
-  # Save a `func_append' function call even when '+=' is not available
-  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
-$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
-fi
-
-
-   mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-
-
-as_fn_exit 0
-_LTEOF
-chmod +x "$CONFIG_LT"
-
-# configure is writing to config.log, but config.lt does its own redirection,
-# appending to config.log, which fails on DOS, as config.log is still kept
-# open by configure.  Here we exec the FD to /dev/null, effectively closing
-# config.log, so it can be properly (re)opened and appended to by config.lt.
-lt_cl_success=:
-test "$silent" = yes &&
-  lt_config_lt_args="$lt_config_lt_args --quiet"
-exec 5>/dev/null
-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-exec 5>>config.log
-$lt_cl_success || as_fn_exit 1
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
 $as_echo_n "checking for library containing strerror... " >&6; }
@@ -14613,7 +13208,23 @@ fi
 
 
 
-# check that we have the minimum version of python necisary to build
+# option to specify python interpreter to use; this just sets $PYTHON, so that
+# we will fallback to reading $PYTHON if --with-python is not given, and
+# python.m4 will get the expected input
+
+# Check whether --with-python was given.
+if test "${with_python+set}" = set; then :
+  withval=$with_python; PYTHON="$withval"
+fi
+
+if test x"$PYTHON" = xyes; then
+	as_fn_error $? "--with-python option requires a path or program argument" "$LINENO" 5
+fi
+if test -n "$PYTHON" && ! which "$PYTHON"; then
+	as_fn_error $? "Python interpreter $PYTHON does not exist" "$LINENO" 5
+fi
+
+# check that we have the minimum version of python necessary to build
 
 
 
@@ -14651,7 +13262,7 @@ if ${am_cv_pathless_PYTHON+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-	for am_cv_pathless_PYTHON in python python2 python2.7 python2.6 python3 python3.2 python3.1 none; do
+	for am_cv_pathless_PYTHON in python3 python3.3 python3.2 python3.1 python2 python2.7 python2.6 python none; do
 	  test "$am_cv_pathless_PYTHON" = none && break
 	  prog="import sys
 # split strings by '.' and convert to numeric.  Append some zeros
@@ -14852,7 +13463,7 @@ fi
 
         # Find any Python interpreter.
     if test -z "$PYTHON"; then
-      for ac_prog in python python2 python2.7 python2.6 python3 python3.2 python3.1
+      for ac_prog in python3 python3.3 python3.2 python3.1 python2 python2.7 python2.6 python
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -15207,7 +13818,8 @@ py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
 if test "x$py_val" != xno; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-  else
+  enable_thread=yes
+else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
   enable_thread=no
@@ -15391,7 +14003,7 @@ fi
     PKG_CONFIG=no
   fi
 
-  min_glib_version=2.31.0
+  min_glib_version=2.34.2
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB - version >= $min_glib_version" >&5
 $as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; }
 
@@ -15736,12 +14348,12 @@ if test -n "$GIO_CFLAGS"; then
     pkg_cv_GIO_CFLAGS="$GIO_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= 2.31.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gio-2.0 >= 2.31.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= 2.34.2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gio-2.0 >= 2.34.2") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= 2.31.0" 2>/dev/null`
+  pkg_cv_GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= 2.34.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -15753,12 +14365,12 @@ if test -n "$GIO_LIBS"; then
     pkg_cv_GIO_LIBS="$GIO_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= 2.31.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gio-2.0 >= 2.31.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= 2.34.2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gio-2.0 >= 2.34.2") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= 2.31.0" 2>/dev/null`
+  pkg_cv_GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= 2.34.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -15779,14 +14391,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-2.0 >= 2.31.0" 2>&1`
+	        GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-2.0 >= 2.34.2" 2>&1`
         else
-	        GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-2.0 >= 2.31.0" 2>&1`
+	        GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-2.0 >= 2.34.2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GIO_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (gio-2.0 >= 2.31.0) were not met:
+	as_fn_error $? "Package requirements (gio-2.0 >= 2.34.2) were not met:
 
 $GIO_PKG_ERRORS
 
@@ -15836,17 +14448,17 @@ if test -n "$GI_CFLAGS"; then
     pkg_cv_GI_CFLAGS="$GI_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.31.0
-    gobject-introspection-1.0 >= 1.33.14
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.34.2
+    gobject-introspection-1.0 >= 1.34.2
 \""; } >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.31.0
-    gobject-introspection-1.0 >= 1.33.14
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.34.2
+    gobject-introspection-1.0 >= 1.34.2
 ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GI_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.31.0
-    gobject-introspection-1.0 >= 1.33.14
+  pkg_cv_GI_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.34.2
+    gobject-introspection-1.0 >= 1.34.2
 " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -15859,17 +14471,17 @@ if test -n "$GI_LIBS"; then
     pkg_cv_GI_LIBS="$GI_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.31.0
-    gobject-introspection-1.0 >= 1.33.14
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.34.2
+    gobject-introspection-1.0 >= 1.34.2
 \""; } >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.31.0
-    gobject-introspection-1.0 >= 1.33.14
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.34.2
+    gobject-introspection-1.0 >= 1.34.2
 ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GI_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.31.0
-    gobject-introspection-1.0 >= 1.33.14
+  pkg_cv_GI_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.34.2
+    gobject-introspection-1.0 >= 1.34.2
 " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -15891,19 +14503,19 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.31.0
-    gobject-introspection-1.0 >= 1.33.14
+	        GI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.34.2
+    gobject-introspection-1.0 >= 1.34.2
 " 2>&1`
         else
-	        GI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.31.0
-    gobject-introspection-1.0 >= 1.33.14
+	        GI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.34.2
+    gobject-introspection-1.0 >= 1.34.2
 " 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GI_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (glib-2.0 >= 2.31.0
-    gobject-introspection-1.0 >= 1.33.14
+	as_fn_error $? "Package requirements (glib-2.0 >= 2.34.2
+    gobject-introspection-1.0 >= 1.34.2
 ) were not met:
 
 $GI_PKG_ERRORS
@@ -16454,6 +15066,39 @@ $as_echo "$jh_has_option" >&6; }
 esac
 
 case " $CFLAGS " in
+*[\	\ ]-Werror=unused-variable[\	\ ]*)
+  ;;
+*)
+  save_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -Werror=unused-variable"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -Werror=unused-variable" >&5
+$as_echo_n "checking whether $CC understands -Werror=unused-variable... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  jh_has_option=yes
+else
+  jh_has_option=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jh_has_option" >&5
+$as_echo "$jh_has_option" >&6; }
+  if test $jh_has_option = no; then
+    CFLAGS="$save_CFLAGS"
+  fi
+  ;;
+esac
+
+case " $CFLAGS " in
 *[\	\ ]-fno-strict-aliasing[\	\ ]*)
   ;;
 *)
@@ -16528,7 +15173,239 @@ esac
 
 fi
 
-ac_config_files="$ac_config_files Makefile pygobject-3.0.pc pygobject-3.0-uninstalled.pc gi/Makefile gi/repository/Makefile gi/overrides/Makefile gi/_glib/Makefile gi/_gobject/Makefile examples/Makefile tests/Makefile PKG-INFO"
+# enable code coverage support
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with code coverage support" >&5
+$as_echo_n "checking whether to build with code coverage support... " >&6; }
+	# Check whether --enable-code-coverage was given.
+if test "${enable_code_coverage+set}" = set; then :
+  enableval=$enable_code_coverage;
+else
+  enable_code_coverage=no
+fi
+
+	 if test x$enable_code_coverage = xyes; then
+  CODE_COVERAGE_ENABLED_TRUE=
+  CODE_COVERAGE_ENABLED_FALSE='#'
+else
+  CODE_COVERAGE_ENABLED_TRUE='#'
+  CODE_COVERAGE_ENABLED_FALSE=
+fi
+
+	CODE_COVERAGE_ENABLED=$enable_code_coverage
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_code_coverage" >&5
+$as_echo "$enable_code_coverage" >&6; }
+
+	if  test "$enable_code_coverage" = "yes" ; then :
+
+				if  test "$GCC" = "no" ; then :
+
+			as_fn_error $? "not compiling with gcc, which is required for gcov code coverage" "$LINENO" 5
+
+fi
+
+		# List of supported lcov versions.
+		lcov_version_list="1.6 1.7 1.8 1.9"
+
+		# Extract the first word of "lcov", so it can be a program name with args.
+set dummy lcov; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_LCOV+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LCOV"; then
+  ac_cv_prog_LCOV="$LCOV" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_LCOV="lcov"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LCOV=$ac_cv_prog_LCOV
+if test -n "$LCOV"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LCOV" >&5
+$as_echo "$LCOV" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+		# Extract the first word of "genhtml", so it can be a program name with args.
+set dummy genhtml; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_GENHTML+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$GENHTML"; then
+  ac_cv_prog_GENHTML="$GENHTML" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_GENHTML="genhtml"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+GENHTML=$ac_cv_prog_GENHTML
+if test -n "$GENHTML"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GENHTML" >&5
+$as_echo "$GENHTML" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+		if  test "$LCOV" ; then :
+
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lcov version" >&5
+$as_echo_n "checking for lcov version... " >&6; }
+if ${gnome_cv_lcov_version+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+				gnome_cv_lcov_version=invalid
+				lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'`
+				for lcov_check_version in $lcov_version_list; do
+					if test "$lcov_version" = "$lcov_check_version"; then
+						gnome_cv_lcov_version="$lcov_check_version (ok)"
+					fi
+				done
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gnome_cv_lcov_version" >&5
+$as_echo "$gnome_cv_lcov_version" >&6; }
+
+else
+
+			lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list"
+			as_fn_error $? "$lcov_msg" "$LINENO" 5
+
+fi
+
+		case $gnome_cv_lcov_version in
+			""|invalid)
+				lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)."
+				as_fn_error $? "$lcov_msg" "$LINENO" 5
+				LCOV="exit 0;"
+			;;
+		esac
+
+		if  test -z "$GENHTML" ; then :
+
+			as_fn_error $? "Could not find genhtml from the lcov package" "$LINENO" 5
+
+fi
+
+				CODE_COVERAGE_CFLAGS="-O0 -g -fprofile-arcs -ftest-coverage"
+		CODE_COVERAGE_LDFLAGS="-lgcov"
+
+
+
+
+fi
+
+GNOME_CODE_COVERAGE_RULES='
+# Code coverage
+#
+# Optional:
+#  - CODE_COVERAGE_DIRECTORY: Top-level directory for code coverage reporting.
+#    (Default: $(top_builddir))
+#  - CODE_COVERAGE_OUTPUT_FILE: Filename and path for the .info file generated
+#    by lcov for code coverage. (Default:
+#    $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info)
+#  - CODE_COVERAGE_OUTPUT_DIRECTORY: Directory for generated code coverage
+#    reports to be created. (Default:
+#    $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage)
+#  - CODE_COVERAGE_LCOV_OPTIONS: Extra options to pass to the lcov instance.
+#    (Default: empty)
+#  - CODE_COVERAGE_GENHTML_OPTIONS: Extra options to pass to the genhtml
+#    instance. (Default: empty)
+#
+# The generated report will be titled using the $(PACKAGE_NAME) and
+# $(PACKAGE_VERSION). In order to add the current git hash to the title,
+# use the git-version-gen script, available online.
+
+# Optional variables
+CODE_COVERAGE_DIRECTORY ?= $(top_builddir)
+CODE_COVERAGE_OUTPUT_FILE ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info
+CODE_COVERAGE_OUTPUT_DIRECTORY ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage
+CODE_COVERAGE_LCOV_OPTIONS ?=
+CODE_COVERAGE_GENHTML_OPTIONS ?=
+
+# Use recursive makes in order to ignore errors during check
+check-code-coverage:
+ifdef CODE_COVERAGE_ENABLED
+	-$(MAKE) $(AM_MAKEFLAGS) -k check
+	$(MAKE) $(AM_MAKEFLAGS) code-coverage-capture
+else
+	@echo "Need to reconfigure with --enable-code-coverage"
+endif
+
+# Capture code coverage data
+code-coverage-capture: code-coverage-capture-hook
+ifdef CODE_COVERAGE_ENABLED
+	$(LCOV) --directory $(CODE_COVERAGE_DIRECTORY) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_OPTIONS)
+	$(LCOV) --directory $(CODE_COVERAGE_DIRECTORY) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" --output-file "$(CODE_COVERAGE_OUTPUT_FILE)"
+	-rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp
+	LANG=C $(GENHTML) --prefix $(CODE_COVERAGE_DIRECTORY) --output-directory "$(CODE_COVERAGE_OUTPUT_DIRECTORY)" --title "$(PACKAGE_NAME)-$(PACKAGE_VERSION) Code Coverage" --legend --show-details "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_GENHTML_OPTIONS)
+	@echo "file://$(abs_builddir)/$(CODE_COVERAGE_OUTPUT_DIRECTORY)/index.html"
+else
+	@echo "Need to reconfigure with --enable-code-coverage"
+endif
+
+# Hook rule executed before code-coverage-capture, overridable by the user
+code-coverage-capture-hook:
+
+clean: code-coverage-clean
+code-coverage-clean:
+	-$(LCOV) --directory $(top_builddir) -z
+	-rm -rf $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_FILE).tmp $(CODE_COVERAGE_OUTPUT_DIRECTORY)
+	-find . -name "*.gcda" -o -name "*.gcov" -delete
+
+GITIGNOREFILES ?=
+GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY)
+
+DISTCHECK_CONFIGURE_FLAGS ?=
+DISTCHECK_CONFIGURE_FLAGS += --disable-code-coverage
+
+.PHONY: check-code-coverage code-coverage-capture code-coverage-capture-hook code-coverage-clean
+'
+
+
+
+
+CFLAGS="$CFLAGS $CODE_COVERAGE_CFLAGS"
+LDFLAGS="$LDFLAGS $CODE_COVERAGE_CFLAGS"
+
+ac_config_files="$ac_config_files Makefile pygobject-3.0.pc pygobject-3.0-uninstalled.pc gi/Makefile gi/repository/Makefile gi/overrides/Makefile gi/_glib/Makefile gi/_gobject/Makefile examples/Makefile tests/Makefile pygtkcompat/Makefile PKG-INFO"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -16647,10 +15524,6 @@ else
   am__EXEEXT_FALSE=
 fi
 
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${PLATFORM_WIN32_TRUE}" && test -z "${PLATFORM_WIN32_FALSE}"; then
   as_fn_error $? "conditional \"PLATFORM_WIN32\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -16683,6 +15556,10 @@ if test -z "${ENABLE_CAIRO_TRUE}" && test -z "${ENABLE_CAIRO_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_CAIRO\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${CODE_COVERAGE_ENABLED_TRUE}" && test -z "${CODE_COVERAGE_ENABLED_FALSE}"; then
+  as_fn_error $? "conditional \"CODE_COVERAGE_ENABLED\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
@@ -17080,7 +15957,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by pygobject $as_me 3.7.1, which was
+This file was extended by pygobject $as_me 3.7.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17140,13 +16017,14 @@ $config_headers
 Configuration commands:
 $config_commands
 
-Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=pygobject>."
+Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=pygobject>.
+pygobject home page: <https://live.gnome.org/PyGObject/>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-pygobject config.status 3.7.1
+pygobject config.status 3.7.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -17275,12 +16153,12 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 sed_quote_subst='$sed_quote_subst'
 double_quote_subst='$double_quote_subst'
 delay_variable_subst='$delay_variable_subst'
-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
 AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
 DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
 enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
 pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
@@ -17543,7 +16421,6 @@ fi
     RM='$RM'
     ofile='$ofile'
 
-ac_aux_dir='$ac_aux_dir'
 
 
 
@@ -17568,6 +16445,7 @@ do
     "gi/_gobject/Makefile") CONFIG_FILES="$CONFIG_FILES gi/_gobject/Makefile" ;;
     "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+    "pygtkcompat/Makefile") CONFIG_FILES="$CONFIG_FILES pygtkcompat/Makefile" ;;
     "PKG-INFO") CONFIG_FILES="$CONFIG_FILES PKG-INFO" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
@@ -18313,8 +17191,9 @@ available_tags=""
 
 # ### BEGIN LIBTOOL CONFIG
 
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
+# Which release of libtool.m4 was used?
+macro_version=$macro_version
+macro_revision=$macro_revision
 
 # Assembler program.
 AS=$lt_AS
@@ -18325,9 +17204,8 @@ DLLTOOL=$lt_DLLTOOL
 # Object dumper program.
 OBJDUMP=$lt_OBJDUMP
 
-# Which release of libtool.m4 was used?
-macro_version=$macro_version
-macro_revision=$macro_revision
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
 
 # Whether or not to build shared libraries.
 build_libtool_libs=$enable_shared
@@ -18931,6 +17809,22 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 
-echo
-echo "libffi support: $have_libffi"
-echo
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
+	pygobject $VERSION
+
+	Using python interpreter:	$PYTHON
+	libffi support:			$have_libffi
+	cairo support:			$enable_cairo
+	thread support:			$enable_thread
+	code coverage support:          $enable_code_coverage
+" >&5
+$as_echo "
+	pygobject $VERSION
+
+	Using python interpreter:	$PYTHON
+	libffi support:			$have_libffi
+	cairo support:			$enable_cairo
+	thread support:			$enable_thread
+	code coverage support:          $enable_code_coverage
+" >&6; }
+
diff --git a/configure.ac b/configure.ac
index b6c3557..a87998e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,29 +1,36 @@
 -*- mode: m4 -*-
-AC_PREREQ(2.52)
+AC_PREREQ([2.68])
+
+# The version of python used is determined by the executable pointed to by the
+# --with-python switch, or if that's not set, by the PYTHON environment
+# variable.  For instance if your system installs Python 3 as python3 to
+# configure to compile pygobject under Python 3 you would do this:
+#   $ ./configure --with-python=python3
+# or
+#   $ PYTHON=python3 ./configure
+#
+# You can also build against a full interpreter path, such as
+#   $ ./configure --with-python=~/my-patched-python/python
 
-# The version of python used is determined by the executable pointed to by
-# the PYTHON environment variable.  For instance if your system installs
-# Python 3 as python3 to configure to compile pygobject under Python 3
-# you would do this:
-# $> PYTHON=python3 ./configure
 m4_define(python_min_ver, 2.6)
 m4_define(python3_min_ver, 3.1)
 
 dnl the pygobject version number
 m4_define(pygobject_major_version, 3)
 m4_define(pygobject_minor_version, 7)
-m4_define(pygobject_micro_version, 1)
+m4_define(pygobject_micro_version, 2)
 m4_define(pygobject_version, pygobject_major_version.pygobject_minor_version.pygobject_micro_version)
 
 dnl versions of packages we require ...
-m4_define(introspection_required_version, 1.33.14)
+m4_define(introspection_required_version, 1.34.2)
 m4_define(py2cairo_required_version, 1.2.0)
 m4_define(py3cairo_required_version, 1.10.0)
-m4_define(glib_required_version, 2.31.0)
-m4_define(gio_required_version, 2.31.0)
+m4_define(glib_required_version, 2.34.2)
+m4_define(gio_required_version, 2.34.2)
 
-AC_INIT(pygobject, pygobject_version,
-        [http://bugzilla.gnome.org/enter_bug.cgi?product=pygobject])
+AC_INIT([pygobject],[pygobject_version],
+	[http://bugzilla.gnome.org/enter_bug.cgi?product=pygobject],
+	[pygobject],[https://live.gnome.org/PyGObject/])
 AC_SUBST(ACLOCAL_AMFLAGS, "-I m4 -I .")
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([gi/gimodule.c])
@@ -37,8 +44,7 @@ AC_SUBST(PYGOBJECT_MICRO_VERSION, pygobject_micro_version)
 
 AM_CONFIG_HEADER(config.h)
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)])
-AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
-AM_MAINTAINER_MODE([enable])
+AM_INIT_AUTOMAKE([1.11.1 foreign no-dist-gzip dist-xz])
 
 dnl put the ACLOCAL flags in the makefile
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
@@ -69,23 +75,28 @@ esac
 AC_MSG_RESULT([$os_win32])
 AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
 
-AC_DISABLE_STATIC
+LT_PREREQ([2.2.6])
+LT_INIT([dlopen win32-dll disable-static])
 
-dnl XXXX hack to kill off all the libtool tags ...
-dnl it isn't like we are using C++ or Fortran.
-dnl (copied from libglade/configure.in)
-m4_define([_LT_AC_TAGCONFIG],[])
-
-AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL
-dnl when using libtool 2.x create libtool early, because it's used in configure
-m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
-AC_ISC_POSIX
+AC_SEARCH_LIBS([strerror],[cposix])
 AC_PROG_CC
 AM_PROG_CC_STDC
 AM_PROG_CC_C_O
 
-# check that we have the minimum version of python necisary to build
+# option to specify python interpreter to use; this just sets $PYTHON, so that
+# we will fallback to reading $PYTHON if --with-python is not given, and
+# python.m4 will get the expected input
+AC_ARG_WITH(python,
+  AS_HELP_STRING([--with-python=PATH],[Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]),
+  [PYTHON="$withval"], [])
+if test x"$PYTHON" = xyes; then
+	AC_MSG_ERROR([--with-python option requires a path or program argument])
+fi
+if test -n "$PYTHON" && ! which "$PYTHON"; then
+	AC_MSG_ERROR([Python interpreter $PYTHON does not exist])
+fi
+
+# check that we have the minimum version of python necessary to build
 JD_PATH_PYTHON(python_min_ver)
 
 # check if we are building for python 3
@@ -109,10 +120,8 @@ fi
 AC_MSG_CHECKING([for PySignal_SetWakeupFd in Python.h])
 old_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="-Wall -Werror $PYTHON_INCLUDES"
-AC_TRY_COMPILE([#include <Python.h>],
-  [PySignal_SetWakeupFd(0);],
-  setwakeupfd_ok=yes,
-  setwakeupfd_ok=no)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <Python.h>]], [[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,
@@ -124,13 +133,13 @@ PLATFORM=`$PYTHON -c "import sys; from distutils import util; sys.stdout.write(u
 AC_SUBST(PLATFORM)
 
 AC_ARG_ENABLE(thread,
-  AC_HELP_STRING([--disable-thread], [Disable pygobject threading support]),,
+  AS_HELP_STRING([--disable-thread],[Disable pygobject threading support]),,
   enable_thread=yes)
 
 AM_CHECK_PYMOD(thread,,,enable_thread=check_for_py3_module)
 if test "x$enable_thread" = xcheck_for_py3_module; then
   dnl Python 3 uses the _thread module so check for that
-  AM_CHECK_PYMOD(_thread,,,enable_thread=no)
+  AM_CHECK_PYMOD(_thread,,enable_thread=yes,enable_thread=no)
 fi
 
 AC_MSG_CHECKING(whether to enable threading in pygobject)
@@ -162,7 +171,7 @@ AS_AC_EXPAND(DATADIR, $datadir)
 dnl libffi
 AC_MSG_CHECKING(for ffi)
 AC_ARG_WITH(ffi,
-  AC_HELP_STRING([--without-ffi], [Disable libffi support]),
+  AS_HELP_STRING([--without-ffi],[Disable libffi support]),
   with_libffi=$withval,
   with_libffi=auto)
 if test x"$with_libffi" = xno ; then
@@ -185,7 +194,7 @@ dnl gio
 PKG_CHECK_MODULES(GIO, gio-2.0 >= gio_required_version)
 
 AC_ARG_ENABLE(cairo,
-    AC_HELP_STRING([--enable-cairo], [Enable Cairo bindings using introspection information]),
+    AS_HELP_STRING([--enable-cairo],[Enable Cairo bindings using introspection information]),
     enable_cairo=$enableval,
     enable_cairo=yes)
 
@@ -227,6 +236,7 @@ if test "x$GCC" = "xyes"; then
   JH_ADD_CFLAG([-Werror=format-security])
   JH_ADD_CFLAG([-Werror=missing-include-dirs])
   JH_ADD_CFLAG([-Werror=format])
+  JH_ADD_CFLAG([-Werror=unused-variable])
   JH_ADD_CFLAG([-fno-strict-aliasing])
 
   case $host_os in
@@ -239,6 +249,11 @@ if test "x$GCC" = "xyes"; then
 
 fi
 
+# enable code coverage support
+GNOME_CODE_COVERAGE
+CFLAGS="$CFLAGS $CODE_COVERAGE_CFLAGS"
+LDFLAGS="$LDFLAGS $CODE_COVERAGE_CFLAGS"
+
 AC_CONFIG_FILES(
   Makefile
   pygobject-3.0.pc
@@ -250,9 +265,17 @@ AC_CONFIG_FILES(
   gi/_gobject/Makefile
   examples/Makefile
   tests/Makefile
+  pygtkcompat/Makefile
   PKG-INFO)
 AC_OUTPUT
 
-echo
-echo "libffi support: $have_libffi"
-echo
+AC_MSG_RESULT([
+	pygobject $VERSION
+
+	Using python interpreter:	$PYTHON
+	libffi support:			$have_libffi
+	cairo support:			$enable_cairo
+	thread support:			$enable_thread
+	code coverage support:          $enable_code_coverage
+])
+
diff --git a/examples/Makefile.in b/examples/Makefile.in
index bd170ca..2396bc0 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -54,8 +54,10 @@ subdir = examples
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \
-	$(top_srcdir)/m4/jhflags.m4 $(top_srcdir)/m4/python.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/jhflags.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -91,6 +93,9 @@ CAIRO_LIBS = @CAIRO_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -108,6 +113,7 @@ EXEEXT = @EXEEXT@
 FFI_CFLAGS = @FFI_CFLAGS@
 FFI_LIBS = @FFI_LIBS@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
 GI_CFLAGS = @GI_CFLAGS@
@@ -127,6 +133,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBFFI_PC = @LIBFFI_PC@
@@ -136,7 +143,6 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -239,7 +245,7 @@ EXTRA_DIST = properties.py signal.py option.py cairo-demo.py
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -264,9 +270,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
diff --git a/gi/Makefile.am b/gi/Makefile.am
index f99e45b..4d93133 100644
--- a/gi/Makefile.am
+++ b/gi/Makefile.am
@@ -42,10 +42,10 @@ _gi_la_SOURCES = \
 	pygi-info.h \
 	pygi-foreign.c \
 	pygi-foreign.h \
-	pygi-foreign-gvariant.c \
-	pygi-foreign-gvariant.h \
 	pygi-struct.c \
 	pygi-struct.h \
+	pygi-source.c \
+	pygi-source.h \
 	pygi-argument.c \
 	pygi-argument.h \
 	pygi-type.c \
@@ -56,8 +56,6 @@ _gi_la_SOURCES = \
 	pygi-closure.h \
 	pygi-ccallback.c \
 	pygi-ccallback.h \
-	pygi-callbacks.c \
-	pygi-callbacks.h \
 	pygi.h \
 	pygi-private.h \
 	pygi-property.c \
@@ -117,7 +115,7 @@ _gi_cairo_la_LDFLAGS = \
 # build directory, which the Python interpreter can load
 # directly without having to know how to parse .la files.
 .la.so:
-	$(LN_S) .libs/$@ $@ || true
+	$(LN_S) -f .libs/$@ $@
 
 # if we build in a separate tree, we need to symlink the *.py files from the
 # source tree; Python does not accept the extensions and modules in different
diff --git a/gi/Makefile.in b/gi/Makefile.in
index 72838c4..9f0630a 100644
--- a/gi/Makefile.in
+++ b/gi/Makefile.in
@@ -61,8 +61,10 @@ DIST_COMMON = $(pygi_PYTHON) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \
-	$(top_srcdir)/m4/jhflags.m4 $(top_srcdir)/m4/python.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/jhflags.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -103,13 +105,12 @@ am__DEPENDENCIES_1 =
 _gi_la_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
 	$(top_builddir)/gi/_glib/libpyglib-gi-2.0-@PYTHON_BASENAME@.la
 am__gi_la_OBJECTS = _gi_la-pygi-repository.lo _gi_la-pygi-info.lo \
-	_gi_la-pygi-foreign.lo _gi_la-pygi-foreign-gvariant.lo \
-	_gi_la-pygi-struct.lo _gi_la-pygi-argument.lo \
+	_gi_la-pygi-foreign.lo _gi_la-pygi-struct.lo \
+	_gi_la-pygi-source.lo _gi_la-pygi-argument.lo \
 	_gi_la-pygi-type.lo _gi_la-pygi-boxed.lo \
 	_gi_la-pygi-closure.lo _gi_la-pygi-ccallback.lo \
-	_gi_la-pygi-callbacks.lo _gi_la-pygi-property.lo \
-	_gi_la-pygi-signal-closure.lo _gi_la-gimodule.lo \
-	_gi_la-pygi-invoke.lo _gi_la-pygi-cache.lo \
+	_gi_la-pygi-property.lo _gi_la-pygi-signal-closure.lo \
+	_gi_la-gimodule.lo _gi_la-pygi-invoke.lo _gi_la-pygi-cache.lo \
 	_gi_la-pygi-marshal-from-py.lo _gi_la-pygi-marshal-to-py.lo \
 	_gi_la-pygi-marshal-cleanup.lo
 _gi_la_OBJECTS = $(am__gi_la_OBJECTS)
@@ -218,6 +219,9 @@ CAIRO_LIBS = @CAIRO_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -235,6 +239,7 @@ EXEEXT = @EXEEXT@
 FFI_CFLAGS = @FFI_CFLAGS@
 FFI_LIBS = @FFI_LIBS@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
 GI_CFLAGS = @GI_CFLAGS@
@@ -254,6 +259,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBFFI_PC = @LIBFFI_PC@
@@ -263,7 +269,6 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -396,10 +401,10 @@ _gi_la_SOURCES = \
 	pygi-info.h \
 	pygi-foreign.c \
 	pygi-foreign.h \
-	pygi-foreign-gvariant.c \
-	pygi-foreign-gvariant.h \
 	pygi-struct.c \
 	pygi-struct.h \
+	pygi-source.c \
+	pygi-source.h \
 	pygi-argument.c \
 	pygi-argument.h \
 	pygi-type.c \
@@ -410,8 +415,6 @@ _gi_la_SOURCES = \
 	pygi-closure.h \
 	pygi-ccallback.c \
 	pygi-ccallback.h \
-	pygi-callbacks.c \
-	pygi-callbacks.h \
 	pygi.h \
 	pygi-private.h \
 	pygi-property.c \
@@ -474,7 +477,7 @@ all: all-recursive
 
 .SUFFIXES:
 .SUFFIXES: .c .la .lo .o .obj .so
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -499,9 +502,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 install-pygiLTLIBRARIES: $(pygi_LTLIBRARIES)
@@ -552,10 +555,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_gi_la-pygi-argument.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_gi_la-pygi-boxed.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_gi_la-pygi-cache.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_gi_la-pygi-callbacks.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_gi_la-pygi-ccallback.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_gi_la-pygi-closure.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_gi_la-pygi-foreign-gvariant.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_gi_la-pygi-foreign.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_gi_la-pygi-info.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_gi_la-pygi-invoke.Plo@am__quote@
@@ -565,6 +566,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_gi_la-pygi-property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_gi_la-pygi-repository.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_gi_la-pygi-signal-closure.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_gi_la-pygi-source.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_gi_la-pygi-struct.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_gi_la-pygi-type.Plo@am__quote@
 
@@ -610,13 +612,6 @@ _gi_la-pygi-foreign.lo: pygi-foreign.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_gi_la_CPPFLAGS) $(CPPFLAGS) $(_gi_la_CFLAGS) $(CFLAGS) -c -o _gi_la-pygi-foreign.lo `test -f 'pygi-foreign.c' || echo '$(srcdir)/'`pygi-foreign.c
 
-_gi_la-pygi-foreign-gvariant.lo: pygi-foreign-gvariant.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_gi_la_CPPFLAGS) $(CPPFLAGS) $(_gi_la_CFLAGS) $(CFLAGS) -MT _gi_la-pygi-foreign-gvariant.lo -MD -MP -MF $(DEPDIR)/_gi_la-pygi-foreign-gvariant.Tpo -c -o _gi_la-pygi-foreign-gvariant.lo `test -f 'pygi-foreign-gvariant.c' || echo '$(srcdir)/'`pygi-foreign-gvariant.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/_gi_la-pygi-foreign-gvariant.Tpo $(DEPDIR)/_gi_la-pygi-foreign-gvariant.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pygi-foreign-gvariant.c' object='_gi_la-pygi-foreign-gvariant.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_gi_la_CPPFLAGS) $(CPPFLAGS) $(_gi_la_CFLAGS) $(CFLAGS) -c -o _gi_la-pygi-foreign-gvariant.lo `test -f 'pygi-foreign-gvariant.c' || echo '$(srcdir)/'`pygi-foreign-gvariant.c
-
 _gi_la-pygi-struct.lo: pygi-struct.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_gi_la_CPPFLAGS) $(CPPFLAGS) $(_gi_la_CFLAGS) $(CFLAGS) -MT _gi_la-pygi-struct.lo -MD -MP -MF $(DEPDIR)/_gi_la-pygi-struct.Tpo -c -o _gi_la-pygi-struct.lo `test -f 'pygi-struct.c' || echo '$(srcdir)/'`pygi-struct.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/_gi_la-pygi-struct.Tpo $(DEPDIR)/_gi_la-pygi-struct.Plo
@@ -624,6 +619,13 @@ _gi_la-pygi-struct.lo: pygi-struct.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_gi_la_CPPFLAGS) $(CPPFLAGS) $(_gi_la_CFLAGS) $(CFLAGS) -c -o _gi_la-pygi-struct.lo `test -f 'pygi-struct.c' || echo '$(srcdir)/'`pygi-struct.c
 
+_gi_la-pygi-source.lo: pygi-source.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_gi_la_CPPFLAGS) $(CPPFLAGS) $(_gi_la_CFLAGS) $(CFLAGS) -MT _gi_la-pygi-source.lo -MD -MP -MF $(DEPDIR)/_gi_la-pygi-source.Tpo -c -o _gi_la-pygi-source.lo `test -f 'pygi-source.c' || echo '$(srcdir)/'`pygi-source.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/_gi_la-pygi-source.Tpo $(DEPDIR)/_gi_la-pygi-source.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pygi-source.c' object='_gi_la-pygi-source.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_gi_la_CPPFLAGS) $(CPPFLAGS) $(_gi_la_CFLAGS) $(CFLAGS) -c -o _gi_la-pygi-source.lo `test -f 'pygi-source.c' || echo '$(srcdir)/'`pygi-source.c
+
 _gi_la-pygi-argument.lo: pygi-argument.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_gi_la_CPPFLAGS) $(CPPFLAGS) $(_gi_la_CFLAGS) $(CFLAGS) -MT _gi_la-pygi-argument.lo -MD -MP -MF $(DEPDIR)/_gi_la-pygi-argument.Tpo -c -o _gi_la-pygi-argument.lo `test -f 'pygi-argument.c' || echo '$(srcdir)/'`pygi-argument.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/_gi_la-pygi-argument.Tpo $(DEPDIR)/_gi_la-pygi-argument.Plo
@@ -659,13 +661,6 @@ _gi_la-pygi-ccallback.lo: pygi-ccallback.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_gi_la_CPPFLAGS) $(CPPFLAGS) $(_gi_la_CFLAGS) $(CFLAGS) -c -o _gi_la-pygi-ccallback.lo `test -f 'pygi-ccallback.c' || echo '$(srcdir)/'`pygi-ccallback.c
 
-_gi_la-pygi-callbacks.lo: pygi-callbacks.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_gi_la_CPPFLAGS) $(CPPFLAGS) $(_gi_la_CFLAGS) $(CFLAGS) -MT _gi_la-pygi-callbacks.lo -MD -MP -MF $(DEPDIR)/_gi_la-pygi-callbacks.Tpo -c -o _gi_la-pygi-callbacks.lo `test -f 'pygi-callbacks.c' || echo '$(srcdir)/'`pygi-callbacks.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/_gi_la-pygi-callbacks.Tpo $(DEPDIR)/_gi_la-pygi-callbacks.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pygi-callbacks.c' object='_gi_la-pygi-callbacks.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_gi_la_CPPFLAGS) $(CPPFLAGS) $(_gi_la_CFLAGS) $(CFLAGS) -c -o _gi_la-pygi-callbacks.lo `test -f 'pygi-callbacks.c' || echo '$(srcdir)/'`pygi-callbacks.c
-
 _gi_la-pygi-property.lo: pygi-property.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_gi_la_CPPFLAGS) $(CPPFLAGS) $(_gi_la_CFLAGS) $(CFLAGS) -MT _gi_la-pygi-property.lo -MD -MP -MF $(DEPDIR)/_gi_la-pygi-property.Tpo -c -o _gi_la-pygi-property.lo `test -f 'pygi-property.c' || echo '$(srcdir)/'`pygi-property.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/_gi_la-pygi-property.Tpo $(DEPDIR)/_gi_la-pygi-property.Plo
@@ -1102,7 +1097,7 @@ uninstall-am: uninstall-pygiLTLIBRARIES uninstall-pygiPYTHON
 # build directory, which the Python interpreter can load
 # directly without having to know how to parse .la files.
 .la.so:
-	$(LN_S) .libs/$@ $@ || true
+	$(LN_S) -f .libs/$@ $@
 
 # if we build in a separate tree, we need to symlink the *.py files from the
 # source tree; Python does not accept the extensions and modules in different
diff --git a/gi/__init__.py b/gi/__init__.py
index 6ebff8e..70a4917 100644
--- a/gi/__init__.py
+++ b/gi/__init__.py
@@ -81,3 +81,9 @@ def require_version(namespace, version):
 
 def get_required_version(namespace):
     return _versions.get(namespace, None)
+
+
+# note, DeprecationWarning would be more suitable as a base, but this
+# unhelpfully isn't shown by default and thus useless
+class PyGIDeprecationWarning(RuntimeWarning):
+    pass
diff --git a/gi/_glib/Makefile.am b/gi/_glib/Makefile.am
index 468e7f4..4feb06b 100644
--- a/gi/_glib/Makefile.am
+++ b/gi/_glib/Makefile.am
@@ -52,16 +52,10 @@ pyglib_LTLIBRARIES = _glib.la
 
 _glib_la_SOURCES = \
 	glibmodule.c \
-	pygiochannel.c \
-	pygiochannel.h \
 	pygoptioncontext.c \
 	pygoptioncontext.h \
 	pygoptiongroup.c \
 	pygoptiongroup.h \
-	pygmaincontext.c \
-	pygmaincontext.h \
-	pygmainloop.c \
-	pygmainloop.h \
 	pygsource.c \
 	pygsource.h \
 	pygspawn.c \
@@ -96,4 +90,4 @@ check-local: $(pyglib_LTLIBRARIES:.la=.so) build_pylinks
 clean-local:
 	rm -f $(pyglib_LTLIBRARIES:.la=.so)
 .la.so:
-	$(LN_S) .libs/$@ $@ || true
+	$(LN_S) -f .libs/$@ $@
diff --git a/gi/_glib/Makefile.in b/gi/_glib/Makefile.in
index fa858e0..4f08aea 100644
--- a/gi/_glib/Makefile.in
+++ b/gi/_glib/Makefile.in
@@ -61,8 +61,10 @@ DIST_COMMON = $(pyglib_PYTHON) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \
-	$(top_srcdir)/m4/jhflags.m4 $(top_srcdir)/m4/python.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/jhflags.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -103,9 +105,8 @@ am__DEPENDENCIES_1 =
 @OS_WIN32_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
 _glib_la_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
 	libpyglib-gi-2.0-@PYTHON_BASENAME@.la
-am__glib_la_OBJECTS = _glib_la-glibmodule.lo _glib_la-pygiochannel.lo \
+am__glib_la_OBJECTS = _glib_la-glibmodule.lo \
 	_glib_la-pygoptioncontext.lo _glib_la-pygoptiongroup.lo \
-	_glib_la-pygmaincontext.lo _glib_la-pygmainloop.lo \
 	_glib_la-pygsource.lo _glib_la-pygspawn.lo
 _glib_la_OBJECTS = $(am__glib_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
@@ -181,6 +182,9 @@ CAIRO_LIBS = @CAIRO_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -198,6 +202,7 @@ EXEEXT = @EXEEXT@
 FFI_CFLAGS = @FFI_CFLAGS@
 FFI_LIBS = @FFI_LIBS@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
 GI_CFLAGS = @GI_CFLAGS@
@@ -217,6 +222,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBFFI_PC = @LIBFFI_PC@
@@ -226,7 +232,6 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -367,16 +372,10 @@ libpyglib_gi_2_0_@PYTHON_BASENAME@_la_LIBADD = \
 pyglib_LTLIBRARIES = _glib.la
 _glib_la_SOURCES = \
 	glibmodule.c \
-	pygiochannel.c \
-	pygiochannel.h \
 	pygoptioncontext.c \
 	pygoptioncontext.h \
 	pygoptiongroup.c \
 	pygoptiongroup.h \
-	pygmaincontext.c \
-	pygmaincontext.h \
-	pygmainloop.c \
-	pygmainloop.h \
 	pygsource.c \
 	pygsource.h \
 	pygspawn.c \
@@ -399,7 +398,7 @@ all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .la .lo .o .obj .so
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -424,9 +423,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@@ -505,9 +504,6 @@ distclean-compile:
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_glib_la-glibmodule.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_glib_la-pygiochannel.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_glib_la-pygmaincontext.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_glib_la-pygmainloop.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_glib_la-pygoptioncontext.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_glib_la-pygoptiongroup.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_glib_la-pygsource.Plo@am__quote@
@@ -542,13 +538,6 @@ _glib_la-glibmodule.lo: glibmodule.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_glib_la_CPPFLAGS) $(CPPFLAGS) $(_glib_la_CFLAGS) $(CFLAGS) -c -o _glib_la-glibmodule.lo `test -f 'glibmodule.c' || echo '$(srcdir)/'`glibmodule.c
 
-_glib_la-pygiochannel.lo: pygiochannel.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_glib_la_CPPFLAGS) $(CPPFLAGS) $(_glib_la_CFLAGS) $(CFLAGS) -MT _glib_la-pygiochannel.lo -MD -MP -MF $(DEPDIR)/_glib_la-pygiochannel.Tpo -c -o _glib_la-pygiochannel.lo `test -f 'pygiochannel.c' || echo '$(srcdir)/'`pygiochannel.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/_glib_la-pygiochannel.Tpo $(DEPDIR)/_glib_la-pygiochannel.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pygiochannel.c' object='_glib_la-pygiochannel.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_glib_la_CPPFLAGS) $(CPPFLAGS) $(_glib_la_CFLAGS) $(CFLAGS) -c -o _glib_la-pygiochannel.lo `test -f 'pygiochannel.c' || echo '$(srcdir)/'`pygiochannel.c
-
 _glib_la-pygoptioncontext.lo: pygoptioncontext.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_glib_la_CPPFLAGS) $(CPPFLAGS) $(_glib_la_CFLAGS) $(CFLAGS) -MT _glib_la-pygoptioncontext.lo -MD -MP -MF $(DEPDIR)/_glib_la-pygoptioncontext.Tpo -c -o _glib_la-pygoptioncontext.lo `test -f 'pygoptioncontext.c' || echo '$(srcdir)/'`pygoptioncontext.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/_glib_la-pygoptioncontext.Tpo $(DEPDIR)/_glib_la-pygoptioncontext.Plo
@@ -563,20 +552,6 @@ _glib_la-pygoptiongroup.lo: pygoptiongroup.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_glib_la_CPPFLAGS) $(CPPFLAGS) $(_glib_la_CFLAGS) $(CFLAGS) -c -o _glib_la-pygoptiongroup.lo `test -f 'pygoptiongroup.c' || echo '$(srcdir)/'`pygoptiongroup.c
 
-_glib_la-pygmaincontext.lo: pygmaincontext.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_glib_la_CPPFLAGS) $(CPPFLAGS) $(_glib_la_CFLAGS) $(CFLAGS) -MT _glib_la-pygmaincontext.lo -MD -MP -MF $(DEPDIR)/_glib_la-pygmaincontext.Tpo -c -o _glib_la-pygmaincontext.lo `test -f 'pygmaincontext.c' || echo '$(srcdir)/'`pygmaincontext.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/_glib_la-pygmaincontext.Tpo $(DEPDIR)/_glib_la-pygmaincontext.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pygmaincontext.c' object='_glib_la-pygmaincontext.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_glib_la_CPPFLAGS) $(CPPFLAGS) $(_glib_la_CFLAGS) $(CFLAGS) -c -o _glib_la-pygmaincontext.lo `test -f 'pygmaincontext.c' || echo '$(srcdir)/'`pygmaincontext.c
-
-_glib_la-pygmainloop.lo: pygmainloop.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_glib_la_CPPFLAGS) $(CPPFLAGS) $(_glib_la_CFLAGS) $(CFLAGS) -MT _glib_la-pygmainloop.lo -MD -MP -MF $(DEPDIR)/_glib_la-pygmainloop.Tpo -c -o _glib_la-pygmainloop.lo `test -f 'pygmainloop.c' || echo '$(srcdir)/'`pygmainloop.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/_glib_la-pygmainloop.Tpo $(DEPDIR)/_glib_la-pygmainloop.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pygmainloop.c' object='_glib_la-pygmainloop.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_glib_la_CPPFLAGS) $(CPPFLAGS) $(_glib_la_CFLAGS) $(CFLAGS) -c -o _glib_la-pygmainloop.lo `test -f 'pygmainloop.c' || echo '$(srcdir)/'`pygmainloop.c
-
 _glib_la-pygsource.lo: pygsource.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_glib_la_CPPFLAGS) $(CPPFLAGS) $(_glib_la_CFLAGS) $(CFLAGS) -MT _glib_la-pygsource.lo -MD -MP -MF $(DEPDIR)/_glib_la-pygsource.Tpo -c -o _glib_la-pygsource.lo `test -f 'pygsource.c' || echo '$(srcdir)/'`pygsource.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/_glib_la-pygsource.Tpo $(DEPDIR)/_glib_la-pygsource.Plo
@@ -871,7 +846,7 @@ check-local: $(pyglib_LTLIBRARIES:.la=.so) build_pylinks
 clean-local:
 	rm -f $(pyglib_LTLIBRARIES:.la=.so)
 .la.so:
-	$(LN_S) .libs/$@ $@ || true
+	$(LN_S) -f .libs/$@ $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/gi/_glib/__init__.py b/gi/_glib/__init__.py
index b0d2212..0b9df9a 100644
--- a/gi/_glib/__init__.py
+++ b/gi/_glib/__init__.py
@@ -23,99 +23,3 @@ from . import _glib
 
 # Internal API
 _PyGLib_API = _glib._PyGLib_API
-
-# Types
-GError = _glib.GError
-IOChannel = _glib.IOChannel
-Idle = _glib.Idle
-MainContext = _glib.MainContext
-MainLoop = _glib.MainLoop
-OptionContext = _glib.OptionContext
-OptionGroup = _glib.OptionGroup
-Pid = _glib.Pid
-PollFD = _glib.PollFD
-Source = _glib.Source
-Timeout = _glib.Timeout
-
-# Constants
-IO_ERR = _glib.IO_ERR
-IO_FLAG_APPEND = _glib.IO_FLAG_APPEND
-IO_FLAG_GET_MASK = _glib.IO_FLAG_GET_MASK
-IO_FLAG_IS_READABLE = _glib.IO_FLAG_IS_READABLE
-IO_FLAG_IS_SEEKABLE = _glib.IO_FLAG_IS_SEEKABLE
-IO_FLAG_IS_WRITEABLE = _glib.IO_FLAG_IS_WRITEABLE
-IO_FLAG_MASK = _glib.IO_FLAG_MASK
-IO_FLAG_NONBLOCK = _glib.IO_FLAG_NONBLOCK
-IO_FLAG_SET_MASK = _glib.IO_FLAG_SET_MASK
-IO_HUP = _glib.IO_HUP
-IO_IN = _glib.IO_IN
-IO_NVAL = _glib.IO_NVAL
-IO_OUT = _glib.IO_OUT
-IO_PRI = _glib.IO_PRI
-IO_STATUS_AGAIN = _glib.IO_STATUS_AGAIN
-IO_STATUS_EOF = _glib.IO_STATUS_EOF
-IO_STATUS_ERROR = _glib.IO_STATUS_ERROR
-IO_STATUS_NORMAL = _glib.IO_STATUS_NORMAL
-OPTION_ERROR = _glib.OPTION_ERROR
-OPTION_ERROR_BAD_VALUE = _glib.OPTION_ERROR_BAD_VALUE
-OPTION_ERROR_FAILED = _glib.OPTION_ERROR_FAILED
-OPTION_ERROR_UNKNOWN_OPTION = _glib.OPTION_ERROR_UNKNOWN_OPTION
-OPTION_FLAG_FILENAME = _glib.OPTION_FLAG_FILENAME
-OPTION_FLAG_HIDDEN = _glib.OPTION_FLAG_HIDDEN
-OPTION_FLAG_IN_MAIN = _glib.OPTION_FLAG_IN_MAIN
-OPTION_FLAG_NOALIAS = _glib.OPTION_FLAG_NOALIAS
-OPTION_FLAG_NO_ARG = _glib.OPTION_FLAG_NO_ARG
-OPTION_FLAG_OPTIONAL_ARG = _glib.OPTION_FLAG_OPTIONAL_ARG
-OPTION_FLAG_REVERSE = _glib.OPTION_FLAG_REVERSE
-OPTION_REMAINING = _glib.OPTION_REMAINING
-PRIORITY_DEFAULT = _glib.PRIORITY_DEFAULT
-PRIORITY_DEFAULT_IDLE = _glib.PRIORITY_DEFAULT_IDLE
-PRIORITY_HIGH = _glib.PRIORITY_HIGH
-PRIORITY_HIGH_IDLE = _glib.PRIORITY_HIGH_IDLE
-PRIORITY_LOW = _glib.PRIORITY_LOW
-SPAWN_CHILD_INHERITS_STDIN = _glib.SPAWN_CHILD_INHERITS_STDIN
-SPAWN_DO_NOT_REAP_CHILD = _glib.SPAWN_DO_NOT_REAP_CHILD
-SPAWN_FILE_AND_ARGV_ZERO = _glib.SPAWN_FILE_AND_ARGV_ZERO
-SPAWN_LEAVE_DESCRIPTORS_OPEN = _glib.SPAWN_LEAVE_DESCRIPTORS_OPEN
-SPAWN_SEARCH_PATH = _glib.SPAWN_SEARCH_PATH
-SPAWN_STDERR_TO_DEV_NULL = _glib.SPAWN_STDERR_TO_DEV_NULL
-SPAWN_STDOUT_TO_DEV_NULL = _glib.SPAWN_STDOUT_TO_DEV_NULL
-USER_DIRECTORY_DESKTOP = _glib.USER_DIRECTORY_DESKTOP
-USER_DIRECTORY_DOCUMENTS = _glib.USER_DIRECTORY_DOCUMENTS
-USER_DIRECTORY_DOWNLOAD = _glib.USER_DIRECTORY_DOWNLOAD
-USER_DIRECTORY_MUSIC = _glib.USER_DIRECTORY_MUSIC
-USER_DIRECTORY_PICTURES = _glib.USER_DIRECTORY_PICTURES
-USER_DIRECTORY_PUBLIC_SHARE = _glib.USER_DIRECTORY_PUBLIC_SHARE
-USER_DIRECTORY_TEMPLATES = _glib.USER_DIRECTORY_TEMPLATES
-USER_DIRECTORY_VIDEOS = _glib.USER_DIRECTORY_VIDEOS
-
-# Functions
-child_watch_add = _glib.child_watch_add
-filename_display_basename = _glib.filename_display_basename
-filename_display_name = _glib.filename_display_name
-filename_from_utf8 = _glib.filename_from_utf8
-find_program_in_path = _glib.find_program_in_path
-get_application_name = _glib.get_application_name
-get_current_time = _glib.get_current_time
-get_prgname = _glib.get_prgname
-get_system_config_dirs = _glib.get_system_config_dirs
-get_system_data_dirs = _glib.get_system_data_dirs
-get_user_cache_dir = _glib.get_user_cache_dir
-get_user_config_dir = _glib.get_user_config_dir
-get_user_data_dir = _glib.get_user_data_dir
-get_user_special_dir = _glib.get_user_special_dir
-glib_version = _glib.glib_version
-idle_add = _glib.idle_add
-io_add_watch = _glib.io_add_watch
-main_context_default = _glib.main_context_default
-main_depth = _glib.main_depth
-markup_escape_text = _glib.markup_escape_text
-pyglib_version = _glib.pyglib_version
-set_application_name = _glib.set_application_name
-set_prgname = _glib.set_prgname
-source_remove = _glib.source_remove
-spawn_async = _glib.spawn_async
-threads_init = _glib.threads_init
-timeout_add = _glib.timeout_add
-timeout_add_seconds = _glib.timeout_add_seconds
-uri_list_extract_uris = _glib.uri_list_extract_uris
diff --git a/gi/_glib/glibmodule.c b/gi/_glib/glibmodule.c
index 11b97f5..11aee9d 100644
--- a/gi/_glib/glibmodule.c
+++ b/gi/_glib/glibmodule.c
@@ -29,66 +29,13 @@
 #include <glib.h>
 #include "pyglib.h"
 #include "pyglib-private.h"
-#include "pygiochannel.h"
-#include "pygmaincontext.h"
-#include "pygmainloop.h"
 #include "pygoptioncontext.h"
 #include "pygoptiongroup.h"
 #include "pygsource.h"
 #include "pygspawn.h"
 
-#define PYGLIB_MAJOR_VERSION PYGOBJECT_MAJOR_VERSION
-#define PYGLIB_MINOR_VERSION PYGOBJECT_MINOR_VERSION
-#define PYGLIB_MICRO_VERSION PYGOBJECT_MICRO_VERSION
-
-
 /* ---------------- glib module functions -------------------- */
 
-struct _PyGChildData {
-    PyObject *func;
-    PyObject *data;
-};
-
-static gint
-get_handler_priority(gint *priority, PyObject *kwargs)
-{
-    Py_ssize_t len, pos;
-    PyObject *key, *val;
-
-    /* no keyword args? leave as default */
-    if (kwargs == NULL)	return 0;
-
-    len = PyDict_Size(kwargs);
-    if (len == 0) return 0;
-
-    if (len != 1) {
-	PyErr_SetString(PyExc_TypeError,
-			"expecting at most one keyword argument");
-	return -1;
-    }
-    pos = 0;
-    PyDict_Next(kwargs, &pos, &key, &val);
-    if (!PYGLIB_PyUnicode_Check(key)) {
-	PyErr_SetString(PyExc_TypeError,
-			"keyword argument name is not a string");
-	return -1;
-    }
-
-    if (strcmp(PYGLIB_PyUnicode_AsString(key), "priority") != 0) {
-	PyErr_SetString(PyExc_TypeError,
-			"only 'priority' keyword argument accepted");
-	return -1;
-    }
-
-    *priority = PYGLIB_PyLong_AsLong(val);
-    if (PyErr_Occurred()) {
-	PyErr_Clear();
-	PyErr_SetString(PyExc_ValueError, "could not get priority value");
-	return -1;
-    }
-    return 0;
-}
-
 static PyObject *
 pyglib_threads_init(PyObject *unused, PyObject *args, PyObject *kwargs)
 {
@@ -99,592 +46,6 @@ pyglib_threads_init(PyObject *unused, PyObject *args, PyObject *kwargs)
     return Py_None;
 }
 
-static PyObject *
-pyglib_idle_add(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    PyObject *first, *callback, *cbargs = NULL, *data;
-    gint len, priority = G_PRIORITY_DEFAULT_IDLE;
-    guint handler_id;
-
-    len = PyTuple_Size(args);
-    if (len < 1) {
-	PyErr_SetString(PyExc_TypeError,
-			"idle_add requires at least 1 argument");
-	return NULL;
-    }
-    first = PySequence_GetSlice(args, 0, 1);
-    if (!PyArg_ParseTuple(first, "O:idle_add", &callback)) {
-	Py_DECREF(first);
-        return NULL;
-    }
-    Py_DECREF(first);
-    if (!PyCallable_Check(callback)) {
-        PyErr_SetString(PyExc_TypeError, "first argument not callable");
-        return NULL;
-    }
-    if (get_handler_priority(&priority, kwargs) < 0)
-	return NULL;
-
-    cbargs = PySequence_GetSlice(args, 1, len);
-    if (cbargs == NULL)
-	return NULL;
-
-    data = Py_BuildValue("(ON)", callback, cbargs);
-    if (data == NULL)
-	return NULL;
-    handler_id = g_idle_add_full(priority,
-				 _pyglib_handler_marshal, data,
-				 _pyglib_destroy_notify);
-    return PYGLIB_PyLong_FromLong(handler_id);
-}
-
-
-static PyObject *
-pyglib_timeout_add(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    PyObject *first, *callback, *cbargs = NULL, *data;
-    gint len, priority = G_PRIORITY_DEFAULT;
-    guint interval, handler_id;
-
-    len = PyTuple_Size(args);
-    if (len < 2) {
-	PyErr_SetString(PyExc_TypeError,
-			"timeout_add requires at least 2 args");
-	return NULL;
-    }
-    first = PySequence_GetSlice(args, 0, 2);
-    if (!PyArg_ParseTuple(first, "IO:timeout_add", &interval, &callback)) {
-	Py_DECREF(first);
-        return NULL;
-    }
-    Py_DECREF(first);
-    if (!PyCallable_Check(callback)) {
-        PyErr_SetString(PyExc_TypeError, "second argument not callable");
-        return NULL;
-    }
-    if (get_handler_priority(&priority, kwargs) < 0)
-	return NULL;
-
-    cbargs = PySequence_GetSlice(args, 2, len);
-    if (cbargs == NULL)
-	return NULL;
-
-    data = Py_BuildValue("(ON)", callback, cbargs);
-    if (data == NULL)
-	return NULL;
-    handler_id = g_timeout_add_full(priority, interval,
-				    _pyglib_handler_marshal, data,
-				    _pyglib_destroy_notify);
-    return PYGLIB_PyLong_FromLong(handler_id);
-}
-
-static PyObject *
-pyglib_timeout_add_seconds(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    PyObject *first, *callback, *cbargs = NULL, *data;
-    gint len, priority = G_PRIORITY_DEFAULT;
-    guint interval, handler_id;
-
-    len = PyTuple_Size(args);
-    if (len < 2) {
-	PyErr_SetString(PyExc_TypeError,
-			"timeout_add_seconds requires at least 2 args");
-	return NULL;
-    }
-    first = PySequence_GetSlice(args, 0, 2);
-    if (!PyArg_ParseTuple(first, "IO:timeout_add_seconds", &interval, &callback)) {
-	Py_DECREF(first);
-        return NULL;
-    }
-    Py_DECREF(first);
-    if (!PyCallable_Check(callback)) {
-        PyErr_SetString(PyExc_TypeError, "second argument not callable");
-        return NULL;
-    }
-    if (get_handler_priority(&priority, kwargs) < 0)
-	return NULL;
-
-    cbargs = PySequence_GetSlice(args, 2, len);
-    if (cbargs == NULL)
-	return NULL;
-
-    data = Py_BuildValue("(ON)", callback, cbargs);
-    if (data == NULL)
-	return NULL;
-    handler_id = g_timeout_add_seconds_full(priority, interval,
-                                            _pyglib_handler_marshal, data,
-                                            _pyglib_destroy_notify);
-    return PYGLIB_PyLong_FromLong(handler_id);
-}
-
-static gboolean
-iowatch_marshal(GIOChannel *source,
-		GIOCondition condition,
-		gpointer user_data)
-{
-    PyGILState_STATE state;
-    PyObject *tuple, *func, *firstargs, *args, *ret;
-    gboolean res;
-
-    g_return_val_if_fail(user_data != NULL, FALSE);
-
-    state = pyglib_gil_state_ensure();
-
-    tuple = (PyObject *)user_data;
-    func = PyTuple_GetItem(tuple, 0);
-
-    /* arg vector is (fd, condtion, *args) */
-    firstargs = Py_BuildValue("(Oi)", PyTuple_GetItem(tuple, 1), condition);
-    args = PySequence_Concat(firstargs, PyTuple_GetItem(tuple, 2));
-    Py_DECREF(firstargs);
-
-    ret = PyObject_CallObject(func, args);
-    Py_DECREF(args);
-    if (!ret) {
-	PyErr_Print();
-	res = FALSE;
-    } else {
-        if (ret == Py_None) {
-            if (PyErr_Warn(PyExc_Warning,
-			   "_glib.io_add_watch callback returned None; "
-                           "should return True/False")) {
-                PyErr_Print();
-            }
-        }
-	res = PyObject_IsTrue(ret);
-	Py_DECREF(ret);
-    }
-
-    pyglib_gil_state_release(state);
-
-    return res;
-}
-
-static PyObject *
-pyglib_io_add_watch(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    PyObject *first, *pyfd, *callback, *cbargs = NULL, *data;
-    gint fd, priority = G_PRIORITY_DEFAULT, condition;
-    Py_ssize_t len;
-    GIOChannel *iochannel;
-    guint handler_id;
-
-    len = PyTuple_Size(args);
-    if (len < 3) {
-	PyErr_SetString(PyExc_TypeError,
-			"io_add_watch requires at least 3 args");
-	return NULL;
-    }
-    first = PySequence_GetSlice(args, 0, 3);
-    if (!PyArg_ParseTuple(first, "OiO:io_add_watch", &pyfd, &condition,
-			  &callback)) {
-	Py_DECREF(first);
-        return NULL;
-    }
-    Py_DECREF(first);
-    fd = PyObject_AsFileDescriptor(pyfd);
-    if (fd < 0) {
-	return NULL;
-    }
-    if (!PyCallable_Check(callback)) {
-        PyErr_SetString(PyExc_TypeError, "third argument not callable");
-        return NULL;
-    }
-    if (get_handler_priority(&priority, kwargs) < 0)
-	return NULL;
-
-    cbargs = PySequence_GetSlice(args, 3, len);
-    if (cbargs == NULL)
-      return NULL;
-    data = Py_BuildValue("(OON)", callback, pyfd, cbargs);
-    if (data == NULL)
-      return NULL;
-    iochannel = g_io_channel_unix_new(fd);
-    handler_id = g_io_add_watch_full(iochannel, priority, condition,
-				     iowatch_marshal, data,
-				     (GDestroyNotify)_pyglib_destroy_notify);
-    g_io_channel_unref(iochannel);
-    
-    return PYGLIB_PyLong_FromLong(handler_id);
-}
-
-static PyObject *
-pyglib_source_remove(PyObject *self, PyObject *args)
-{
-    guint tag;
-
-    if (!PyArg_ParseTuple(args, "i:source_remove", &tag))
-	return NULL;
-
-    return PyBool_FromLong(g_source_remove(tag));
-}
-
-static PyObject *
-pyglib_main_context_default(PyObject *unused)
-{
-    return pyglib_main_context_new(g_main_context_default());
-}
-
-static void
-child_watch_func(GPid pid, gint status, gpointer data)
-{
-    struct _PyGChildData *child_data = (struct _PyGChildData *) data;
-    PyObject *retval;
-    PyGILState_STATE gil;
-
-    gil = pyglib_gil_state_ensure();
-    if (child_data->data)
-        retval = PyObject_CallFunction(child_data->func, "iiO", pid, status,
-                                       child_data->data);
-    else
-        retval = PyObject_CallFunction(child_data->func, "ii", pid, status);
-
-    if (retval)
-	Py_DECREF(retval);
-    else
-	PyErr_Print();
-
-    pyglib_gil_state_release(gil);
-}
-
-static void
-child_watch_dnotify(gpointer data)
-{
-    struct _PyGChildData *child_data = (struct _PyGChildData *) data;
-    Py_DECREF(child_data->func);
-    Py_XDECREF(child_data->data);
-    g_slice_free(struct _PyGChildData, child_data);
-}
-
-
-static PyObject *
-pyglib_child_watch_add(PyObject *unused, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "pid", "function", "data", "priority", NULL };
-    guint id;
-    gint priority = G_PRIORITY_DEFAULT;
-    int pid;
-    PyObject *func, *user_data = NULL;
-    struct _PyGChildData *child_data;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-				     "iO|Oi:glib.child_watch_add", kwlist,
-                                     &pid, &func, &user_data, &priority))
-        return NULL;
-    if (!PyCallable_Check(func)) {
-        PyErr_SetString(PyExc_TypeError,
-                        "_glib.child_watch_add: second argument must be callable");
-        return NULL;
-    }
-
-    child_data = g_slice_new(struct _PyGChildData);
-    child_data->func = func;
-    child_data->data = user_data;
-    Py_INCREF(child_data->func);
-    if (child_data->data)
-        Py_INCREF(child_data->data);
-    id = g_child_watch_add_full(priority, pid, child_watch_func,
-                                child_data, child_watch_dnotify);
-    return PYGLIB_PyLong_FromLong(id);
-}
-
-static PyObject *
-pyglib_markup_escape_text(PyObject *unused, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "text", NULL };
-    char *text_in, *text_out;
-    Py_ssize_t text_size;
-    PyObject *retval;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-				     "s#:glib.markup_escape_text", kwlist,
-                                     &text_in, &text_size))
-        return NULL;
-
-    text_out = g_markup_escape_text(text_in, text_size);
-    retval = PYGLIB_PyUnicode_FromString(text_out);
-    g_free(text_out);
-    return retval;
-}
-
-static PyObject *
-pyglib_get_current_time(PyObject *unused)
-{
-    GTimeVal timeval;
-
-    g_get_current_time(&timeval);
-    return pyglib_float_from_timeval(timeval);
-}
-
-static PyObject*
-get_user_dir(const char *path)
-{
-    if (path)
-        return PYGLIB_PyUnicode_FromString(path);
-    else {
-        Py_INCREF(Py_None);
-        return Py_None;
-    }
-}
-
-static PyObject*
-pyglib_get_user_config_dir(PyObject *self)
-{
-    return get_user_dir(g_get_user_config_dir());
-}
-
-static PyObject*
-pyglib_get_user_cache_dir(PyObject *self)
-{
-    return get_user_dir(g_get_user_cache_dir());
-}
-
-static PyObject*
-pyglib_get_user_data_dir(PyObject *self)
-{
-    return get_user_dir(g_get_user_data_dir());
-}
-
-static PyObject *
-pyglib_get_user_special_dir(PyObject *unused, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "directory", NULL };
-    guint directory;
-    const char *path;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-                                     "i:glib.get_user_special_dir", kwlist,
-                                     &directory))
-        return NULL;
-
-    path = g_get_user_special_dir(directory);
-    if (path)
-        return PYGLIB_PyUnicode_FromString(path);
-    else {
-        Py_INCREF(Py_None);
-        return Py_None;
-    }
-}
-
-static PyObject *
-pyglib_main_depth(PyObject *unused)
-{
-    return PYGLIB_PyLong_FromLong(g_main_depth());
-}
-
-static PyObject *
-pyglib_filename_display_name(PyObject *self, PyObject *args)
-{
-    PyObject *py_display_name;
-    char *filename, *display_name;
-    
-    if (!PyArg_ParseTuple(args, "s:glib.filename_display_name",
-			  &filename))
-	return NULL;
-
-    display_name = g_filename_display_name(filename);
-    py_display_name = PyUnicode_DecodeUTF8(display_name,
-					   strlen(display_name), NULL);
-    g_free(display_name);
-    return py_display_name;
-}
-
-static PyObject *
-pyglib_filename_display_basename(PyObject *self, PyObject *args)
-{
-    PyObject *py_display_basename;
-    char *filename, *display_basename;
-    
-    if (!PyArg_ParseTuple(args, "s:glib.filename_display_basename",
-			  &filename))
-	return NULL;
-
-    display_basename = g_filename_display_basename(filename);
-    py_display_basename = PyUnicode_DecodeUTF8(display_basename,
-					       strlen(display_basename), NULL);
-    g_free(display_basename);
-    return py_display_basename;
-}
-
-static PyObject *
-pyglib_filename_from_utf8(PyObject *self, PyObject *args)
-{
-    char *filename, *utf8string;
-    Py_ssize_t utf8string_len;
-    gsize bytes_written;
-    GError *error = NULL;
-    PyObject *py_filename;
-    
-    if (!PyArg_ParseTuple(args, "s#:glib.filename_from_utf8",
-			  &utf8string, &utf8string_len))
-	return NULL;
-
-    filename = g_filename_from_utf8(utf8string, utf8string_len,
-				    NULL, &bytes_written, &error);
-    if (pyglib_error_check(&error)) {
-        g_free(filename);
-        return NULL;
-    }
-    py_filename = PYGLIB_PyUnicode_FromStringAndSize(filename, bytes_written);
-    g_free(filename);
-    return py_filename;
-}
-
-
-static PyObject*
-pyglib_get_application_name(PyObject *self)
-{
-    const char *name;
-
-    name = g_get_application_name();
-    if (!name) {
-        Py_INCREF(Py_None);
-        return Py_None;
-    }
-    return PYGLIB_PyUnicode_FromString(name);
-}
-
-static PyObject*
-pyglib_set_application_name(PyObject *self, PyObject *arg)
-{
-    PyObject *repr = NULL;
-    if (!PYGLIB_PyUnicode_Check(arg)) {
-	repr = PyObject_Repr(arg);
-	PyErr_Format(PyExc_TypeError,
-		     "first argument must be a string, not '%s'",
-		     PYGLIB_PyUnicode_AsString(repr));
-	Py_DECREF(repr);
-	return NULL;
-    }
-    g_set_application_name(PYGLIB_PyUnicode_AsString(arg));
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject*
-pyglib_get_prgname(PyObject *self)
-{
-    char *name;
-
-    name = g_get_prgname();
-    if (!name) {
-        Py_INCREF(Py_None);
-        return Py_None;
-    }
-    return PYGLIB_PyUnicode_FromString(name);
-}
-
-static PyObject*
-pyglib_set_prgname(PyObject *self, PyObject *arg)
-{
-    PyObject *repr = NULL;
-    if (!PYGLIB_PyUnicode_Check(arg)) {
-	repr = PyObject_Repr(arg);
-	PyErr_Format(PyExc_TypeError,
-		     "first argument must be a string, not '%s'",
-		     PYGLIB_PyUnicode_AsString(repr));
-	Py_DECREF(repr);
-	return NULL;
-    }
-    g_set_prgname(PYGLIB_PyUnicode_AsString(arg));
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject *
-pyglib_find_program_in_path(PyObject *unused, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "program", NULL };
-    char *program, *ret;
-    PyObject *retval;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-				     "s:glib.find_program_in_path", kwlist,
-                                     &program))
-        return NULL;
-
-    ret = g_find_program_in_path(program);
-
-    if (ret != NULL) {
-        retval = PYGLIB_PyUnicode_FromString(ret);
-        g_free(ret);
-    } else {
-        Py_INCREF(Py_None);
-        retval = Py_None;
-    }
-    return retval;
-}
-
-static PyObject *
-pyglib_uri_list_extract_uris(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "uri_list", NULL };
-    char *uri_list;
-    char **uris, **tmp;
-    int i = 0, j;
-    PyObject *ret;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:uri_list_extract_uris", kwlist, &uri_list))
-        return NULL;
-
-    uris = (char **)g_uri_list_extract_uris(uri_list);
-    if (!uris) {
-        Py_INCREF(Py_None);
-        return Py_None;
-    }
-
-    tmp = uris;
-    while (*tmp)
-        tmp++, i++;
-
-    ret = PyTuple_New(i);
-    for (j = 0; j < i; j++)
-        PyTuple_SetItem(ret, j, PYGLIB_PyUnicode_FromString(uris[j]));
-
-    g_strfreev(uris);
-
-    return ret;
-}
-
-/* FIXME: we should use strv_to_pylist (in pygio-utils.h) here, but that
- * function should be moved into pyglib first. See
- * https://bugzilla.gnome.org/show_bug.cgi?id=630508
- */
-static PyObject *
-tuple_of_strings_from_dirs(const gchar* const *dirs)
-{
-    char **tmp;
-    int i = 0, j;
-    PyObject *ret;
-
-    if (!dirs) {
-        Py_INCREF(Py_None);
-        return Py_None;
-    }
-
-    tmp = (char **)dirs;
-    while (*tmp)
-        tmp++, i++;
-
-    ret = PyTuple_New(i);
-    for (j = 0; j < i; j++)
-        PyTuple_SetItem(ret, j, PYGLIB_PyUnicode_FromString(dirs[j]));
-
-    return ret;
-}
-
-static PyObject*
-pyglib_get_system_config_dirs(PyObject *self)
-{
-    return tuple_of_strings_from_dirs(g_get_system_config_dirs());
-}
-
-static PyObject*
-pyglib_get_system_data_dirs(PyObject *self)
-{
-    return tuple_of_strings_from_dirs(g_get_system_data_dirs());
-}
-
 static PyMethodDef _glib_functions[] = {
     { "threads_init",
       (PyCFunction) pyglib_threads_init, METH_NOARGS,
@@ -692,49 +53,6 @@ static PyMethodDef _glib_functions[] = {
       "Initialize GLib for use from multiple threads. If you also use GTK+\n"
       "itself (i.e. GUI, not just PyGObject), use gtk.gdk.threads_init()\n"
       "instead." },
-    { "idle_add",
-      (PyCFunction)pyglib_idle_add, METH_VARARGS|METH_KEYWORDS,
-      "idle_add(callable, user_data=None, priority=None) -> source id\n"
-      "  callable receives (user_data)\n"
-      "Adds a callable to be called whenever there are no higher priority\n"
-      "events pending to the default main loop." },
-    { "timeout_add",
-      (PyCFunction)pyglib_timeout_add, METH_VARARGS|METH_KEYWORDS,
-      "timeout_add(interval, callable, user_data=None,\n"
-      "            priority=None) -> source id\n"
-      "  callable receives (user_data)\n"
-      "Sets a callable be called repeatedly until it returns False." },
-    { "timeout_add_seconds",
-      (PyCFunction)pyglib_timeout_add_seconds, METH_VARARGS|METH_KEYWORDS,
-      "timeout_add(interval, callable, user_data=None,\n"
-      "            priority=None) -> source_id\n"
-      "  callable receives (user_data)\n"
-      "Sets a callable be called repeatedly until it returns False.\n"
-      "Use this if you want to have a timer in the \"seconds\" range\n"
-      "and do not care about the exact time of the first call of the\n"
-      "timer, use this for more efficient system power usage." },
-    { "io_add_watch",
-      (PyCFunction)pyglib_io_add_watch, METH_VARARGS|METH_KEYWORDS,
-      "io_add_watch(fd, condition, callback, user_data=None) -> source id\n"
-      "  callable receives (fd, condition, user_data)\n"
-      "Arranges for the fd to be monitored by the main loop for the\n"
-      "specified condition. Condition is a combination of glib.IO_IN,\n"
-      "glib.IO_OUT, glib.IO_PRI, gio.IO_ERR and gio.IO_HUB.\n" },
-    { "child_watch_add",
-      (PyCFunction)pyglib_child_watch_add, METH_VARARGS|METH_KEYWORDS,
-      "child_watch_add(pid, callable, user_data=None,\n"
-                       "priority=None) -> source id\n"
-      "  callable receives (pid, condition, user_data)\n"
-      "Sets the function specified by function to be called with the user\n"
-      "data specified by data when the child indicated by pid exits.\n"
-      "Condition is a combination of glib.IO_IN, glib.IO_OUT, glib.IO_PRI,\n"
-      "gio.IO_ERR and gio.IO_HUB." },
-    { "source_remove",
-      (PyCFunction)pyglib_source_remove, METH_VARARGS,
-      "source_remove(source_id) -> True if removed\n"
-      "Removes the event source specified by source id as returned by the\n"
-      "glib.idle_add(), glib.timeout_add() or glib.io_add_watch()\n"
-      "functions." },
     { "spawn_async",
       (PyCFunction)pyglib_spawn_async, METH_VARARGS|METH_KEYWORDS,
       "spawn_async(argv, envp=None, working_directory=None,\n"
@@ -743,53 +61,6 @@ static PyMethodDef _glib_functions[] = {
       "            standard_error=None) -> (pid, stdin, stdout, stderr)\n"
       "Execute a child program asynchronously within a glib.MainLoop()\n"
       "See the reference manual for a complete reference." },
-    { "main_context_default",
-      (PyCFunction)pyglib_main_context_default, METH_NOARGS,
-      "main_context_default() -> a main context\n"
-      "Returns the default main context. This is the main context used\n"
-      "for main loop functions when a main loop is not explicitly specified." },
-    { "main_depth",
-      (PyCFunction)pyglib_main_depth, METH_NOARGS,
-      "main_depth() -> stack depth\n"
-      "Returns the depth of the stack of calls in the main context." },
-    { "filename_display_name",
-      (PyCFunction)pyglib_filename_display_name, METH_VARARGS },
-    { "filename_display_basename",
-      (PyCFunction)pyglib_filename_display_basename, METH_VARARGS },
-    { "filename_from_utf8",
-      (PyCFunction)pyglib_filename_from_utf8, METH_VARARGS },
-    { "get_application_name",
-      (PyCFunction)pyglib_get_application_name, METH_NOARGS },
-    { "set_application_name",
-      (PyCFunction)pyglib_set_application_name, METH_O },
-    { "get_prgname",
-      (PyCFunction)pyglib_get_prgname, METH_NOARGS },
-    { "set_prgname",
-      (PyCFunction)pyglib_set_prgname, METH_O },
-    { "get_current_time",
-      (PyCFunction)pyglib_get_current_time, METH_NOARGS },
-    { "get_user_cache_dir",
-      (PyCFunction)pyglib_get_user_cache_dir, METH_NOARGS },
-    { "get_user_config_dir",
-      (PyCFunction)pyglib_get_user_config_dir, METH_NOARGS },
-    { "get_user_data_dir",
-      (PyCFunction)pyglib_get_user_data_dir, METH_NOARGS },
-    { "get_user_special_dir",
-      (PyCFunction)pyglib_get_user_special_dir, METH_VARARGS|METH_KEYWORDS },
-    { "markup_escape_text",
-      (PyCFunction)pyglib_markup_escape_text, METH_VARARGS|METH_KEYWORDS },
-    { "find_program_in_path",
-      (PyCFunction)pyglib_find_program_in_path, METH_VARARGS|METH_KEYWORDS },
-    { "uri_list_extract_uris",
-      (PyCFunction)pyglib_uri_list_extract_uris, METH_VARARGS|METH_KEYWORDS,
-      "uri_list_extract_uris(uri_list) -> tuple of strings holding URIs\n"
-      "Splits an string containing an URI list conforming to the \n"
-      "text/uri-list mime type defined in RFC 2483 into individual URIs, \n"
-      "discarding any comments. The URIs are not validated." },
-    { "get_system_config_dirs",
-      (PyCFunction)pyglib_get_system_config_dirs, METH_NOARGS },
-    { "get_system_data_dirs",
-      (PyCFunction)pyglib_get_system_data_dirs, METH_NOARGS },
     { NULL, NULL, 0 }
 };
 
@@ -800,7 +71,7 @@ static struct _PyGLib_Functions pyglib_api = {
     NULL,  /* gerror_exception */
     NULL,  /* block_threads */
     NULL,  /* unblock_threads */
-    pyg_main_context_new,
+    NULL,  /* pyg_main_context_new */
     pyg_option_context_new,
     pyg_option_group_new,
 };
@@ -836,143 +107,12 @@ pyglib_register_error(PyObject *d)
     pyglib_api.gerror_exception = gerror_class;
 }
 
-static void
-pyglib_register_version_tuples(PyObject *d)
-{
-    PyObject *o;
-
-    /* glib version */
-    o = Py_BuildValue("(iii)", glib_major_version, glib_minor_version,
-		      glib_micro_version);
-    PyDict_SetItemString(d, "glib_version", o);
-    Py_DECREF(o);
-
-    /* pyglib version */
-    o = Py_BuildValue("(iii)",
-		      PYGLIB_MAJOR_VERSION,
-		      PYGLIB_MINOR_VERSION,
-		      PYGLIB_MICRO_VERSION);
-    PyDict_SetItemString(d, "pyglib_version", o);
-    Py_DECREF(o);
-}
-
-static void
-pyglib_register_constants(PyObject *m)
-{
-    PyModule_AddIntConstant(m, "SPAWN_LEAVE_DESCRIPTORS_OPEN",
-			    G_SPAWN_LEAVE_DESCRIPTORS_OPEN);
-    PyModule_AddIntConstant(m, "SPAWN_DO_NOT_REAP_CHILD",
-			    G_SPAWN_DO_NOT_REAP_CHILD);
-    PyModule_AddIntConstant(m, "SPAWN_SEARCH_PATH",
-			    G_SPAWN_SEARCH_PATH);
-    PyModule_AddIntConstant(m, "SPAWN_STDOUT_TO_DEV_NULL",
-			    G_SPAWN_STDOUT_TO_DEV_NULL);
-    PyModule_AddIntConstant(m, "SPAWN_STDERR_TO_DEV_NULL",
-			    G_SPAWN_STDERR_TO_DEV_NULL);
-    PyModule_AddIntConstant(m, "SPAWN_CHILD_INHERITS_STDIN",
-			    G_SPAWN_CHILD_INHERITS_STDIN);
-    PyModule_AddIntConstant(m, "SPAWN_FILE_AND_ARGV_ZERO",
-			    G_SPAWN_FILE_AND_ARGV_ZERO);
-
-    PyModule_AddIntConstant(m, "PRIORITY_HIGH",
-			    G_PRIORITY_HIGH);
-    PyModule_AddIntConstant(m, "PRIORITY_DEFAULT",
-			    G_PRIORITY_DEFAULT);
-    PyModule_AddIntConstant(m, "PRIORITY_HIGH_IDLE",
-			    G_PRIORITY_HIGH_IDLE);
-    PyModule_AddIntConstant(m, "PRIORITY_DEFAULT_IDLE",
-			    G_PRIORITY_DEFAULT_IDLE);
-    PyModule_AddIntConstant(m, "PRIORITY_LOW",
-			    G_PRIORITY_LOW);
-
-    PyModule_AddIntConstant(m, "IO_IN",   G_IO_IN);
-    PyModule_AddIntConstant(m, "IO_OUT",  G_IO_OUT);
-    PyModule_AddIntConstant(m, "IO_PRI",  G_IO_PRI);
-    PyModule_AddIntConstant(m, "IO_ERR",  G_IO_ERR);
-    PyModule_AddIntConstant(m, "IO_HUP",  G_IO_HUP);
-    PyModule_AddIntConstant(m, "IO_NVAL", G_IO_NVAL);
-
-    PyModule_AddIntConstant(m, "IO_STATUS_ERROR",
-			    G_IO_STATUS_ERROR);
-    PyModule_AddIntConstant(m, "IO_STATUS_NORMAL",
-			    G_IO_STATUS_NORMAL);
-    PyModule_AddIntConstant(m, "IO_STATUS_EOF",
-			    G_IO_STATUS_EOF);
-    PyModule_AddIntConstant(m, "IO_STATUS_AGAIN",
-			    G_IO_STATUS_AGAIN);
-    PyModule_AddIntConstant(m, "IO_FLAG_APPEND",
-			    G_IO_FLAG_APPEND);
-    PyModule_AddIntConstant(m, "IO_FLAG_NONBLOCK",
-			    G_IO_FLAG_NONBLOCK);
-    PyModule_AddIntConstant(m, "IO_FLAG_IS_READABLE",
-			    G_IO_FLAG_IS_READABLE);
-    PyModule_AddIntConstant(m, "IO_FLAG_IS_WRITEABLE",
-			    G_IO_FLAG_IS_WRITEABLE);
-    PyModule_AddIntConstant(m, "IO_FLAG_IS_SEEKABLE",
-			    G_IO_FLAG_IS_SEEKABLE);
-    PyModule_AddIntConstant(m, "IO_FLAG_MASK",
-			    G_IO_FLAG_MASK);
-    PyModule_AddIntConstant(m, "IO_FLAG_GET_MASK",
-			    G_IO_FLAG_GET_MASK);
-    PyModule_AddIntConstant(m, "IO_FLAG_SET_MASK",
-			    G_IO_FLAG_SET_MASK);
-
-    PyModule_AddIntConstant(m, "OPTION_FLAG_HIDDEN",
-			    G_OPTION_FLAG_HIDDEN);
-    PyModule_AddIntConstant(m, "OPTION_FLAG_IN_MAIN",
-			    G_OPTION_FLAG_IN_MAIN);
-    PyModule_AddIntConstant(m, "OPTION_FLAG_REVERSE",
-			    G_OPTION_FLAG_REVERSE);
-    PyModule_AddIntConstant(m, "OPTION_FLAG_NO_ARG",
-			    G_OPTION_FLAG_NO_ARG);
-    PyModule_AddIntConstant(m, "OPTION_FLAG_FILENAME",
-			    G_OPTION_FLAG_FILENAME);
-    PyModule_AddIntConstant(m, "OPTION_FLAG_OPTIONAL_ARG",
-			    G_OPTION_FLAG_OPTIONAL_ARG);
-    PyModule_AddIntConstant(m, "OPTION_FLAG_NOALIAS",
-			    G_OPTION_FLAG_NOALIAS); 
-
-    PyModule_AddIntConstant(m, "OPTION_ERROR_UNKNOWN_OPTION",
-			    G_OPTION_ERROR_UNKNOWN_OPTION);
-    PyModule_AddIntConstant(m, "OPTION_ERROR_BAD_VALUE",
-			    G_OPTION_ERROR_BAD_VALUE);
-    PyModule_AddIntConstant(m, "OPTION_ERROR_FAILED",
-			    G_OPTION_ERROR_FAILED);
- 
-    PyModule_AddIntConstant(m, "USER_DIRECTORY_DESKTOP",
-                            G_USER_DIRECTORY_DESKTOP);
-    PyModule_AddIntConstant(m, "USER_DIRECTORY_DOCUMENTS",
-                            G_USER_DIRECTORY_DOCUMENTS);
-    PyModule_AddIntConstant(m, "USER_DIRECTORY_DOWNLOAD",
-                            G_USER_DIRECTORY_DOWNLOAD);
-    PyModule_AddIntConstant(m, "USER_DIRECTORY_MUSIC",
-                            G_USER_DIRECTORY_MUSIC);
-    PyModule_AddIntConstant(m, "USER_DIRECTORY_PICTURES",
-                            G_USER_DIRECTORY_PICTURES);
-    PyModule_AddIntConstant(m, "USER_DIRECTORY_PUBLIC_SHARE",
-                            G_USER_DIRECTORY_PUBLIC_SHARE);
-    PyModule_AddIntConstant(m, "USER_DIRECTORY_TEMPLATES",
-                            G_USER_DIRECTORY_TEMPLATES);
-    PyModule_AddIntConstant(m, "USER_DIRECTORY_VIDEOS",
-                            G_USER_DIRECTORY_VIDEOS);
-
-    PyModule_AddStringConstant(m, "OPTION_REMAINING",
-			       G_OPTION_REMAINING);
-    PyModule_AddStringConstant(m, "OPTION_ERROR",
-			       (char*) g_quark_to_string(G_OPTION_ERROR));
-}
-
 PYGLIB_MODULE_START(_glib, "_glib")
 {
     PyObject *d = PyModule_GetDict(module);
 
-    pyglib_register_constants(module);
     pyglib_register_api(d);
     pyglib_register_error(d);
-    pyglib_register_version_tuples(d);
-    pyglib_iochannel_register_types(d);
-    pyglib_mainloop_register_types(d);
-    pyglib_maincontext_register_types(d);
     pyglib_source_register_types(d);
     pyglib_spawn_register_types(d);
     pyglib_option_context_register_types(d);
diff --git a/gi/_glib/option.py b/gi/_glib/option.py
index afc13ac..54e802f 100644
--- a/gi/_glib/option.py
+++ b/gi/_glib/option.py
@@ -33,6 +33,7 @@ import sys
 import optparse
 from optparse import OptParseError, OptionError, OptionValueError, \
     BadOptionError, OptionConflictError
+from ..module import get_introspection_module
 
 if sys.version_info >= (3, 0):
     _basestring = str
@@ -41,9 +42,10 @@ else:
     _basestring = basestring
     _bytes = str
 
-import gi._glib
-gi  # pyflakes
-_glib = sys.modules['gi._glib._glib']
+from gi._glib import _glib
+GLib = get_introspection_module('GLib')
+
+OPTION_CONTEXT_ERROR_QUARK = GLib.quark_to_string(GLib.option_error_quark())
 
 __all__ = [
     "OptParseError",
@@ -92,7 +94,7 @@ class Option(optparse.Option):
         'optional_arg',
     ]
 
-    REMAINING = '--' + _glib.OPTION_REMAINING
+    REMAINING = '--' + GLib.OPTION_REMAINING
 
     def __init__(self, *args, **kwargs):
         optparse.Option.__init__(self, *args, **kwargs)
@@ -118,19 +120,19 @@ class Option(optparse.Option):
         flags = 0
 
         if self.hidden:
-            flags |= _glib.OPTION_FLAG_HIDDEN
+            flags |= GLib.OptionFlags.HIDDEN
 
         if self.in_main:
-            flags |= _glib.OPTION_FLAG_IN_MAIN
+            flags |= GLib.OptionFlags.IN_MAIN
 
         if self.takes_value():
             if self.optional_arg:
-                flags |= _glib.OPTION_FLAG_OPTIONAL_ARG
+                flags |= GLib.OptionFlags.OPTIONAL_ARG
         else:
-            flags |= _glib.OPTION_FLAG_NO_ARG
+            flags |= GLib.OptionFlags.NO_ARG
 
         if self.type == 'filename':
-            flags |= _glib.OPTION_FLAG_FILENAME
+            flags |= GLib.OptionFlags.FILENAME
 
         for (long_name, short_name) in zip(self._long_opts, self._short_opts):
             yield (long_name[2:], _bytes(short_name[1]), flags, self.help, self.metavar)
@@ -195,8 +197,8 @@ class OptionGroup(optparse.OptionGroup):
             except OptionValueError:
                 error = sys.exc_info()[1]
                 gerror = _glib.GError(str(error))
-                gerror.domain = _glib.OPTION_ERROR
-                gerror.code = _glib.OPTION_ERROR_BAD_VALUE
+                gerror.domain = OPTION_CONTEXT_ERROR_QUARK
+                gerror.code = GLib.OptionError.BAD_VALUE
                 gerror.message = str(error)
                 raise gerror
 
@@ -340,13 +342,13 @@ class OptionParser(optparse.OptionParser):
                 self, args, values)
         except _glib.GError:
             error = sys.exc_info()[1]
-            if error.domain != _glib.OPTION_ERROR:
+            if error.domain != OPTION_CONTEXT_ERROR_QUARK:
                 raise
-            if error.code == _glib.OPTION_ERROR_BAD_VALUE:
+            if error.code == GLib.OptionError.BAD_VALUE:
                 raise OptionValueError(error.message)
-            elif error.code == _glib.OPTION_ERROR_UNKNOWN_OPTION:
+            elif error.code == GLib.OptionError.UNKNOWN_OPTION:
                 raise BadOptionError(error.message)
-            elif error.code == _glib.OPTION_ERROR_FAILED:
+            elif error.code == GLib.OptionError.FAILED:
                 raise OptParseError(error.message)
             else:
                 raise
diff --git a/gi/_glib/pygiochannel.c b/gi/_glib/pygiochannel.c
deleted file mode 100644
index 0288145..0000000
--- a/gi/_glib/pygiochannel.c
+++ /dev/null
@@ -1,763 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#include <Python.h>
-#include <pythread.h>
-#include <structmember.h> /* for PyMemberDef */
-
-#include "pyglib.h"
-#include "pyglib-private.h"
-#include "pygsource.h"
-
-#include "pygiochannel.h"
-
-typedef struct {
-    PyObject_HEAD
-    GIOChannel *channel;
-    int softspace;         /* to make print >> chan, "foo" ... work */
-} PyGIOChannel;
-
-PYGLIB_DEFINE_TYPE("gi._glib.IOChannel", PyGIOChannel_Type, PyGIOChannel)
-
-static PyObject*
-py_io_channel_next(PyGIOChannel *self)
-{
-    PyObject* ret_obj = NULL;
-    gsize length = 0, terminator_pos;
-    gchar *str_return = NULL;
-    GError *error = NULL;
-    GIOStatus status;
-
-    status = g_io_channel_read_line(self->channel, &str_return, &length,
-                                    &terminator_pos, &error);
-    if (pyglib_error_check(&error))
-        return NULL;
-
-    if (status == G_IO_STATUS_EOF) {
-        PyErr_SetString(PyExc_StopIteration, "EOF");
-        return NULL;
-    }
-
-    ret_obj = PYGLIB_PyUnicode_FromStringAndSize(str_return, length);
-    g_free(str_return);
-    return ret_obj;
-}
-
-static PyObject*
-py_io_channel_richcompare(PyObject *self, PyObject *other, int op)
-{
-    if (Py_TYPE(self) == Py_TYPE(other) && 
-          Py_TYPE(self) == &PyGIOChannel_Type) {
-        return _pyglib_generic_ptr_richcompare(((PyGIOChannel*)self)->channel,
-                                               ((PyGIOChannel*)other)->channel,
-                                               op);
-    } else {
-       Py_INCREF(Py_NotImplemented);
-       return Py_NotImplemented;
-    }
-}
-
-static PyObject*
-py_io_channel_get_iter(PyObject *self)
-{
-    Py_INCREF(self);
-    return self;
-}
-
-static long
-py_io_channel_hash(PyGIOChannel *self)
-{
-    return (long) self->channel;
-}
-
-static void
-py_io_channel_dealloc(PyGIOChannel *self)
-{
-    if (self->channel)
-        g_io_channel_unref(self->channel);
-    PyObject_DEL(self);
-}
-
-static PyObject*
-py_io_channel_shutdown(PyGIOChannel* self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "flush", NULL };
-    GIOStatus ret;
-    PyObject* flush = Py_True;
-    GError* error = NULL;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O:gi._glib.IOChannel.shutdown", kwlist, &flush))
-        return NULL;
-	
-    ret = g_io_channel_shutdown(self->channel, PyObject_IsTrue(flush), &error);
-    if (pyglib_error_check(&error))
-	return NULL;
-	
-    return PYGLIB_PyLong_FromLong(ret);
-}
-
-/* character encoding conversion involved functions.
- */
- 
-static PyObject*
-py_io_channel_set_buffer_size(PyGIOChannel* self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "size", NULL };
-    int size;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:gi._glib.IOChannel.set_buffer_size", kwlist, &size))
-        return NULL;
-	
-    g_io_channel_set_buffer_size(self->channel, size);
-    
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject*
-py_io_channel_get_buffer_size(PyGIOChannel* self)
-{
-    return PYGLIB_PyLong_FromLong(g_io_channel_get_buffer_size(self->channel));
-}
-
-static PyObject*
-py_io_channel_set_buffered(PyGIOChannel* self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "buffered", NULL };
-    int buffered;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:gi._glib.IOChannel.set_buffered", kwlist, &buffered))
-        return NULL;
-	
-    g_io_channel_set_buffered(self->channel, buffered);
-    
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject*
-py_io_channel_get_buffered(PyGIOChannel* self)
-{
-    return PYGLIB_PyLong_FromLong(g_io_channel_get_buffered(self->channel));
-}
-
-static PyObject*
-py_io_channel_set_encoding(PyGIOChannel* self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "encoding", NULL };
-    const char* encoding;
-    GError* error = NULL;
-    
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "z:gi._glib.IOChannel.set_encoding", kwlist, &encoding))
-        return NULL;
-    
-    g_io_channel_set_encoding(self->channel, encoding, &error);
-    if (pyglib_error_check(&error))
-	return NULL;
-    
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject*
-py_io_channel_get_encoding(PyGIOChannel* self)
-{
-    const char* encoding = g_io_channel_get_encoding(self->channel);
-    
-    if (encoding == NULL) {
-	Py_INCREF(Py_None);
-	return Py_None;
-    }
-
-    return PYGLIB_PyUnicode_FromString(encoding);
-}
-
-#define CHUNK_SIZE (8 * 1024)
-
-static PyObject*
-py_io_channel_read_chars(PyGIOChannel* self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "max_count", NULL };
-    int max_count = -1;
-    PyObject* ret_obj = NULL;
-    gsize total_read = 0;
-    GError* error = NULL;
-    GIOStatus status = G_IO_STATUS_NORMAL;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|i:gi._glib.IOChannel.read", kwlist, &max_count))
-        return NULL;
-	
-    if (max_count == 0)
-	return PYGLIB_PyUnicode_FromString("");
-    
-    while (status == G_IO_STATUS_NORMAL
-	   && (max_count == -1 || total_read < max_count)) {
-	gsize single_read;
-	char* buf;
-	gsize buf_size;
-	
-	if (max_count == -1) 
-	    buf_size = CHUNK_SIZE;
-	else {
-	    buf_size = max_count - total_read;
-	    if (buf_size > CHUNK_SIZE)
-		buf_size = CHUNK_SIZE;
-        }
-	
-	if ( ret_obj == NULL ) {
-	    ret_obj = PYGLIB_PyBytes_FromStringAndSize((char *)NULL, buf_size);
-	    if (ret_obj == NULL)
-		goto failure;
-	}
-	else if (buf_size + total_read > PYGLIB_PyBytes_Size(ret_obj)) {
-	    if (PYGLIB_PyBytes_Resize(&ret_obj, buf_size + total_read) == -1)
-		goto failure;
-	}
-       
-        buf = PYGLIB_PyBytes_AsString(ret_obj) + total_read;
-
-        pyglib_unblock_threads();
-        status = g_io_channel_read_chars(self->channel, buf, buf_size, 
-                                         &single_read, &error);
-        pyglib_block_threads();
-	if (pyglib_error_check(&error))
-	    goto failure;
-	
-	total_read += single_read;
-    }
-	
-    if ( total_read != PYGLIB_PyBytes_Size(ret_obj) ) {
-	if (PYGLIB_PyBytes_Resize(&ret_obj, total_read) == -1)
-	    goto failure;
-    }
-
-#if PY_VERSION_HEX >= 0x03000000
-    /* If this is not UTF8 encoded channel return the raw bytes */
-    if (g_io_channel_get_encoding(self->channel) != NULL)
-        return ret_obj;
-
-    /* convert to Unicode string */
-    {
-	PyObject *unicode_obj;
-
-	unicode_obj = PyUnicode_FromString(PyBytes_AS_STRING(ret_obj));
-	if (unicode_obj == NULL)
-	    goto failure;
-	Py_DECREF(ret_obj);
-	ret_obj = unicode_obj;
-    }
-#endif
-
-    return ret_obj;
-
-  failure:
-    Py_XDECREF(ret_obj);
-    return NULL;
-}
-
-static PyObject*
-py_io_channel_write_chars(PyGIOChannel* self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "buf", NULL };
-    const char* buf;
-    Py_ssize_t buf_len;
-    gsize count;
-    GError* error = NULL;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s#:gi._glib.IOChannel.write",
-                                     kwlist, &buf, &buf_len))
-        return NULL;
-	
-    pyglib_unblock_threads();
-    g_io_channel_write_chars(self->channel, buf, buf_len, &count, &error);
-    pyglib_block_threads();
-    if (pyglib_error_check(&error))
-	return NULL;
-	
-    return PYGLIB_PyLong_FromLong(count);
-}
-
-static PyObject*
-py_io_channel_write_lines(PyGIOChannel* self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "lines", NULL };
-    char *buf;
-    Py_ssize_t buf_len;
-    gsize count;
-    GError* error = NULL;
-    PyObject *iter, *value, *pylines;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:gi._glib.IOChannel.writelines",
-                                     kwlist, &pylines))
-        return NULL;
-
-    iter = PyObject_GetIter(pylines);
-    
-    while (1) {
-        value = PyIter_Next(iter);
-        if (PyErr_ExceptionMatches(PyExc_StopIteration)) {
-            PyErr_Clear();
-            goto normal_exit;
-        }
-        if (!PYGLIB_PyUnicode_Check(value)) {
-            PyErr_SetString(PyExc_TypeError, "gi._glib.IOChannel.writelines must"
-                            " be sequence/iterator of strings");
-            Py_DECREF(iter);
-            return NULL;
-        }
-        PYGLIB_PyUnicode_AsStringAndSize(value, &buf, &buf_len);
-        pyglib_unblock_threads();
-        g_io_channel_write_chars(self->channel, buf, buf_len, &count, &error);
-        pyglib_unblock_threads();
-        Py_DECREF(value);
-        if (pyglib_error_check(&error)) {
-            Py_DECREF(iter);
-            return NULL;
-        }
-    }
-normal_exit:
-    Py_DECREF(iter);
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject*
-py_io_channel_flush(PyGIOChannel* self)
-{
-    GError* error = NULL;
-    GIOStatus status;
-	
-    pyglib_unblock_threads();
-    status = g_io_channel_flush(self->channel, &error);
-    pyglib_block_threads();
-    if (pyglib_error_check(&error))
-	return NULL;
-	
-    return PYGLIB_PyLong_FromLong(status);
-}
-
-static PyObject*
-py_io_channel_set_flags(PyGIOChannel* self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "flags", NULL };
-    GIOFlags flags;
-    GIOStatus status;
-    GError* error = NULL;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:gi._glib.IOChannel.set_flags",
-                                     kwlist, &flags))
-        return NULL;
-	
-    status = g_io_channel_set_flags(self->channel, flags, &error);
-    if (pyglib_error_check(&error))
-	return NULL;
-	
-    return PYGLIB_PyLong_FromLong(status);
-}
-
-static PyObject*
-py_io_channel_get_flags(PyGIOChannel* self)
-{
-    return PYGLIB_PyLong_FromLong(g_io_channel_get_flags(self->channel));
-}
-
-static PyObject*
-py_io_channel_get_buffer_condition(PyGIOChannel* self)
-{
-    return PYGLIB_PyLong_FromLong(g_io_channel_get_buffer_condition(self->channel));
-}
-
-static PyObject*
-py_io_channel_set_close_on_unref(PyGIOChannel* self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "do_close", NULL };
-    PyObject *do_close;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:gi._glib.IOChannel.set_close_on_unref",
-                                     kwlist, &do_close))
-        return NULL;
-	
-    g_io_channel_set_close_on_unref(self->channel, PyObject_IsTrue(do_close));
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject*
-py_io_channel_get_close_on_unref(PyGIOChannel* self)
-{
-    if (g_io_channel_get_close_on_unref(self->channel)) {
-        Py_INCREF(Py_True);
-        return Py_True;
-    } else {
-        Py_INCREF(Py_False);
-        return Py_False;
-    }
-}
-
-typedef struct {
-    PyObject *callback;
-    PyObject *iochannel;
-    PyObject *user_data;
-} PyGIOWatchData;
-
-static void
-pyg_iowatch_data_free(PyGIOWatchData *data)
-{
-    Py_DECREF(data->callback);
-    Py_XDECREF(data->user_data);
-    Py_DECREF(data->iochannel);
-    g_slice_free(PyGIOWatchData, data);
-}
-
-static gboolean
-pyg_iowatch_marshal(GIOChannel *source,
-                    GIOCondition condition,
-                    gpointer user_data)
-{
-    PyObject *ret;
-    gboolean res;
-    PyGIOWatchData *data = (PyGIOWatchData *) user_data;
-    PyGILState_STATE state;
-
-    g_return_val_if_fail(user_data != NULL, FALSE);
-    g_return_val_if_fail(((PyGIOChannel *) data->iochannel)->channel == source,
-                         FALSE);
-
-    state = pyglib_gil_state_ensure();
-
-    if (data->user_data)
-        ret = PyObject_CallFunction(data->callback, "OiO", data->iochannel,
-                                    condition, data->user_data);
-    else
-        ret = PyObject_CallFunction(data->callback, "Oi", data->iochannel,
-                                    condition);
-
-    if (!ret) {
-	PyErr_Print();
-	res = FALSE;
-    } else {
-	res = PyObject_IsTrue(ret);
-	Py_DECREF(ret);
-    }
-    pyglib_gil_state_release(state);
-
-    return res;
-}
-
-
-
-static PyObject *
-py_io_channel_add_watch(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "condition", "callback", "user_data", "priority", NULL };
-    PyObject *callback, *user_data = NULL;
-    int priority = G_PRIORITY_DEFAULT, condition;
-    GIOChannel *iochannel = NULL;
-    guint handler_id;
-    PyGIOWatchData *data;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-                                     "iO|Oi:gi._glib.IOChannel.add_watch",
-                                     kwlist, &condition, &callback,
-                                     &user_data, &priority))
-        return NULL;
-
-    iochannel = ((PyGIOChannel *) self)->channel;
-
-    if (!PyCallable_Check(callback)) {
-        PyErr_SetString(PyExc_TypeError, "second must be callable");
-        return NULL;
-    }
-
-    data = g_slice_new(PyGIOWatchData);
-    data->callback = callback; Py_INCREF(callback);
-    data->user_data = user_data; Py_XINCREF(user_data);
-    data->iochannel = self; Py_INCREF(self);
-
-    handler_id = g_io_add_watch_full(iochannel,
-                                     priority, condition,
-				     pyg_iowatch_marshal, data,
-				     (GDestroyNotify) pyg_iowatch_data_free);
-    return PyLong_FromUnsignedLong(handler_id);
-}
-
-
-#ifdef G_OS_WIN32
-
-static PyObject *
-py_io_channel_win32_poll(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "fds", "timeout", NULL };
-    GPollFD *pollfd;
-    PyObject *pyfds, *pyfd;
-    guint len, i;
-    gint timeout = -1;
-    gint result;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-                                     "O!|i:gi._glib.IOChannel.win32_poll",
-                                     kwlist, &PyList_Type, &pyfds, &timeout))
-        return NULL;
-
-    len = PyList_Size(pyfds);
-    pollfd = g_newa(GPollFD, len);
-    for (i = 0; i < len; ++i) {
-        pyfd = PyList_GET_ITEM(pyfds, i);
-        if (!PyObject_TypeCheck(pyfd, &PyGPollFD_Type)) {
-            PyErr_SetString(PyExc_TypeError, "'fds' must be a list of gi._glib.PollFD objects");
-            return NULL;
-        }
-        pollfd[i] = ((PyGPollFD *) pyfd)->pollfd;
-    }
-
-    result = g_io_channel_win32_poll(pollfd, len, timeout);
-    for (i = 0; i < len; ++i) {
-        pyfd = PyList_GET_ITEM(pyfds, i);
-        ((PyGPollFD *) pyfd)->pollfd = pollfd[i];
-    }
-    return PYGLIB_PyLong_FromLong(result);
-}
-
-static PyObject *
-py_io_channel_win32_make_pollfd(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "condition", NULL };
-    int condition;
-    GPollFD pollfd;
-    PyGPollFD *pypollfd;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-                                     "i:gi._glib.IOChannel.win32_make_pollfd",
-                                     kwlist, &condition))
-        return NULL;
-
-    g_io_channel_win32_make_pollfd(((PyGIOChannel *) self)->channel,
-                                   condition, &pollfd);
-    pypollfd = PyObject_NEW(PyGPollFD, &PyGPollFD_Type);
-    pypollfd->pollfd = pollfd;
-    return (PyObject *) pypollfd;
-}
-#endif /* def G_OS_WIN32 */
-
-
-static PyObject*
-py_io_channel_read_line(PyGIOChannel* self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "size", NULL };
-    PyObject* ret_obj = NULL;
-    gsize length = 0, terminator_pos;
-    gchar *str_return = NULL;
-    GError *error = NULL;
-    gint size_hint = -1;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|i:gi._glib.IOChannel.readline", kwlist,
-                                     &size_hint))
-        return NULL;
-
-    g_io_channel_read_line(self->channel, &str_return, &length,
-                                    &terminator_pos, &error);
-    if (pyglib_error_check(&error))
-        return NULL;
-    ret_obj = PYGLIB_PyUnicode_FromStringAndSize(str_return, length);
-    g_free(str_return);
-    return ret_obj;
-}
-
-static PyObject*
-py_io_channel_read_lines(PyGIOChannel* self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "size", NULL };
-    PyObject *line = NULL;
-    gsize length = 0, terminator_pos;
-    gchar *str_return = NULL;
-    GError *error = NULL;
-    gint size_hint = -1;
-    GIOStatus status = G_IO_STATUS_NORMAL;
-    PyObject *list;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|i:gi._glib.IOChannel.readlines", kwlist,
-                                     &size_hint))
-        return NULL;
-
-    list = PyList_New(0);
-    while (status == G_IO_STATUS_NORMAL) {
-        status = g_io_channel_read_line(self->channel, &str_return, &length,
-                                        &terminator_pos, &error);
-        if (pyglib_error_check(&error)) {
-            Py_DECREF(line);
-            return NULL;
-        }
-        line = PYGLIB_PyUnicode_FromStringAndSize(str_return, length);
-        g_free(str_return);
-        if (PyList_Append(list, line)) {
-            Py_DECREF(line);
-            Py_DECREF(list);
-            return NULL;
-        }
-    }
-    return list;
-}
-
-
-static PyObject*
-py_io_channel_seek(PyGIOChannel* self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "offset", "whence", NULL };
-    gint64 offset;
-    int whence = 0;
-    GIOStatus status;
-    GSeekType seek_type;
-    GError* error = NULL;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "L|i:gi._glib.IOChannel.seek",
-                                     kwlist, &offset, &whence))
-        return NULL;
-
-    switch (whence)
-    {
-    case 0: seek_type = G_SEEK_SET; break;
-    case 1: seek_type = G_SEEK_CUR; break;
-    case 2: seek_type = G_SEEK_END; break;
-    default:
-        PyErr_SetString(PyExc_ValueError, "invalid 'whence' value");
-        return NULL;
-    }
-	
-    status = g_io_channel_seek_position(self->channel, offset,
-                                        seek_type, &error);
-    if (pyglib_error_check(&error))
-	return NULL;
-	
-    return PYGLIB_PyLong_FromLong(status);
-}
-
-#if 0 // Not wrapped
-void                  g_io_channel_set_line_term        (GIOChannel   *channel,
-							 const gchar  *line_term,
-							 gint          length);
-
-G_CONST_RETURN gchar* g_io_channel_get_line_term        (GIOChannel   *channel,
-							 gint         *length);
-
-
-
-GIOStatus   g_io_channel_read_line_string (GIOChannel   *channel,
-					   GString      *buffer,
-					   gsize        *terminator_pos,
-					   GError      **error);
-GIOStatus   g_io_channel_read_to_end      (GIOChannel   *channel,
-					   gchar       **str_return,
-					   gsize        *length,
-					   GError      **error);
-GIOStatus   g_io_channel_read_unichar     (GIOChannel   *channel,
-					   gunichar     *thechar,
-					   GError      **error);
-GIOStatus   g_io_channel_write_unichar    (GIOChannel   *channel,
-					   gunichar      thechar,
-					   GError      **error);
-#endif // Not wrapped
-
-static PyMemberDef py_io_channel_members[] = {
-    { "softspace", T_INT, offsetof(PyGIOChannel, softspace), 0, NULL },
-    { NULL, 0, 0, 0, NULL }
-};
-
-static PyMethodDef py_io_channel_methods[] = {
-    { "close", (PyCFunction)py_io_channel_shutdown, METH_VARARGS|METH_KEYWORDS },
-    { "flush", (PyCFunction)py_io_channel_flush, METH_NOARGS },
-    { "set_encoding", (PyCFunction)py_io_channel_set_encoding, METH_VARARGS|METH_KEYWORDS },
-    { "get_encoding", (PyCFunction)py_io_channel_get_encoding, METH_NOARGS },
-    { "set_buffered", (PyCFunction)py_io_channel_set_buffered, METH_VARARGS|METH_KEYWORDS },
-    { "get_buffered", (PyCFunction)py_io_channel_get_buffered, METH_NOARGS },
-    { "set_buffer_size", (PyCFunction)py_io_channel_set_buffer_size, METH_VARARGS|METH_KEYWORDS },
-    { "get_buffer_size", (PyCFunction)py_io_channel_get_buffer_size, METH_NOARGS },
-    { "read", (PyCFunction)py_io_channel_read_chars, METH_VARARGS|METH_KEYWORDS },
-    { "readline", (PyCFunction)py_io_channel_read_line, METH_VARARGS|METH_KEYWORDS },
-    { "readlines", (PyCFunction)py_io_channel_read_lines, METH_VARARGS|METH_KEYWORDS },
-    { "write", (PyCFunction)py_io_channel_write_chars, METH_VARARGS|METH_KEYWORDS },
-    { "writelines", (PyCFunction)py_io_channel_write_lines, METH_VARARGS|METH_KEYWORDS },
-    { "set_flags", (PyCFunction)py_io_channel_set_flags, METH_VARARGS|METH_KEYWORDS },
-    { "get_flags", (PyCFunction)py_io_channel_get_flags, METH_NOARGS },
-    { "get_buffer_condition", (PyCFunction)py_io_channel_get_buffer_condition, METH_NOARGS },
-    { "set_close_on_unref", (PyCFunction)py_io_channel_set_close_on_unref, METH_VARARGS | METH_KEYWORDS },
-    { "get_close_on_unref", (PyCFunction)py_io_channel_get_close_on_unref, METH_NOARGS },
-    { "add_watch", (PyCFunction)py_io_channel_add_watch, METH_VARARGS|METH_KEYWORDS },
-    { "seek", (PyCFunction)py_io_channel_seek, METH_VARARGS|METH_KEYWORDS },
-#ifdef G_OS_WIN32
-    { "win32_make_pollfd", (PyCFunction)py_io_channel_win32_make_pollfd, METH_VARARGS | METH_KEYWORDS },
-    { "win32_poll", (PyCFunction)py_io_channel_win32_poll, METH_VARARGS|METH_KEYWORDS|METH_STATIC },
-#endif
-    { NULL, NULL, 0 }
-};
-
-
-static int
-py_io_channel_init(PyGIOChannel *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "filedes", "filename", "mode",
-#ifdef G_OS_WIN32
-                              "hwnd",
-#endif
-                              NULL };
-    int fd = -1;
-    char *mode = "r", *filename = NULL;
-    GError *error = NULL;
-#ifdef G_OS_WIN32
-    guint hwnd = 0;
-#endif
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|iss"
-#ifdef G_OS_WIN32
-                                     "I"
-#endif
-                                     ":gi._glib.IOChannel.__init__",
-                                     kwlist, &fd, &filename, &mode
-#ifdef G_OS_WIN32
-                                     , &hwnd
-#endif
-            ))
-        return -1;
-
-    if (fd != -1)
-        self->channel = g_io_channel_unix_new(fd);
-    else if (filename != NULL) {
-        self->channel = g_io_channel_new_file(filename, mode, &error);
-        if (pyglib_error_check(&error))
-            return -1;
-    }
-#ifdef G_OS_WIN32
-    else if (hwnd != 0) {
-        self->channel = g_io_channel_win32_new_messages(hwnd);
-    }
-#endif
-    else {
-#ifdef G_OS_WIN32
-        PyErr_SetString(PyExc_TypeError, "either a valid file descriptor, "
-                        "file name, or window handle must be supplied");
-#else
-        PyErr_SetString(PyExc_TypeError, "either a valid file descriptor "
-                        "or file name must be supplied");
-#endif
-        return -1;
-    }
-    return 0;
-}
-
-void
-pyglib_iochannel_register_types(PyObject *d)
-{
-    PyGIOChannel_Type.tp_init = (initproc)py_io_channel_init;
-    PyGIOChannel_Type.tp_dealloc = (destructor)py_io_channel_dealloc;
-    PyGIOChannel_Type.tp_flags = Py_TPFLAGS_DEFAULT;
-    PyGIOChannel_Type.tp_members = py_io_channel_members;
-    PyGIOChannel_Type.tp_methods = py_io_channel_methods;
-    PyGIOChannel_Type.tp_hash = (hashfunc)py_io_channel_hash;
-    PyGIOChannel_Type.tp_richcompare = (richcmpfunc)py_io_channel_richcompare;
-    PyGIOChannel_Type.tp_iter = (getiterfunc)py_io_channel_get_iter;
-    PyGIOChannel_Type.tp_iternext = (iternextfunc)py_io_channel_next;
-
-    PYGLIB_REGISTER_TYPE(d, PyGIOChannel_Type, "IOChannel");
-}
diff --git a/gi/_glib/pygiochannel.h b/gi/_glib/pygiochannel.h
deleted file mode 100644
index 9b03edd..0000000
--- a/gi/_glib/pygiochannel.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- * pyglib - Python bindings for GLib toolkit.
- * Copyright (C) 1998-2003  James Henstridge
- *               2004-2008  Johan Dahlin
- *
- * This library 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 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- */
-
-#ifndef __PYG_IOCHANNEL_H__
-#define __PYG_IOCHANNEL_H__
-
-extern PyTypeObject PyGIOChannel_Type;
-
-void pyglib_iochannel_register_types(PyObject *d);
-
-#endif /* __PYG_IOCHANNEL_H__ */
diff --git a/gi/_glib/pyglib.c b/gi/_glib/pyglib.c
index 3508f55..ef8a02e 100644
--- a/gi/_glib/pyglib.c
+++ b/gi/_glib/pyglib.c
@@ -27,7 +27,6 @@
 #include <pythread.h>
 #include "pyglib.h"
 #include "pyglib-private.h"
-#include "pygmaincontext.h"
 #include "pygoptioncontext.h"
 #include "pygoptiongroup.h"
 
@@ -411,20 +410,6 @@ pyglib_register_exception_for_domain(gchar *name,
 }
 
 /**
- * pyglib_main_context_new:
- * @context: a GMainContext.
- *
- * Creates a wrapper for a GMainContext.
- *
- * Returns: the GMainContext wrapper.
- */
-PyObject *
-pyglib_main_context_new(GMainContext *context)
-{
-    return _PyGLib_API->main_context_new(context);
-}
-
-/**
  * pyg_option_group_transfer_group:
  * @group: a GOptionGroup wrapper
  *
@@ -486,22 +471,6 @@ pyglib_option_context_new (GOptionContext *context)
     return _PyGLib_API->option_context_new(context);
 }
 
-/**
- * pyglib_option_context_new:
- * @context: a GTimeVal struct
- *
- * Converts a GTimeVal struct to a python float
- *
- * Returns: a float representing the timeval
- */
-PyObject *
-pyglib_float_from_timeval(GTimeVal timeval)
-{
-    double ret;
-    ret = (double)timeval.tv_sec + (double)timeval.tv_usec * 0.000001;
-    return PyFloat_FromDouble(ret);
-}
-
 
 /****** Private *****/
 
diff --git a/gi/_glib/pyglib.h b/gi/_glib/pyglib.h
index 261af7b..bc80d6d 100644
--- a/gi/_glib/pyglib.h
+++ b/gi/_glib/pyglib.h
@@ -42,7 +42,6 @@ gboolean pyglib_gerror_exception_check(GError **error);
 PyObject *pyglib_register_exception_for_domain(gchar *name,
 					       gint error_domain);
 gboolean pyglib_threads_enabled(void);
-PyObject * pyglib_main_context_new(GMainContext *context);
 void pyglib_set_thread_block_funcs(PyGLibThreadBlockFunc block_threads_func,
 				   PyGLibThreadBlockFunc unblock_threads_func);
 void pyglib_block_threads(void);
@@ -50,7 +49,6 @@ void pyglib_unblock_threads(void);
 PyObject * pyglib_option_context_new(GOptionContext *context);
 PyObject * pyglib_option_group_new(GOptionGroup *group);
 GOptionGroup * pyglib_option_group_transfer_group(PyObject *self);
-PyObject * pyglib_float_from_timeval(GTimeVal timeval);
 
 /* Private: for gobject <-> glib interaction only. */
 void _pyglib_notify_on_enabling_threads(PyGLibThreadsEnabledFunc callback);
diff --git a/gi/_glib/pygmaincontext.c b/gi/_glib/pygmaincontext.c
deleted file mode 100644
index a4282ee..0000000
--- a/gi/_glib/pygmaincontext.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- * pygtk- Python bindings for the GTK toolkit.
- * Copyright (C) 1998-2003  James Henstridge
- *
- *   pygmaincontext.c: GMainContext wrapper
- *
- * This library 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 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- */
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#include <Python.h>
-#include <pythread.h>
-#include <glib.h>
-#include "pygmaincontext.h"
-#include "pyglib.h"
-#include "pyglib-private.h"
-
-PYGLIB_DEFINE_TYPE("gi._glib.MainContext", PyGMainContext_Type, PyGMainContext)
-
-/**
- * pyg_main_context_new:
- * @context: a GMainContext.
- *
- * Creates a wrapper for a GMainContext.
- *
- * Returns: the GMainContext wrapper.
- */
-PyObject *
-pyg_main_context_new(GMainContext *context)
-{
-    PyGMainContext *self;
-
-    self = (PyGMainContext *)PyObject_NEW(PyGMainContext, &PyGMainContext_Type);
-    if (self == NULL)
-        return NULL;
-
-    self->context = g_main_context_ref(context);
-
-    return (PyObject *)self;
-}
-
-static int
-pyg_main_context_init(PyGMainContext *self)
-{
-    self->context = g_main_context_new();
-    return 0;
-}
-
-static void
-pyg_main_context_dealloc(PyGMainContext *self)
-{
-    if (self->context != NULL) {
-	g_main_context_unref(self->context);
-	self->context = NULL;
-    }
-
-    PyObject_Del(self);
-}
-
-static PyObject*
-pyg_main_context_richcompare(PyObject *self, PyObject *other, int op)
-{
-    if (Py_TYPE(self) == Py_TYPE(other) && Py_TYPE(self) == &PyGMainContext_Type)
-        return _pyglib_generic_ptr_richcompare(((PyGMainContext*)self)->context,
-                                               ((PyGMainContext*)other)->context,
-                                               op);
-    else {
-        Py_INCREF(Py_NotImplemented);
-        return Py_NotImplemented;
-    }
-}
-
-static PyObject *
-_wrap_g_main_context_iteration (PyGMainContext *self, PyObject *args)
-{
-    gboolean ret, may_block = TRUE;
-    
-    if (!PyArg_ParseTuple(args, "|i:GMainContext.iteration",
-			  &may_block))
-	return NULL;
-
-    pyglib_begin_allow_threads;
-    ret = g_main_context_iteration(self->context, may_block);
-    pyglib_end_allow_threads;
-    
-    return PyBool_FromLong(ret);
-}
-
-static PyObject *
-_wrap_g_main_context_pending (PyGMainContext *self)
-{
-    return PyBool_FromLong(g_main_context_pending(self->context));
-}
-
-static PyMethodDef _PyGMainContext_methods[] = {
-    { "iteration", (PyCFunction)_wrap_g_main_context_iteration, METH_VARARGS },
-    { "pending", (PyCFunction)_wrap_g_main_context_pending, METH_NOARGS },
-    { NULL, NULL, 0 }
-};
-
-void
-pyglib_maincontext_register_types(PyObject *d)
-{
-    PyGMainContext_Type.tp_dealloc = (destructor)pyg_main_context_dealloc;
-    PyGMainContext_Type.tp_richcompare = pyg_main_context_richcompare;
-    PyGMainContext_Type.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE;
-    PyGMainContext_Type.tp_methods = _PyGMainContext_methods;
-    PyGMainContext_Type.tp_init = (initproc)pyg_main_context_init;
-    PYGLIB_REGISTER_TYPE(d, PyGMainContext_Type, "MainContext"); 
-}
diff --git a/gi/_glib/pygmaincontext.h b/gi/_glib/pygmaincontext.h
deleted file mode 100644
index 4ffa3c9..0000000
--- a/gi/_glib/pygmaincontext.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- * pyglib - Python bindings for GLib toolkit.
- * Copyright (C) 1998-2003  James Henstridge
- *               2004-2008  Johan Dahlin
- *
- * This library 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 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- */
-
-#ifndef __PYG_MAINCONTEXT_H__
-#define __PYG_MAINCONTEXT_H__
-
-#include <Python.h>
-#include <glib.h>
-
-typedef struct {
-    PyObject_HEAD
-    GMainContext *context;
-} PyGMainContext;
-
-extern PyTypeObject PyGMainContext_Type;
-
-PyObject* pyg_main_context_new(GMainContext *context);
-
-void pyglib_maincontext_register_types(PyObject *d);
-
-#endif /* __PYG_MAINCONTEXT_H__ */
-
diff --git a/gi/_glib/pygmainloop.c b/gi/_glib/pygmainloop.c
deleted file mode 100644
index 5dabef6..0000000
--- a/gi/_glib/pygmainloop.c
+++ /dev/null
@@ -1,362 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- * pygtk- Python bindings for the GTK toolkit.
- * Copyright (C) 1998-2003  James Henstridge
- * Copyright (C) 2004       Johan Dahlin
- *
- *   pygmainloop.c: GMainLoop wrapper
- *
- * This library 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 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- */
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-#include <fcntl.h>
-
-#include <Python.h>
-#include <pythread.h>
-#include <glib.h>
-
-#include "pygmainloop.h"
-#include "pygmaincontext.h"
-#include "pyglib.h"
-#include "pyglib-private.h"
-
-static int pipe_fds[2];
-
-typedef struct {
-    GSource source;
-    GPollFD fd;
-} PySignalWatchSource;
-
-#ifdef DISABLE_THREADING
-static GMainLoop *pyg_current_main_loop = NULL;;
-
-static inline GMainLoop *
-pyg_save_current_main_loop (GMainLoop *main_loop)
-{
-    GMainLoop *retval = pyg_current_main_loop;
-
-    g_return_val_if_fail(main_loop != NULL, NULL);
-
-    pyg_current_main_loop = g_main_loop_ref(main_loop);
-
-    return retval;
-}
-
-static inline void
-pyg_restore_current_main_loop (GMainLoop *main_loop)
-{
-    if (pyg_current_main_loop != NULL)
-	g_main_loop_unref(pyg_current_main_loop);
-    pyg_current_main_loop = main_loop;
-}
-
-static inline GMainLoop *
-pyg_get_current_main_loop (void)
-{
-    return pyg_current_main_loop;
-}
-#else /* !defined(#ifndef DISABLE_THREADING) */
-
-static int pyg_current_main_loop_key = -1;
-
-static inline GMainLoop *
-pyg_save_current_main_loop (GMainLoop *main_loop)
-{
-    GMainLoop *retval;
-
-    g_return_val_if_fail(main_loop != NULL, NULL);
-
-    if (pyg_current_main_loop_key == -1)
-	pyg_current_main_loop_key = PyThread_create_key();
-
-    retval = PyThread_get_key_value(pyg_current_main_loop_key);
-    PyThread_delete_key_value(pyg_current_main_loop_key);
-    PyThread_set_key_value(pyg_current_main_loop_key, 
-			   g_main_loop_ref(main_loop));
-
-    return retval;
-}
-
-static inline void
-pyg_restore_current_main_loop (GMainLoop *main_loop)
-{
-    GMainLoop *prev;
-
-    g_return_if_fail (pyg_current_main_loop_key != -1);
-
-    prev = PyThread_get_key_value(pyg_current_main_loop_key);
-    if (prev != NULL)
-	g_main_loop_unref(prev);
-    PyThread_delete_key_value(pyg_current_main_loop_key);
-    if (main_loop != NULL)
-	PyThread_set_key_value(pyg_current_main_loop_key, main_loop);
-}
-
-static inline GMainLoop *
-pyg_get_current_main_loop (void)
-{
-    if (pyg_current_main_loop_key == -1)
-	return NULL;
-    return PyThread_get_key_value(pyg_current_main_loop_key);
-}
-#endif /* DISABLE_THREADING */
-
-static gboolean
-pyg_signal_watch_prepare(GSource *source,
-			 int     *timeout)
-{
-    /* Python only invokes signal handlers from the main thread,
-     * so if a thread other than the main thread receives the signal
-     * from the kernel, PyErr_CheckSignals() from that thread will
-     * do nothing.
-     */
-
-#ifdef HAVE_PYSIGNAL_SETWAKEUPFD
-    return FALSE;
-#else /* !HAVE_PYSIGNAL_SETWAKEUPFD */
-    /* On Windows g_poll() won't be interrupted by a signal
-     * (AFAIK), so we need the timeout there too, even if there's
-     * only one thread.
-     */
-#ifndef PLATFORM_WIN32
-    if (!pyglib_threads_enabled())
-	return FALSE;
-#endif /* PLATFORM_WIN32 */
-
-    /* If we're using 2.5 or an earlier version of python we
-     * will default to a timeout every second, be aware,
-     * this will cause unnecessary wakeups, see
-     * http://bugzilla.gnome.org/show_bug.cgi?id=481569
-     */
-    *timeout = 1000;
-    return FALSE;
-#endif /* HAVE_PYSIGNAL_SETWAKEUPFD */
-}
-
-static gboolean
-pyg_signal_watch_check(GSource *source)
-{
-    PyGILState_STATE state;
-    GMainLoop *main_loop;
-
-#ifdef HAVE_PYSIGNAL_SETWAKEUPFD
-    PySignalWatchSource *real_source = (PySignalWatchSource *)source;
-    GPollFD *poll_fd = &real_source->fd;
-    unsigned char dummy;
-    if (poll_fd->revents & G_IO_IN)
-        (void) read(poll_fd->fd, &dummy, 1);
-#endif
-
-    state = pyglib_gil_state_ensure();
-
-    main_loop = pyg_get_current_main_loop();
-
-    if (PyErr_CheckSignals() == -1 && main_loop != NULL) {
-	PyErr_SetNone(PyExc_KeyboardInterrupt);
-	g_main_loop_quit(main_loop);
-    }
-
-    pyglib_gil_state_release(state);
-
-    return FALSE;
-}
-
-static gboolean
-pyg_signal_watch_dispatch(GSource     *source,
-			  GSourceFunc  callback,
-			  gpointer     user_data)
-{
-    /* We should never be dispatched */
-    g_assert_not_reached();
-    return TRUE;
-}
-
-static GSourceFuncs pyg_signal_watch_funcs =
-{
-    pyg_signal_watch_prepare,
-    pyg_signal_watch_check,
-    pyg_signal_watch_dispatch
-};
-
-static GSource *
-pyg_signal_watch_new(void)
-{
-    GSource *source = g_source_new(&pyg_signal_watch_funcs,
-	sizeof(PySignalWatchSource));
-
-#ifdef HAVE_PYSIGNAL_SETWAKEUPFD
-    PySignalWatchSource *real_source = (PySignalWatchSource *)source;
-    int flag;
-
-    /* Unfortunately we need to create a new pipe here instead of
-     * reusing the pipe inside the GMainContext.
-     * Ideally an api should be added to GMainContext which allows us
-     * to reuse that pipe which would suit us perfectly fine.
-     * XXX More efficient than a pipe, we could use an eventfd on Linux
-     * kernels that support it.
-     */
-    gint already_piped = (pipe_fds[0] > 0);
-    if (!already_piped) {
-	if (pipe(pipe_fds) < 0)
-	    g_error("Cannot create main loop pipe: %s\n",
-	            g_strerror(errno));
-
-        /* Make both ends of the fd non blocking */
-        flag = fcntl(pipe_fds[0], F_GETFL, 0);
-        flag |= O_NONBLOCK;
-        fcntl(pipe_fds[0], F_SETFL, flag);
-        flag = fcntl(pipe_fds[1], F_GETFL, 0);
-        flag |= O_NONBLOCK;
-        fcntl(pipe_fds[1], F_SETFL, flag);
-    }
-
-    real_source->fd.fd = pipe_fds[0];
-    real_source->fd.events = G_IO_IN | G_IO_HUP | G_IO_ERR;
-    g_source_add_poll(source, &real_source->fd);
-
-    if (!already_piped)
-      PySignal_SetWakeupFd(pipe_fds[1]);
-#endif
-    return source;
-}
-
-PYGLIB_DEFINE_TYPE("gi._glib.MainLoop", PyGMainLoop_Type, PyGMainLoop)
-
-static int
-pyg_main_loop_init(PyGMainLoop *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "context", "is_running", NULL };
-    PyObject *py_context = Py_None;
-    int is_running = 0;
-    GMainContext *context;
-    
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-				     "|Ob:GMainLoop.__init__",
-				     kwlist, &py_context, &is_running))
-        return -1;
-
-    if (!PyObject_TypeCheck(py_context, &PyGMainContext_Type) &&
-	py_context != Py_None) {
-	PyErr_SetString(PyExc_TypeError,
-			"context must be a gi._glib.MainContext or None");
-	return -1;
-    }
-
-    if (py_context != Py_None) {
-	context = ((PyGMainContext*)py_context)->context;
-    } else {
-	context = NULL;
-    }
-
-    self->loop = g_main_loop_new(context, is_running);
-
-    self->signal_source = pyg_signal_watch_new();
-    g_source_attach(self->signal_source, context);
-    g_source_unref(self->signal_source);
-
-    return 0;
-}
-
-static void
-pyg_main_loop_dealloc(PyGMainLoop *self)
-{
-    if (self->signal_source != NULL) {
-	g_source_destroy(self->signal_source);
-	self->signal_source = NULL;
-    }
-
-    if (self->loop != NULL) {
-	g_main_loop_unref(self->loop);
-	self->loop = NULL;
-    }
-
-    PyObject_Del(self);
-}
-
-static PyObject*
-pyg_main_loop_richcompare(PyObject *self, PyObject *other, int op)
-{
-    if (Py_TYPE(self) == Py_TYPE(other) && Py_TYPE(self) == &PyGMainLoop_Type)
-        return _pyglib_generic_ptr_richcompare(((PyGMainLoop*)self)->loop,
-                                               ((PyGMainLoop*)other)->loop,
-                                               op);
-    else {
-       Py_INCREF(Py_NotImplemented);
-       return Py_NotImplemented;
-    }
-}
-
-static PyObject *
-_wrap_g_main_loop_get_context (PyGMainLoop *loop)
-{
-    return pyg_main_context_new(g_main_loop_get_context(loop->loop));
-}
-
-static PyObject *
-_wrap_g_main_loop_is_running (PyGMainLoop *self)
-{
-    return PyBool_FromLong(g_main_loop_is_running(self->loop));
-}
-
-static PyObject *
-_wrap_g_main_loop_quit (PyGMainLoop *self, PyObject *args, PyObject *kwargs)
-{
-    g_main_loop_quit(self->loop);
-    
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject *
-_wrap_g_main_loop_run (PyGMainLoop *self)
-{
-    GMainLoop *prev_loop;
-
-    prev_loop = pyg_save_current_main_loop(self->loop);
-
-    pyglib_begin_allow_threads;
-    g_main_loop_run(self->loop);
-    pyglib_end_allow_threads;
-
-    pyg_restore_current_main_loop(prev_loop);
-   
-    if (PyErr_Occurred())
-        return NULL;
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyMethodDef _PyGMainLoop_methods[] = {
-    { "get_context", (PyCFunction)_wrap_g_main_loop_get_context, METH_NOARGS },
-    { "is_running", (PyCFunction)_wrap_g_main_loop_is_running, METH_NOARGS },
-    { "quit", (PyCFunction)_wrap_g_main_loop_quit, METH_VARARGS|METH_KEYWORDS },
-    { "run", (PyCFunction)_wrap_g_main_loop_run, METH_NOARGS },
-    { NULL, NULL, 0 }
-};
-
-void
-pyglib_mainloop_register_types(PyObject *d)
-{
-    PyGMainLoop_Type.tp_dealloc = (destructor)pyg_main_loop_dealloc;
-    PyGMainLoop_Type.tp_richcompare = pyg_main_loop_richcompare;
-    PyGMainLoop_Type.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE;
-    PyGMainLoop_Type.tp_methods = _PyGMainLoop_methods;
-    PyGMainLoop_Type.tp_init = (initproc)pyg_main_loop_init;
-    PYGLIB_REGISTER_TYPE(d, PyGMainLoop_Type, "MainLoop"); 
-}
diff --git a/gi/_glib/pygmainloop.h b/gi/_glib/pygmainloop.h
deleted file mode 100644
index dec82d8..0000000
--- a/gi/_glib/pygmainloop.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- * pyglib - Python bindings for GLib toolkit.
- * Copyright (C) 1998-2003  James Henstridge
- *               2004-2008  Johan Dahlin
- *
- * This library 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 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- */
-
-#ifndef __PYG_MAINLOOP_H__
-#define __PYG_MAINLOOP_H__
-
-typedef struct {
-    PyObject_HEAD
-    GMainLoop *loop;
-    GSource *signal_source;
-} PyGMainLoop;
-
-extern PyTypeObject PyGMainLoop_Type;
-
-void pyglib_mainloop_register_types(PyObject *d);
-
-#endif /* __PYG_MAINLOOP_H__ */
-
diff --git a/gi/_glib/pygsource.c b/gi/_glib/pygsource.c
index d11f474..5a333c4 100644
--- a/gi/_glib/pygsource.c
+++ b/gi/_glib/pygsource.c
@@ -28,624 +28,11 @@
 #endif
 
 #include <Python.h>
-#include <pythread.h>
 #include <structmember.h> /* for PyMemberDef */
 #include "pyglib.h"
 #include "pyglib-private.h"
-#include "pygmaincontext.h"
 #include "pygsource.h"
 
-#define CHECK_DESTROYED(self, ret)			G_STMT_START {	\
-    if ((self)->source == NULL) {					\
-	PyErr_SetString(PyExc_RuntimeError, "source is destroyed");	\
-	return (ret);							\
-    }									\
-} G_STMT_END
-
-
-typedef struct {
-    PyObject_HEAD
-    GSource *source;
-    PyObject *inst_dict;
-    PyObject *weakreflist;
-    gboolean python_source;
-} PyGSource;
-
-typedef struct
-{
-    GSource source;
-    PyObject *obj;
-} PyGRealSource;
-
-/* glib.Source */
-
-PYGLIB_DEFINE_TYPE("gi._glib.Source", PyGSource_Type, PyGSource)
-
-static PyObject *
-source_repr(PyGSource *self, const char *type)
-{
-    gchar buf[256], *desc;
- 
-    if (self->source) {
-	if (g_source_get_context(self->source))
-	    desc = "attached";
-	else
-	    desc = "unattached";
-    } else {
-	desc = "destroyed";
-    }
-
-    if (type)
-	g_snprintf(buf, sizeof(buf), "<%s glib %s source at 0x%lx>",
-		   desc, type, (long) self);
-    else
-	g_snprintf(buf, sizeof(buf), "<%s glib source at 0x%lx>",
-		   desc, (long) self);
-
-    return PYGLIB_PyUnicode_FromString(buf);
-}
-
-static PyObject *
-pyg_source_attach(PyGSource *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "context", NULL };
-    PyGMainContext *py_context = NULL;
-    GMainContext *context = NULL;
-    guint id;
-
-    if (!PyArg_ParseTupleAndKeywords (args, kwargs,
-				      "|O!:attach", kwlist,
-				      &PyGMainContext_Type, &py_context))
-	return NULL;
-
-    if (py_context)
-	context = py_context->context;
-
-    CHECK_DESTROYED(self, NULL);
-
-    if (self->python_source) {
-	PyGRealSource *pysource = (PyGRealSource *)self->source;
-	Py_INCREF(pysource->obj);
-    }
-
-    id = g_source_attach(self->source, context);
-    return PYGLIB_PyLong_FromLong(id);
-}
-
-static PyObject *
-pyg_source_destroy(PyGSource *self)
-{
-    CHECK_DESTROYED(self, NULL);
-
-    if (self->python_source && self->source->context) {
-	PyGRealSource *pysource = (PyGRealSource *)self->source;
-	Py_DECREF(pysource->obj);
-    }
-
-    g_source_destroy(self->source);
-    self->source = NULL;
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject *
-pyg_source_is_destroyed(PyGSource *self)
-{
-    PyObject *result;
-
-    if (self->source == NULL || g_source_is_destroyed(self->source))
-        result = Py_True;
-    else
-        result = Py_False;
-
-    Py_INCREF(result);
-    return result;
-}
-
-static PyObject *
-pyg_source_set_callback(PyGSource *self, PyObject *args)
-{
-    PyObject *first, *callback, *cbargs = NULL, *data;
-    gint len;
-
-    CHECK_DESTROYED(self, NULL);
-
-    len = PyTuple_Size (args);
-    if (len < 1) {
-	PyErr_SetString(PyExc_TypeError,
-			"set_callback requires at least 1 argument");
-	return NULL;
-    }
-
-    first = PySequence_GetSlice(args, 0, 1);
-    if (!PyArg_ParseTuple(first, "O:set_callback", &callback)) {
-	Py_DECREF (first);
-	return NULL;
-    }
-    Py_DECREF(first);
-
-    if (!PyCallable_Check(callback)) {
-	PyErr_SetString(PyExc_TypeError, "first argument not callable");
-	return NULL;
-    }
-
-    cbargs = PySequence_GetSlice(args, 1, len);
-    if (cbargs == NULL)
-	return NULL;
-
-    data = Py_BuildValue("(ON)", callback, cbargs);
-    if (data == NULL)
-	return NULL;
-
-    g_source_set_callback(self->source,
-			  _pyglib_handler_marshal, data,
-			  _pyglib_destroy_notify);
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject *
-pyg_source_get_context(PyGSource *self)
-{
-    GMainContext *context;
-
-    CHECK_DESTROYED(self, NULL);
-
-    context = g_source_get_context(self->source);
-
-    if (context) {
-	return pyg_main_context_new(context);
-    } else {
-	Py_INCREF(Py_None);
-	return Py_None;
-    }
-}
-
-static PyObject *
-pyg_source_add_poll(PyGSource *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "fd", NULL };
-    PyGPollFD *fd;
-
-    if (!self->python_source) {
-	PyErr_SetString(PyExc_TypeError,
-			"add_poll can only be used with sources "
-			"implemented in python");
-	return NULL;
-    }
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-				     "O!:add_poll", kwlist,
-				     &PyGPollFD_Type, &fd))
-	return NULL;
-
-    CHECK_DESTROYED(self, NULL);
-
-    g_source_add_poll(self->source, &fd->pollfd);
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject *
-pyg_source_remove_poll(PyGSource *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "fd", NULL };
-    PyGPollFD *fd;
-
-    if (!self->python_source) {
-	PyErr_SetString(PyExc_TypeError,
-			"remove_poll can only be used with sources "
-			"implemented in python");
-	return NULL;
-    }
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-				     "O!:remove_poll", kwlist,
-				     &PyGPollFD_Type, &fd))
-	return NULL;
-
-    CHECK_DESTROYED(self, NULL);
-
-    g_source_remove_poll(self->source, &fd->pollfd);
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject *
-pyg_source_get_current_time(PyGSource *self)
-{
-    double   ret;
-
-    CHECK_DESTROYED(self, NULL);
-
-    ret = g_get_real_time() * 0.000001;
-    return PyFloat_FromDouble(ret);
-}
-
-static PyMethodDef pyg_source_methods[] = {
-    { "attach", (PyCFunction)pyg_source_attach, METH_VARARGS|METH_KEYWORDS },
-    { "destroy", (PyCFunction)pyg_source_destroy, METH_NOARGS },
-    { "is_destroyed", (PyCFunction)pyg_source_is_destroyed, METH_NOARGS },
-    { "set_callback", (PyCFunction)pyg_source_set_callback, METH_VARARGS },
-    { "get_context", (PyCFunction)pyg_source_get_context, METH_NOARGS },
-    { "add_poll", (PyCFunction)pyg_source_add_poll, METH_KEYWORDS },
-    { "remove_poll", (PyCFunction)pyg_source_remove_poll, METH_VARARGS|METH_KEYWORDS },
-    { "get_current_time", (PyCFunction)pyg_source_get_current_time, METH_NOARGS },
-    { NULL, NULL, 0 }
-};
-
-static PyObject *
-pyg_source_get_dict(PyGSource *self, void *closure)
-{
-    if (self->inst_dict == NULL) {
-	self->inst_dict = PyDict_New();
-	if (self->inst_dict == NULL)
-	    return NULL;
-    }
-
-    Py_INCREF(self->inst_dict);
-    return self->inst_dict;
-}
-
-static PyObject *
-pyg_source_get_priority(PyGSource *self, void *closure)
-{
-    CHECK_DESTROYED(self, NULL);
-
-    return PYGLIB_PyLong_FromLong(g_source_get_priority(self->source));
-}
-
-static int
-pyg_source_set_priority(PyGSource *self, PyObject *value, void *closure)
-{
-    CHECK_DESTROYED(self, -1);
-
-    if (value == NULL) {
-	PyErr_SetString(PyExc_TypeError, "cannot delete priority");
-	return -1;
-    }
-
-    if (!PYGLIB_PyLong_Check(value)) {
-	PyErr_SetString(PyExc_TypeError, "type mismatch");
-	return -1;
-    }
-
-    g_source_set_priority(self->source, PYGLIB_PyLong_AsLong(value));
-
-    return 0;
-}
-
-static PyObject *
-pyg_source_get_can_recurse(PyGSource *self, void *closure)
-{
-    CHECK_DESTROYED(self, NULL);
-
-    return PyBool_FromLong(g_source_get_can_recurse(self->source));
-}
-
-static int
-pyg_source_set_can_recurse(PyGSource *self, PyObject *value, void *closure)
-{
-    CHECK_DESTROYED(self, -1);
-
-    if (value == NULL) {
-	PyErr_SetString(PyExc_TypeError, "cannot delete can_recurse");
-	return -1;
-    }
-
-    g_source_set_can_recurse(self->source, PyObject_IsTrue(value));
-
-    return 0;
-}
-
-static PyObject *
-pyg_source_get_id(PyGSource *self, void *closure)
-{
-    CHECK_DESTROYED(self, NULL);
-
-    if (g_source_get_context(self->source) == NULL) {
-	PyErr_SetString(PyExc_RuntimeError, "source is not attached");
-	return NULL;
-    }
-
-    return PYGLIB_PyLong_FromLong(g_source_get_id(self->source));
-}
-
-static PyGetSetDef pyg_source_getsets[] = {
-    { "__dict__", (getter)pyg_source_get_dict,  (setter)0 },
-    {"priority", (getter)pyg_source_get_priority, (setter)pyg_source_set_priority },
-    {"can_recurse", (getter)pyg_source_get_can_recurse, (setter)pyg_source_set_can_recurse },
-    {"id", (getter)pyg_source_get_id, (setter)0 },
-    {NULL, 0, 0}
-};
-
-static PyObject *
-pyg_source_repr(PyGSource *self)
-{
-    return source_repr(self, NULL);
-}
-
-static int
-pyg_source_traverse(PyGSource *self, visitproc visit, void *arg)
-{
-    int ret = 0;
-
-    if (self->inst_dict) ret = visit(self->inst_dict, arg);
-    if (ret != 0) return ret;
-
-    return 0;
-}
-
-static int
-pyg_source_clear(PyGSource *self)
-{
-    PyObject *tmp;
-
-    tmp = self->inst_dict;
-    self->inst_dict = NULL;
-    Py_XDECREF(tmp);
-
-    if (self->source) {
-	g_source_unref(self->source);
-	self->source = NULL;
-    }
-
-    return 0;
-}
-
-static void
-pyg_source_dealloc(PyGSource *self)
-{
-    /* Must be done first, so that there is no chance of Python's GC being
-     * called while tracking this half-deallocated object */
-    PyObject_GC_UnTrack((PyObject *)self);
-
-    PyObject_ClearWeakRefs((PyObject *)self);
-
-    pyg_source_clear(self);
-
-    PyObject_GC_Del(self);
-}
-
-static gboolean
-pyg_source_prepare(GSource *source, gint *timeout)
-{
-    PyGRealSource *pysource = (PyGRealSource *)source;
-    PyObject *t;
-    gboolean ret = FALSE;
-    gboolean got_err = TRUE;
-    PyGILState_STATE state;
-
-    state = pyglib_gil_state_ensure();
-
-    t = PyObject_CallMethod(pysource->obj, "prepare", NULL);
-
-    if (t == NULL) {
-	goto bail;
-    } else if (!PyObject_IsTrue(t)) {
-	got_err = FALSE;
-	goto bail;
-    } else if (!PyTuple_Check(t)) {
-	PyErr_SetString(PyExc_TypeError,
-			"source prepare function must return a tuple or False");
-	goto bail;
-    } else if (PyTuple_Size(t) != 2) {
-	PyErr_SetString(PyExc_TypeError,
-			"source prepare function return tuple must be exactly "
-			"2 elements long");
-	goto bail;
-    }
-
-    ret = PyObject_IsTrue(PyTuple_GET_ITEM(t, 0));
-	*timeout = PYGLIB_PyLong_AsLong(PyTuple_GET_ITEM(t, 1));
-
-	if (*timeout == -1 && PyErr_Occurred()) {
-	    ret = FALSE;
-	    goto bail;
-	}
-
-    got_err = FALSE;
-
-bail:
-    if (got_err)
-	PyErr_Print();
-
-    Py_XDECREF(t);
-
-    pyglib_gil_state_release(state);
-
-    return ret;
-}
-
-static gboolean
-pyg_source_check(GSource *source)
-{
-    PyGRealSource *pysource = (PyGRealSource *)source;
-    PyObject *t;
-    gboolean ret;
-    PyGILState_STATE state;
-
-    state = pyglib_gil_state_ensure();
-
-    t = PyObject_CallMethod(pysource->obj, "check", NULL);
-
-    if (t == NULL) {
-	PyErr_Print();
-	ret = FALSE;
-    } else {
-	ret = PyObject_IsTrue(t);
-	Py_DECREF(t);
-    }
-
-    pyglib_gil_state_release(state);
-
-    return ret;
-}
-
-static gboolean
-pyg_source_dispatch(GSource *source, GSourceFunc callback, gpointer user_data)
-{
-    PyGRealSource *pysource = (PyGRealSource *)source;
-    PyObject *func, *args, *tuple, *t;
-    gboolean ret;
-    PyGILState_STATE state;
-
-    state = pyglib_gil_state_ensure();
-
-    if (callback) {
-	tuple = user_data;
-
-	func = PyTuple_GetItem(tuple, 0);
-        args = PyTuple_GetItem(tuple, 1);
-    } else {
-	func = Py_None;
-	args = Py_None;
-    }
-
-    t = PyObject_CallMethod(pysource->obj, "dispatch", "OO", func, args);
-
-    if (t == NULL) {
-	PyErr_Print();
-	ret = FALSE;
-    } else {
-	ret = PyObject_IsTrue(t);
-	Py_DECREF(t);
-    }
-
-    pyglib_gil_state_release(state);
-
-    return ret;
-}
-
-static void
-pyg_source_finalize(GSource *source)
-{
-    PyGRealSource *pysource = (PyGRealSource *)source;
-    PyObject *func, *t;
-    PyGILState_STATE state;
-
-    state = pyglib_gil_state_ensure();
-
-    func = PyObject_GetAttrString(pysource->obj, "finalize");
-    if (func) {
-	t = PyObject_CallObject(func, NULL);
-	Py_DECREF(func);
-
-	if (t == NULL) {
-	    PyErr_Print();
-	} else {
-	    Py_DECREF(t);
-	}
-    }
-
-    pyglib_gil_state_release(state);
-}
-
-static GSourceFuncs pyg_source_funcs =
-{
-    pyg_source_prepare,
-    pyg_source_check,
-    pyg_source_dispatch,
-    pyg_source_finalize
-};
-
-static int
-pyg_source_init(PyGSource *self, PyObject *args, PyObject *kwargs)
-{
-    PyGRealSource *pysource;
-
-    self->source = g_source_new(&pyg_source_funcs, sizeof(PyGRealSource));
-
-    pysource = (PyGRealSource *)self->source;
-    pysource->obj = (PyObject*)self;
-
-    self->inst_dict = NULL;
-    self->weakreflist = NULL;
-
-    self->python_source = TRUE;
-
-    return 0;
-}
-
-static void
-pyg_source_free(PyObject *op)
-{
-    PyObject_GC_Del(op);
-}
-
-/* glib.Idle */
-
-PYGLIB_DEFINE_TYPE("gi._glib.Idle", PyGIdle_Type, PyGSource)
-
-static PyObject *
-pyg_idle_repr(PyGSource *self)
-{
-    return source_repr(self, "idle");
-}
-
-static int
-pyg_idle_init(PyGSource *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "priority", NULL };
-    gint priority = G_PRIORITY_DEFAULT_IDLE;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-				     "|i:gi._glib.Idle.__init__", kwlist,
-				     &priority))
-	return -1;
-
-    self->source = g_idle_source_new ();
-
-    if (priority != G_PRIORITY_DEFAULT_IDLE)
-	g_source_set_priority(self->source, priority);
-
-    self->inst_dict = NULL;
-    self->weakreflist = NULL;
-
-    self->python_source = FALSE;
-
-    return 0;
-}
-
-/* glib.Timeout */
-
-PYGLIB_DEFINE_TYPE("gi._glib.Timeout", PyGTimeout_Type, PyGSource)
-
-static PyObject *
-pyg_timeout_repr(PyGSource *self)
-{
-    return source_repr(self, "timeout");
-}
-
-static int
-pyg_timeout_init(PyGSource *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "interval", "priority", NULL };
-    gint priority = G_PRIORITY_DEFAULT;
-    guint interval;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-				     "I|i:gi._glib.Timeout.__init__", kwlist,
-				     &interval, &priority))
-	return -1;
-
-    self->source = g_timeout_source_new(interval);
-
-    if (priority != G_PRIORITY_DEFAULT)
-	g_source_set_priority(self->source, priority);
-
-    self->inst_dict = NULL;
-    self->weakreflist = NULL;
-
-    self->python_source = FALSE;
-
-    return 0;
-}
-
 /* glib.PollFD */
 
 PYGLIB_DEFINE_TYPE("gi._glib.PollFD", PyGPollFD_Type, PyGPollFD)
@@ -702,33 +89,6 @@ pyg_poll_fd_init(PyGPollFD *self, PyObject *args, PyObject *kwargs)
 void
 pyglib_source_register_types(PyObject *d)
 {
-    PyGSource_Type.tp_flags = (Py_TPFLAGS_DEFAULT |
-			       Py_TPFLAGS_BASETYPE |
-			       Py_TPFLAGS_HAVE_GC);
-    PyGSource_Type.tp_init = (initproc)pyg_source_init;
-    PyGSource_Type.tp_free = (freefunc)pyg_source_free;
-    PyGSource_Type.tp_dealloc = (destructor)pyg_source_dealloc;
-    PyGSource_Type.tp_methods = pyg_source_methods;
-    PyGSource_Type.tp_repr = (reprfunc)pyg_source_repr;
-    PyGSource_Type.tp_traverse = (traverseproc)pyg_source_traverse;
-    PyGSource_Type.tp_clear = (inquiry)pyg_source_clear;
-    PyGSource_Type.tp_getset = pyg_source_getsets;
-    PyGSource_Type.tp_weaklistoffset = offsetof(PyGSource, weakreflist);
-    PyGSource_Type.tp_dictoffset = offsetof(PyGSource, inst_dict);
-    PYGLIB_REGISTER_TYPE(d, PyGSource_Type, "Source");
-
-    PyGIdle_Type.tp_repr = (reprfunc)pyg_idle_repr;
-    PyGIdle_Type.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE;
-    PyGIdle_Type.tp_base = (PyTypeObject *)&PyGSource_Type;
-    PyGIdle_Type.tp_init = (initproc)pyg_idle_init;
-    PYGLIB_REGISTER_TYPE(d, PyGIdle_Type, "Idle");
-
-    PyGTimeout_Type.tp_repr = (reprfunc)pyg_timeout_repr;
-    PyGTimeout_Type.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE;
-    PyGTimeout_Type.tp_base = (PyTypeObject *)&PyGSource_Type;
-    PyGTimeout_Type.tp_init = (initproc)pyg_timeout_init;
-    PYGLIB_REGISTER_TYPE(d, PyGTimeout_Type, "Timeout");
-
     PyGPollFD_Type.tp_dealloc = (destructor)pyg_poll_fd_dealloc;
     PyGPollFD_Type.tp_repr = (reprfunc)pyg_poll_fd_repr;
     PyGPollFD_Type.tp_flags = Py_TPFLAGS_DEFAULT;
diff --git a/gi/_glib/pygsource.h b/gi/_glib/pygsource.h
index bf2c673..dbae9ac 100644
--- a/gi/_glib/pygsource.h
+++ b/gi/_glib/pygsource.h
@@ -22,9 +22,6 @@
 #ifndef __PYG_SOURCE_H__
 #define __PYG_SOURCE_H__
 
-extern PyTypeObject PyGSource_Type;
-extern PyTypeObject PyGIdle_Type;
-extern PyTypeObject PyGTimeout_Type;
 extern PyTypeObject PyGPollFD_Type;
 
 typedef struct
diff --git a/gi/_gobject/Makefile.am b/gi/_gobject/Makefile.am
index 61762fc..d8613a9 100644
--- a/gi/_gobject/Makefile.am
+++ b/gi/_gobject/Makefile.am
@@ -84,4 +84,4 @@ check-local: $(pygobject_LTLIBRARIES:.la=.so) build_pylinks
 clean-local:
 	rm -f $(pygobject_LTLIBRARIES:.la=.so)
 .la.so:
-	$(LN_S) .libs/$@ $@ || true
+	$(LN_S) -f .libs/$@ $@
diff --git a/gi/_gobject/Makefile.in b/gi/_gobject/Makefile.in
index f66bd46..8a2353d 100644
--- a/gi/_gobject/Makefile.in
+++ b/gi/_gobject/Makefile.in
@@ -60,8 +60,10 @@ DIST_COMMON = $(pkginclude_HEADERS) $(pygobject_PYTHON) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \
-	$(top_srcdir)/m4/jhflags.m4 $(top_srcdir)/m4/python.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/jhflags.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -170,6 +172,9 @@ CAIRO_LIBS = @CAIRO_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -187,6 +192,7 @@ EXEEXT = @EXEEXT@
 FFI_CFLAGS = @FFI_CFLAGS@
 FFI_LIBS = @FFI_LIBS@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
 GI_CFLAGS = @GI_CFLAGS@
@@ -206,6 +212,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBFFI_PC = @LIBFFI_PC@
@@ -215,7 +222,6 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -381,7 +387,7 @@ all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .la .lo .o .obj .so
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -406,9 +412,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 install-pygobjectLTLIBRARIES: $(pygobject_LTLIBRARIES)
@@ -841,7 +847,7 @@ check-local: $(pygobject_LTLIBRARIES:.la=.so) build_pylinks
 clean-local:
 	rm -f $(pygobject_LTLIBRARIES:.la=.so)
 .la.so:
-	$(LN_S) .libs/$@ $@ || true
+	$(LN_S) -f .libs/$@ $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/gi/_gobject/__init__.py b/gi/_gobject/__init__.py
index f12d3fe..d3ea0e0 100644
--- a/gi/_gobject/__init__.py
+++ b/gi/_gobject/__init__.py
@@ -27,196 +27,14 @@ import sys
 if 'gobject' in sys.modules:
     raise ImportError('When using gi.repository you must not import static modules like "gobject". Please change all occurrences of "import gobject" to "from gi.repository import GObject".')
 
-from .. import _glib
 from . import _gobject
-from . import constants
 from . import propertyhelper
 from . import signalhelper
 
-GBoxed = _gobject.GBoxed
-GEnum = _gobject.GEnum
-GFlags = _gobject.GFlags
-GInterface = _gobject.GInterface
 GObject = _gobject.GObject
-GObjectWeakRef = _gobject.GObjectWeakRef
-GParamSpec = _gobject.GParamSpec
-GPointer = _gobject.GPointer
 GType = _gobject.GType
-PARAM_CONSTRUCT = _gobject.PARAM_CONSTRUCT
-PARAM_CONSTRUCT_ONLY = _gobject.PARAM_CONSTRUCT_ONLY
-PARAM_LAX_VALIDATION = _gobject.PARAM_LAX_VALIDATION
-PARAM_READABLE = _gobject.PARAM_READABLE
-PARAM_READWRITE = _gobject.PARAM_READWRITE
-PARAM_WRITABLE = _gobject.PARAM_WRITABLE
-SIGNAL_ACTION = _gobject.SIGNAL_ACTION
-SIGNAL_DETAILED = _gobject.SIGNAL_DETAILED
-SIGNAL_NO_HOOKS = _gobject.SIGNAL_NO_HOOKS
-SIGNAL_NO_RECURSE = _gobject.SIGNAL_NO_RECURSE
-SIGNAL_RUN_CLEANUP = _gobject.SIGNAL_RUN_CLEANUP
-SIGNAL_RUN_FIRST = _gobject.SIGNAL_RUN_FIRST
-SIGNAL_RUN_LAST = _gobject.SIGNAL_RUN_LAST
-TYPE_GSTRING = _gobject.TYPE_GSTRING
-TYPE_INVALID = _gobject.TYPE_INVALID
-Warning = _gobject.Warning
 _PyGObject_API = _gobject._PyGObject_API
-add_emission_hook = _gobject.add_emission_hook
-features = _gobject.features
-list_properties = _gobject.list_properties
-new = _gobject.new
 pygobject_version = _gobject.pygobject_version
-remove_emission_hook = _gobject.remove_emission_hook
-signal_accumulator_true_handled = _gobject.signal_accumulator_true_handled
-signal_list_ids = _gobject.signal_list_ids
-signal_list_names = _gobject.signal_list_names
-signal_lookup = _gobject.signal_lookup
-signal_name = _gobject.signal_name
-signal_new = _gobject.signal_new
-signal_query = _gobject.signal_query
-threads_init = _gobject.threads_init
-type_children = _gobject.type_children
-type_from_name = _gobject.type_from_name
-type_interfaces = _gobject.type_interfaces
-type_is_a = _gobject.type_is_a
-type_name = _gobject.type_name
-type_parent = _gobject.type_parent
-type_register = _gobject.type_register
-
-spawn_async = _glib.spawn_async
-idle_add = _glib.idle_add
-timeout_add = _glib.timeout_add
-timeout_add_seconds = _glib.timeout_add_seconds
-io_add_watch = _glib.io_add_watch
-source_remove = _glib.source_remove
-child_watch_add = _glib.child_watch_add
-markup_escape_text = _glib.markup_escape_text
-get_current_time = _glib.get_current_time
-filename_display_name = _glib.filename_display_name
-filename_display_basename = _glib.filename_display_basename
-filename_from_utf8 = _glib.filename_from_utf8
-get_application_name = _glib.get_application_name
-set_application_name = _glib.set_application_name
-get_prgname = _glib.get_prgname
-set_prgname = _glib.set_prgname
-main_depth = _glib.main_depth
-Pid = _glib.Pid
-GError = _glib.GError
-glib_version = _glib.glib_version
-MainLoop = _glib.MainLoop
-MainContext = _glib.MainContext
-main_context_default = _glib.main_context_default
-IOChannel = _glib.IOChannel
-Source = _glib.Source
-Idle = _glib.Idle
-Timeout = _glib.Timeout
-PollFD = _glib.PollFD
-OptionGroup = _glib.OptionGroup
-OptionContext = _glib.OptionContext
-uri_list_extract_uris = _glib.uri_list_extract_uris
-
-SPAWN_LEAVE_DESCRIPTORS_OPEN = _glib.SPAWN_LEAVE_DESCRIPTORS_OPEN
-SPAWN_DO_NOT_REAP_CHILD = _glib.SPAWN_DO_NOT_REAP_CHILD
-SPAWN_SEARCH_PATH = _glib.SPAWN_SEARCH_PATH
-SPAWN_STDOUT_TO_DEV_NULL = _glib.SPAWN_STDOUT_TO_DEV_NULL
-SPAWN_STDERR_TO_DEV_NULL = _glib.SPAWN_STDERR_TO_DEV_NULL
-SPAWN_CHILD_INHERITS_STDIN = _glib.SPAWN_CHILD_INHERITS_STDIN
-SPAWN_FILE_AND_ARGV_ZERO = _glib.SPAWN_FILE_AND_ARGV_ZERO
-PRIORITY_HIGH = _glib.PRIORITY_HIGH
-PRIORITY_DEFAULT = _glib.PRIORITY_DEFAULT
-PRIORITY_HIGH_IDLE = _glib.PRIORITY_HIGH_IDLE
-PRIORITY_DEFAULT_IDLE = _glib.PRIORITY_DEFAULT_IDLE
-PRIORITY_LOW = _glib.PRIORITY_LOW
-IO_IN = _glib.IO_IN
-IO_OUT = _glib.IO_OUT
-IO_PRI = _glib.IO_PRI
-IO_ERR = _glib.IO_ERR
-IO_HUP = _glib.IO_HUP
-IO_NVAL = _glib.IO_NVAL
-IO_STATUS_ERROR = _glib.IO_STATUS_ERROR
-IO_STATUS_NORMAL = _glib.IO_STATUS_NORMAL
-IO_STATUS_EOF = _glib.IO_STATUS_EOF
-IO_STATUS_AGAIN = _glib.IO_STATUS_AGAIN
-IO_FLAG_APPEND = _glib.IO_FLAG_APPEND
-IO_FLAG_NONBLOCK = _glib.IO_FLAG_NONBLOCK
-IO_FLAG_IS_READABLE = _glib.IO_FLAG_IS_READABLE
-IO_FLAG_IS_WRITEABLE = _glib.IO_FLAG_IS_WRITEABLE
-IO_FLAG_IS_SEEKABLE = _glib.IO_FLAG_IS_SEEKABLE
-IO_FLAG_MASK = _glib.IO_FLAG_MASK
-IO_FLAG_GET_MASK = _glib.IO_FLAG_GET_MASK
-IO_FLAG_SET_MASK = _glib.IO_FLAG_SET_MASK
-OPTION_FLAG_HIDDEN = _glib.OPTION_FLAG_HIDDEN
-OPTION_FLAG_IN_MAIN = _glib.OPTION_FLAG_IN_MAIN
-OPTION_FLAG_REVERSE = _glib.OPTION_FLAG_REVERSE
-OPTION_FLAG_NO_ARG = _glib.OPTION_FLAG_NO_ARG
-OPTION_FLAG_FILENAME = _glib.OPTION_FLAG_FILENAME
-OPTION_FLAG_OPTIONAL_ARG = _glib.OPTION_FLAG_OPTIONAL_ARG
-OPTION_FLAG_NOALIAS = _glib.OPTION_FLAG_NOALIAS
-OPTION_ERROR_UNKNOWN_OPTION = _glib.OPTION_ERROR_UNKNOWN_OPTION
-OPTION_ERROR_BAD_VALUE = _glib.OPTION_ERROR_BAD_VALUE
-OPTION_ERROR_FAILED = _glib.OPTION_ERROR_FAILED
-OPTION_REMAINING = _glib.OPTION_REMAINING
-OPTION_ERROR = _glib.OPTION_ERROR
-
-TYPE_NONE = constants.TYPE_NONE
-TYPE_INTERFACE = constants.TYPE_INTERFACE
-TYPE_CHAR = constants.TYPE_CHAR
-TYPE_UCHAR = constants.TYPE_UCHAR
-TYPE_BOOLEAN = constants.TYPE_BOOLEAN
-TYPE_INT = constants.TYPE_INT
-TYPE_UINT = constants.TYPE_UINT
-TYPE_LONG = constants.TYPE_LONG
-TYPE_ULONG = constants.TYPE_ULONG
-TYPE_INT64 = constants.TYPE_INT64
-TYPE_UINT64 = constants.TYPE_UINT64
-TYPE_ENUM = constants.TYPE_ENUM
-TYPE_FLAGS = constants.TYPE_FLAGS
-TYPE_FLOAT = constants.TYPE_FLOAT
-TYPE_DOUBLE = constants.TYPE_DOUBLE
-TYPE_STRING = constants.TYPE_STRING
-TYPE_POINTER = constants.TYPE_POINTER
-TYPE_BOXED = constants.TYPE_BOXED
-TYPE_PARAM = constants.TYPE_PARAM
-TYPE_OBJECT = constants.TYPE_OBJECT
-TYPE_PYOBJECT = constants.TYPE_PYOBJECT
-TYPE_GTYPE = constants.TYPE_GTYPE
-TYPE_UNICHAR = constants.TYPE_UNICHAR
-TYPE_STRV = constants.TYPE_STRV
-TYPE_VARIANT = constants.TYPE_VARIANT
-G_MINFLOAT = constants.G_MINFLOAT
-G_MAXFLOAT = constants.G_MAXFLOAT
-G_MINDOUBLE = constants.G_MINDOUBLE
-G_MAXDOUBLE = constants.G_MAXDOUBLE
-G_MINSHORT = constants.G_MINSHORT
-G_MAXSHORT = constants.G_MAXSHORT
-G_MAXUSHORT = constants.G_MAXUSHORT
-G_MININT = constants.G_MININT
-G_MAXINT = constants.G_MAXINT
-G_MAXUINT = constants.G_MAXUINT
-G_MINLONG = constants.G_MINLONG
-G_MAXLONG = constants.G_MAXLONG
-G_MAXULONG = constants.G_MAXULONG
-G_MININT8 = constants.G_MININT8
-G_MAXINT8 = constants.G_MAXINT8
-G_MAXUINT8 = constants.G_MAXUINT8
-G_MININT16 = constants.G_MININT16
-G_MAXINT16 = constants.G_MAXINT16
-G_MAXUINT16 = constants.G_MAXUINT16
-G_MININT32 = constants.G_MININT32
-G_MAXINT32 = constants.G_MAXINT32
-G_MAXUINT32 = constants.G_MAXUINT32
-G_MININT64 = constants.G_MININT64
-G_MAXINT64 = constants.G_MAXINT64
-G_MAXUINT64 = constants.G_MAXUINT64
-G_MAXSIZE = constants.G_MAXSIZE
-G_MAXSSIZE = constants.G_MAXSSIZE
-G_MINOFFSET = constants.G_MINOFFSET
-G_MAXOFFSET = constants.G_MAXOFFSET
-
-Property = propertyhelper.Property
-Signal = signalhelper.Signal
-SignalOverride = signalhelper.SignalOverride
-
-from .._glib import option
-sys.modules['gi._gobject.option'] = option
 
 
 class GObjectMeta(type):
@@ -237,9 +55,6 @@ class GObjectMeta(type):
         if cls.__module__.startswith('gi.overrides.'):
             return
 
-        type_register(cls, namespace.get('__gtype_name__'))
+        _gobject.type_register(cls, namespace.get('__gtype_name__'))
 
 _gobject._install_metaclass(GObjectMeta)
-
-# Deprecated naming still available for backwards compatibility.
-property = Property
diff --git a/gi/_gobject/constants.py b/gi/_gobject/constants.py
index 3f83a3a..9565a66 100644
--- a/gi/_gobject/constants.py
+++ b/gi/_gobject/constants.py
@@ -21,7 +21,7 @@
 
 from . import _gobject
 
-# TYPE_INVALID defined in gobjectmodule.c
+TYPE_INVALID = _gobject.TYPE_INVALID
 TYPE_NONE = _gobject.type_from_name('void')
 TYPE_INTERFACE = _gobject.type_from_name('GInterface')
 TYPE_CHAR = _gobject.type_from_name('gchar')
@@ -47,36 +47,3 @@ TYPE_GTYPE = _gobject.type_from_name('GType')
 TYPE_STRV = _gobject.type_from_name('GStrv')
 TYPE_VARIANT = _gobject.type_from_name('GVariant')
 TYPE_UNICHAR = TYPE_UINT
-
-# do a little dance to maintain API compatibility
-# as these were origianally defined here, and are
-# now defined in gobjectmodule.c
-G_MINFLOAT = _gobject.G_MINFLOAT
-G_MAXFLOAT = _gobject.G_MAXFLOAT
-G_MINDOUBLE = _gobject.G_MINDOUBLE
-G_MAXDOUBLE = _gobject.G_MAXDOUBLE
-G_MINSHORT = _gobject.G_MINSHORT
-G_MAXSHORT = _gobject.G_MAXSHORT
-G_MAXUSHORT = _gobject.G_MAXUSHORT
-G_MININT = _gobject.G_MININT
-G_MAXINT = _gobject.G_MAXINT
-G_MAXUINT = _gobject.G_MAXUINT
-G_MINLONG = _gobject.G_MINLONG
-G_MAXLONG = _gobject.G_MAXLONG
-G_MAXULONG = _gobject.G_MAXULONG
-G_MININT8 = _gobject.G_MININT8
-G_MAXINT8 = _gobject.G_MAXINT8
-G_MAXUINT8 = _gobject.G_MAXUINT8
-G_MININT16 = _gobject.G_MININT16
-G_MAXINT16 = _gobject.G_MAXINT16
-G_MAXUINT16 = _gobject.G_MAXUINT16
-G_MININT32 = _gobject.G_MININT32
-G_MAXINT32 = _gobject.G_MAXINT32
-G_MAXUINT32 = _gobject.G_MAXUINT32
-G_MININT64 = _gobject.G_MININT64
-G_MAXINT64 = _gobject.G_MAXINT64
-G_MAXUINT64 = _gobject.G_MAXUINT64
-G_MAXSIZE = _gobject.G_MAXSIZE
-G_MAXSSIZE = _gobject.G_MAXSSIZE
-G_MINOFFSET = _gobject.G_MINOFFSET
-G_MAXOFFSET = _gobject.G_MAXOFFSET
diff --git a/gi/_gobject/gobjectmodule.c b/gi/_gobject/gobjectmodule.c
index 2b976aa..479eb93 100644
--- a/gi/_gobject/gobjectmodule.c
+++ b/gi/_gobject/gobjectmodule.c
@@ -141,28 +141,6 @@ pyg_type_from_name (PyObject *self, PyObject *args)
 }
 
 static PyObject *
-pyg_type_parent (PyObject *self, PyObject *args)
-{
-    PyObject *gtype;
-    GType type, parent;
-#if 0
-    if (PyErr_Warn(PyExc_DeprecationWarning,
-		   "gobject.type_parent is deprecated; "
-		   "use GType.parent instead"))
-        return NULL;
-#endif
-    if (!PyArg_ParseTuple(args, "O:gobject.type_parent", &gtype))
-	return NULL;
-    if ((type = pyg_type_from_object(gtype)) == 0)
-	return NULL;
-    parent = g_type_parent(type);
-    if (parent != 0)
-	return pyg_type_wrapper_new(parent);
-    PyErr_SetString(PyExc_RuntimeError, "no parent for type");
-    return NULL;
-}
-
-static PyObject *
 pyg_type_is_a (PyObject *self, PyObject *args)
 {
     PyObject *gtype, *gparent;
@@ -182,68 +160,6 @@ pyg_type_is_a (PyObject *self, PyObject *args)
     return PyBool_FromLong(g_type_is_a(type, parent));
 }
 
-static PyObject *
-pyg_type_children (PyObject *self, PyObject *args)
-{
-    PyObject *gtype, *list;
-    GType type, *children;
-    guint n_children, i;
-#if 0
-    if (PyErr_Warn(PyExc_DeprecationWarning,
-		   "gobject.type_children is deprecated; "
-		   "use GType.children instead"))
-        return NULL;
-#endif
-    if (!PyArg_ParseTuple(args, "O:gobject.type_children", &gtype))
-	return NULL;
-    if ((type = pyg_type_from_object(gtype)) == 0)
-	return NULL;
-    children = g_type_children(type, &n_children);
-    if (children) {
-        list = PyList_New(0);
-	for (i = 0; i < n_children; i++) {
-	    PyObject *o;
-	    PyList_Append(list, o=pyg_type_wrapper_new(children[i]));
-	    Py_DECREF(o);
-	}
-	g_free(children);
-	return list;
-    }
-    PyErr_SetString(PyExc_RuntimeError, "invalid type, or no children");
-    return NULL;
-}
-
-static PyObject *
-pyg_type_interfaces (PyObject *self, PyObject *args)
-{
-    PyObject *gtype, *list;
-    GType type, *interfaces;
-    guint n_interfaces, i;
-#if 0
-    if (PyErr_Warn(PyExc_DeprecationWarning,
-		   "gobject.type_interfaces is deprecated; "
-		   "use GType.interfaces instead"))
-        return NULL;
-#endif
-    if (!PyArg_ParseTuple(args, "O:gobject.type_interfaces", &gtype))
-	return NULL;
-    if ((type = pyg_type_from_object(gtype)) == 0)
-	return NULL;
-    interfaces = g_type_interfaces(type, &n_interfaces);
-    if (interfaces) {
-        list = PyList_New(0);
-	for (i = 0; i < n_interfaces; i++) {
-	    PyObject *o;
-	    PyList_Append(list, o=pyg_type_wrapper_new(interfaces[i]));
-	    Py_DECREF(o);
-	}
-	g_free(interfaces);
-	return list;
-    }
-    PyErr_SetString(PyExc_RuntimeError, "invalid type, or no interfaces");
-    return NULL;
-}
-
 static void
 pyg_object_set_property (GObject *object, guint property_id,
 			 const GValue *value, GParamSpec *pspec)
@@ -309,13 +225,6 @@ pyg_object_get_property (GObject *object, guint property_id,
     pyglib_gil_state_release(state);
 }
 
-static void
-pyg_object_class_init(GObjectClass *class, PyObject *py_class)
-{
-    class->set_property = pyg_object_set_property;
-    class->get_property = pyg_object_get_property;
-}
-
 typedef struct _PyGSignalAccumulatorData {
     PyObject *callable;
     PyObject *user_data;
@@ -481,15 +390,14 @@ override_signal(GType instance_type, const gchar *signal_name)
 }
 
 static PyObject *
-add_signals (GType instance_type, PyObject *signals)
+add_signals (GObjectClass *klass, PyObject *signals)
 {
     gboolean ret = TRUE;
-    GObjectClass *oclass;
     Py_ssize_t pos = 0;
     PyObject *key, *value, *overridden_signals = NULL;
+    GType instance_type = G_OBJECT_CLASS_TYPE (klass);
 
     overridden_signals = PyDict_New();
-    oclass = g_type_class_ref(instance_type);
     while (PyDict_Next(signals, &pos, &key, &value)) {
 	const gchar *signal_name;
         gchar *signal_name_canon, *c;
@@ -527,7 +435,6 @@ add_signals (GType instance_type, PyObject *signals)
 	if (!ret)
 	    break;
     }
-    g_type_class_unref(oclass);
     if (ret)
         return overridden_signals;
     else {
@@ -732,6 +639,19 @@ create_property (const gchar  *prop_name,
 	    return NULL;
 	pspec = g_param_spec_object (prop_name, nick, blurb, prop_type, flags);
 	break;
+    case G_TYPE_VARIANT:
+	{
+	    PyObject *pydefault;
+            GVariant *default_value = NULL;
+
+	    if (!PyArg_ParseTuple(args, "O", &pydefault))
+		return NULL;
+            if (pydefault != Py_None)
+                default_value = pyg_boxed_get (pydefault, GVariant);
+            Py_DECREF(pydefault);
+	    pspec = g_param_spec_variant (prop_name, nick, blurb, G_VARIANT_TYPE_ANY, default_value, flags);
+	}
+	break;
     default:
 	/* unhandled pspec type ... */
 	break;
@@ -800,14 +720,12 @@ pyg_param_spec_from_object (PyObject *tuple)
 }
 
 static gboolean
-add_properties (GType instance_type, PyObject *properties)
+add_properties (GObjectClass *klass, PyObject *properties)
 {
     gboolean ret = TRUE;
-    GObjectClass *oclass;
     Py_ssize_t pos = 0;
     PyObject *key, *value;
 
-    oclass = g_type_class_ref(instance_type);
     while (PyDict_Next(properties, &pos, &key, &value)) {
 	const gchar *prop_name;
 	GType prop_type;
@@ -873,7 +791,7 @@ add_properties (GType instance_type, PyObject *properties)
 	Py_DECREF(slice);
 
 	if (pspec) {
-	    g_object_class_install_property(oclass, 1, pspec);
+	    g_object_class_install_property(klass, 1, pspec);
 	} else {
             PyObject *type, *value, *traceback;
 	    ret = FALSE;
@@ -883,7 +801,7 @@ add_properties (GType instance_type, PyObject *properties)
                 g_snprintf(msg, 256,
 			   "%s (while registering property '%s' for GType '%s')",
                PYGLIB_PyUnicode_AsString(value),
-			   prop_name, g_type_name(instance_type));
+			   prop_name, G_OBJECT_CLASS_NAME(klass));
                 Py_DECREF(value);
                 value = PYGLIB_PyUnicode_FromString(msg);
             }
@@ -892,11 +810,63 @@ add_properties (GType instance_type, PyObject *properties)
 	}
     }
 
-    g_type_class_unref(oclass);
     return ret;
 }
 
 static void
+pyg_object_class_init(GObjectClass *class, PyObject *py_class)
+{
+    PyObject *gproperties, *gsignals, *overridden_signals;
+    PyObject *class_dict = ((PyTypeObject*) py_class)->tp_dict;
+
+    class->set_property = pyg_object_set_property;
+    class->get_property = pyg_object_get_property;
+
+    /* install signals */
+    /* we look this up in the instance dictionary, so we don't
+     * accidentally get a parent type's __gsignals__ attribute. */
+    gsignals = PyDict_GetItemString(class_dict, "__gsignals__");
+    if (gsignals) {
+	if (!PyDict_Check(gsignals)) {
+	    PyErr_SetString(PyExc_TypeError,
+			    "__gsignals__ attribute not a dict!");
+	    return;
+	}
+	if (!(overridden_signals = add_signals(class, gsignals))) {
+	    return;
+	}
+        if (PyDict_SetItemString(class_dict, "__gsignals__",
+				 overridden_signals)) {
+            return;
+        }
+        Py_DECREF(overridden_signals);
+
+        PyDict_DelItemString(class_dict, "__gsignals__");
+    } else {
+	PyErr_Clear();
+    }
+
+    /* install properties */
+    /* we look this up in the instance dictionary, so we don't
+     * accidentally get a parent type's __gproperties__ attribute. */
+    gproperties = PyDict_GetItemString(class_dict, "__gproperties__");
+    if (gproperties) {
+	if (!PyDict_Check(gproperties)) {
+	    PyErr_SetString(PyExc_TypeError,
+			    "__gproperties__ attribute not a dict!");
+	    return;
+	}
+	if (!add_properties(class, gproperties)) {
+	    return;
+	}
+	PyDict_DelItemString(class_dict, "__gproperties__");
+	/* Borrowed reference. Py_DECREF(gproperties); */
+    } else {
+	PyErr_Clear();
+    }
+}
+
+static void
 pyg_register_class_init(GType gtype, PyGClassInitFunc class_init)
 {
     GSList *list;
@@ -1095,7 +1065,7 @@ pygobject__g_instance_init(GTypeInstance   *instance,
  */
 static void
 pyg_type_add_interfaces(PyTypeObject *class, GType instance_type,
-                        PyObject *bases, gboolean new_interfaces,
+                        PyObject *bases,
                         GType *parent_interfaces, guint n_parent_interfaces)
 {
     int i;
@@ -1106,10 +1076,8 @@ pyg_type_add_interfaces(PyTypeObject *class, GType instance_type,
     }
 
     for (i = 0; i < PyTuple_GET_SIZE(bases); ++i) {
-        guint k;
         PyObject *base = PyTuple_GET_ITEM(bases, i);
         GType itype;
-        gboolean is_new = TRUE;
         const GInterfaceInfo *iinfo;
         GInterfaceInfo iinfo_copy;
 
@@ -1126,16 +1094,6 @@ pyg_type_add_interfaces(PyTypeObject *class, GType instance_type,
         if (!G_TYPE_IS_INTERFACE(itype))
             continue;
 
-        for (k = 0; k < n_parent_interfaces; ++k) {
-            if (parent_interfaces[k] == itype) {
-                is_new = FALSE;
-                break;
-            }
-        }
-
-        if ((new_interfaces && !is_new) || (!new_interfaces && is_new))
-            continue;
-
         iinfo = pyg_lookup_interface_info(itype);
         if (!iinfo) {
             gchar *error;
@@ -1156,7 +1114,7 @@ pyg_type_add_interfaces(PyTypeObject *class, GType instance_type,
 int
 pyg_type_register(PyTypeObject *class, const char *type_name)
 {
-    PyObject *gtype, *gsignals, *gproperties, *overridden_signals;
+    PyObject *gtype;
     GType parent_type, instance_type;
     GType *parent_interfaces;
     guint n_parent_interfaces;
@@ -1234,88 +1192,22 @@ pyg_type_register(PyTypeObject *class, const char *type_name)
     }
 
     /*
-     * Note: Interfaces to be implemented are searched twice.  First
-     * we register interfaces that are already implemented by a parent
-     * type.  The second time, the remaining interfaces are
-     * registered, i.e. the ones that are not implemented by a parent
-     * type.  In between these two loops, properties and signals are
-     * registered.  It has to be done this way, in two steps,
-     * otherwise glib will complain.  If registering all interfaces
-     * always before properties, you get an error like:
-     *
-     *    ../gobject:121: Warning: Object class
-     *    test_interface+MyObject doesn't implement property
-     *    'some-property' from interface 'TestInterface'
-     *
-     * If, on the other hand, you register interfaces after
-     * registering the properties, you get something like:
-     *
-     *     ../gobject:121: Warning: cannot add interface type
-     *    `TestInterface' to type `test_interface+MyUnknown', since
-     *    type `test_interface+MyUnknown' already conforms to
-     *    interface
-     *
-     * This looks like a GLib quirk, but no bug has been filed
-     * upstream.  However we have a unit test for this particular
-     * problem, which can be found in test_interfaces.py, class
-     * TestInterfaceImpl.
+     * Note, all interfaces need to be registered before the first
+     * g_type_class_ref(), see bug #686149.
      *
      * See also comment above pyg_type_add_interfaces().
      */
-    pyg_type_add_interfaces(class, instance_type, class->tp_bases, FALSE,
+    pyg_type_add_interfaces(class, instance_type, class->tp_bases,
                             parent_interfaces, n_parent_interfaces);
 
-    /* we look this up in the instance dictionary, so we don't
-     * accidentally get a parent type's __gsignals__ attribute. */
-    gsignals = PyDict_GetItemString(class->tp_dict, "__gsignals__");
-    if (gsignals) {
-	if (!PyDict_Check(gsignals)) {
-	    PyErr_SetString(PyExc_TypeError,
-			    "__gsignals__ attribute not a dict!");
-            g_free(parent_interfaces);
-	    return -1;
-	}
-	if (!(overridden_signals = add_signals(instance_type, gsignals))) {
-            g_free(parent_interfaces);
-	    return -1;
-	}
-        if (PyDict_SetItemString(class->tp_dict, "__gsignals__",
-				 overridden_signals)) {
-            g_free(parent_interfaces);
-            return -1;
-        }
-        Py_DECREF(overridden_signals);
-    } else {
-	PyErr_Clear();
-    }
 
-    /* we look this up in the instance dictionary, so we don't
-     * accidentally get a parent type's __gsignals__ attribute. */
-    gproperties = PyDict_GetItemString(class->tp_dict, "__gproperties__");
-    if (gproperties) {
-	if (!PyDict_Check(gproperties)) {
-	    PyErr_SetString(PyExc_TypeError,
-			    "__gproperties__ attribute not a dict!");
-            g_free(parent_interfaces);
-	    return -1;
-	}
-	if (!add_properties(instance_type, gproperties)) {
-            g_free(parent_interfaces);
-	    return -1;
-	}
-	PyDict_DelItemString(class->tp_dict, "__gproperties__");
-	/* Borrowed reference. Py_DECREF(gproperties); */
-    } else {
-	PyErr_Clear();
+    gclass = g_type_class_ref(instance_type);
+    if (PyErr_Occurred() != NULL) {
+        g_type_class_unref(gclass);
+        g_free(parent_interfaces);
+        return -1;
     }
 
-    /* Register new interfaces, that are _not_ already defined by
-     * the parent type.  FIXME: See above.
-     */
-    pyg_type_add_interfaces(class, instance_type, class->tp_bases, TRUE,
-                            parent_interfaces, n_parent_interfaces);
-
-    gclass = g_type_class_ref(instance_type);
     if (pyg_run_class_init(instance_type, gclass, class)) {
         g_type_class_unref(gclass);
         g_free(parent_interfaces);
@@ -1324,9 +1216,8 @@ pyg_type_register(PyTypeObject *class, const char *type_name)
     g_type_class_unref(gclass);
     g_free(parent_interfaces);
 
-    if (gsignals)
-        PyDict_DelItemString(class->tp_dict, "__gsignals__");
-
+    if (PyErr_Occurred() != NULL)
+        return -1;
     return 0;
 }
 
@@ -1398,171 +1289,6 @@ pyg_signal_new(PyObject *self, PyObject *args)
 }
 
 static PyObject *
-pyg_signal_list_names (PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "type", NULL };
-    PyObject *py_itype, *list;
-    GObjectClass *class = NULL;
-    GType itype;
-    guint n;
-    guint *ids;
-    guint i;
-    gpointer iface = NULL;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-                                     "O:gobject.signal_list_names",
-                                     kwlist, &py_itype))
-	return NULL;
-    if ((itype = pyg_type_from_object(py_itype)) == 0)
-	return NULL;
-
-    if (G_TYPE_IS_INSTANTIATABLE(itype)) {
-	class = g_type_class_ref(itype);
-	if (!class) {
-	    PyErr_SetString(PyExc_RuntimeError,
-			    "could not get a reference to type class");
-	    return NULL;
-	}
-    } else if (!G_TYPE_IS_INTERFACE(itype)) {
-	PyErr_SetString(PyExc_TypeError,
-			"type must be instantiable or an interface");
-	return NULL;
-    } else {
-        iface = g_type_default_interface_ref(itype);
-    }
-
-    ids = g_signal_list_ids(itype, &n);
-
-    list = PyTuple_New((gint)n);
-    if (list != NULL) {
-	for (i = 0; i < n; i++)
-	    PyTuple_SetItem(list, i,
-	    		PYGLIB_PyUnicode_FromString(g_signal_name(ids[i])));
-    }
-
-    g_free(ids);
-    if (class)
-        g_type_class_unref(class);
-    else
-       g_type_default_interface_unref(iface);
-
-    return list;
-}
-
-static PyObject *
-pyg_signal_list_ids (PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "type", NULL };
-    PyObject *py_itype, *list;
-    GObjectClass *class = NULL;
-    GType itype;
-    guint n;
-    guint *ids;
-    guint i;
-    gpointer iface = NULL;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-                                     "O:gobject.signal_list_ids",
-                                     kwlist, &py_itype))
-	return NULL;
-    if ((itype = pyg_type_from_object(py_itype)) == 0)
-	return NULL;
-
-    if (G_TYPE_IS_INSTANTIATABLE(itype)) {
-	class = g_type_class_ref(itype);
-	if (!class) {
-	    PyErr_SetString(PyExc_RuntimeError,
-			    "could not get a reference to type class");
-	    return NULL;
-	}
-    } else if (!G_TYPE_IS_INTERFACE(itype)) {
-	PyErr_SetString(PyExc_TypeError,
-			"type must be instantiable or an interface");
-	return NULL;
-    } else {
-        iface = g_type_default_interface_ref(itype);
-    }
-
-    ids = g_signal_list_ids(itype, &n);
-
-    list = PyTuple_New((gint)n);
-    if (list == NULL) {
-	g_free(ids);
-	g_type_class_unref(class);
-	return NULL;
-    }
-
-    for (i = 0; i < n; i++)
-	PyTuple_SetItem(list, i, PYGLIB_PyLong_FromLong(ids[i]));
-    g_free(ids);
-    if (class)
-        g_type_class_unref(class);
-    else
-       g_type_default_interface_unref(iface);
-
-    return list;
-}
-
-static PyObject *
-pyg_signal_lookup (PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "name", "type", NULL };
-    PyObject *py_itype;
-    GObjectClass *class = NULL;
-    GType itype;
-    gchar *signal_name;
-    guint id;
-    gpointer iface = NULL;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sO:gobject.signal_lookup",
-                                     kwlist, &signal_name, &py_itype))
-	return NULL;
-    if ((itype = pyg_type_from_object(py_itype)) == 0)
-	return NULL;
-
-    if (G_TYPE_IS_INSTANTIATABLE(itype)) {
-	class = g_type_class_ref(itype);
-	if (!class) {
-	    PyErr_SetString(PyExc_RuntimeError,
-			    "could not get a reference to type class");
-	    return NULL;
-	}
-    } else if (!G_TYPE_IS_INTERFACE(itype)) {
-	PyErr_SetString(PyExc_TypeError,
-			"type must be instantiable or an interface");
-	return NULL;
-    } else {
-        iface = g_type_default_interface_ref(itype);
-    }
-
-    id = g_signal_lookup(signal_name, itype);
-
-    if (class)
-        g_type_class_unref(class);
-    else
-       g_type_default_interface_unref(iface);
-    return PYGLIB_PyLong_FromLong(id);
-}
-
-static PyObject *
-pyg_signal_name (PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "signal_id", NULL };
-    const gchar *signal_name;
-    guint id;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:gobject.signal_name",
-                                     kwlist, &id))
-	return NULL;
-    signal_name = g_signal_name(id);
-    if (signal_name)
-        return PYGLIB_PyUnicode_FromString(signal_name);
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject *
 pyg_signal_query (PyObject *self, PyObject *args, PyObject *kwargs)
 {
     static char *kwlist1[] = { "name", "type", NULL };
@@ -1987,20 +1713,9 @@ pyg__install_metaclass(PyObject *dummy, PyTypeObject *metaclass)
 static PyMethodDef _gobject_functions[] = {
     { "type_name", pyg_type_name, METH_VARARGS },
     { "type_from_name", pyg_type_from_name, METH_VARARGS },
-    { "type_parent", pyg_type_parent, METH_VARARGS },
     { "type_is_a", pyg_type_is_a, METH_VARARGS },
-    { "type_children", pyg_type_children, METH_VARARGS },
-    { "type_interfaces", pyg_type_interfaces, METH_VARARGS },
     { "type_register", _wrap_pyg_type_register, METH_VARARGS },
     { "signal_new", pyg_signal_new, METH_VARARGS },
-    { "signal_list_names",
-      (PyCFunction)pyg_signal_list_names, METH_VARARGS|METH_KEYWORDS },
-    { "signal_list_ids",
-      (PyCFunction)pyg_signal_list_ids, METH_VARARGS|METH_KEYWORDS },
-    { "signal_lookup",
-      (PyCFunction)pyg_signal_lookup, METH_VARARGS|METH_KEYWORDS },
-    { "signal_name",
-      (PyCFunction)pyg_signal_name, METH_VARARGS|METH_KEYWORDS },
     { "signal_query",
       (PyCFunction)pyg_signal_query, METH_VARARGS|METH_KEYWORDS },
     { "list_properties",
@@ -2431,44 +2146,17 @@ pygobject_register_constants(PyObject *m)
     PyModule_AddIntConstant(m,  "G_MAXUSHORT", G_MAXUSHORT);
     PyModule_AddIntConstant(m,  "G_MININT", G_MININT);
     PyModule_AddIntConstant(m,  "G_MAXINT", G_MAXINT);
+    PyModule_AddObject(m,       "G_MAXUINT", PyLong_FromUnsignedLong(G_MAXUINT));
     PyModule_AddObject(m,       "G_MINLONG", PyLong_FromLong(G_MINLONG));
     PyModule_AddObject(m,       "G_MAXLONG", PyLong_FromLong(G_MAXLONG));
     PyModule_AddObject(m,       "G_MAXULONG", PyLong_FromUnsignedLong(G_MAXULONG));
-    PyModule_AddIntConstant(m,  "G_MININT8", G_MININT8);
-    PyModule_AddIntConstant(m,  "G_MAXINT8", G_MAXINT8);
-    PyModule_AddIntConstant(m,  "G_MAXUINT8", G_MAXUINT8);
-    PyModule_AddIntConstant(m,  "G_MININT16", G_MININT16);
-    PyModule_AddIntConstant(m,  "G_MAXINT16", G_MAXINT16);
-    PyModule_AddIntConstant(m,  "G_MAXUINT16", G_MAXUINT16);
-    PyModule_AddIntConstant(m,  "G_MININT32", G_MININT32);
-    PyModule_AddIntConstant(m,  "G_MAXINT32", G_MAXINT32);
-    PyModule_AddObject(m,       "G_MININT64", PyLong_FromLongLong(G_MININT64));
-    PyModule_AddObject(m,       "G_MAXINT64", PyLong_FromLongLong(G_MAXINT64));
-    PyModule_AddObject(m,       "G_MAXUINT64", PyLong_FromUnsignedLongLong(G_MAXUINT64));
     PyModule_AddObject(m,       "G_MAXSIZE", PyLong_FromSize_t(G_MAXSIZE));
     PyModule_AddObject(m,       "G_MAXSSIZE", PyLong_FromSsize_t(G_MAXSSIZE));
+    PyModule_AddObject(m,       "G_MINSSIZE", PyLong_FromSsize_t(G_MINSSIZE));
     PyModule_AddObject(m,       "G_MINOFFSET", PyLong_FromLongLong(G_MINOFFSET));
     PyModule_AddObject(m,       "G_MAXOFFSET", PyLong_FromLongLong(G_MAXOFFSET));
 
-    /* in order for test_properties to pass, G_MAXUINT must be initialized using
-       PyLong_FromUnsignedLong, despite AFAICT it is unecessary for 32bit int types.
-       In the interests of consistancy I did the same for MAXUINT32 */
-    PyModule_AddObject(m,       "G_MAXUINT32", PyLong_FromUnsignedLong(G_MAXUINT32));
-    PyModule_AddObject(m,       "G_MAXUINT", PyLong_FromUnsignedLong(G_MAXUINT));
-
     PyModule_AddIntConstant(m, "SIGNAL_RUN_FIRST", G_SIGNAL_RUN_FIRST);
-    PyModule_AddIntConstant(m, "SIGNAL_RUN_LAST", G_SIGNAL_RUN_LAST);
-    PyModule_AddIntConstant(m, "SIGNAL_RUN_CLEANUP", G_SIGNAL_RUN_CLEANUP);
-    PyModule_AddIntConstant(m, "SIGNAL_NO_RECURSE", G_SIGNAL_NO_RECURSE);
-    PyModule_AddIntConstant(m, "SIGNAL_DETAILED", G_SIGNAL_DETAILED);
-    PyModule_AddIntConstant(m, "SIGNAL_ACTION", G_SIGNAL_ACTION);
-    PyModule_AddIntConstant(m, "SIGNAL_NO_HOOKS", G_SIGNAL_NO_HOOKS);
-
-    PyModule_AddIntConstant(m, "PARAM_READABLE", G_PARAM_READABLE);
-    PyModule_AddIntConstant(m, "PARAM_WRITABLE", G_PARAM_WRITABLE);
-    PyModule_AddIntConstant(m, "PARAM_CONSTRUCT", G_PARAM_CONSTRUCT);
-    PyModule_AddIntConstant(m, "PARAM_CONSTRUCT_ONLY", G_PARAM_CONSTRUCT_ONLY);
-    PyModule_AddIntConstant(m, "PARAM_LAX_VALIDATION", G_PARAM_LAX_VALIDATION);
     PyModule_AddIntConstant(m, "PARAM_READWRITE", G_PARAM_READWRITE);
 
     /* The rest of the types are set in __init__.py */
diff --git a/gi/_gobject/propertyhelper.py b/gi/_gobject/propertyhelper.py
index d6deb6d..a951ff3 100644
--- a/gi/_gobject/propertyhelper.py
+++ b/gi/_gobject/propertyhelper.py
@@ -29,8 +29,8 @@ from .constants import \
     TYPE_ULONG, TYPE_INT64, TYPE_UINT64, TYPE_ENUM, TYPE_FLAGS, \
     TYPE_FLOAT, TYPE_DOUBLE, TYPE_STRING, \
     TYPE_POINTER, TYPE_BOXED, TYPE_PARAM, TYPE_OBJECT, \
-    TYPE_PYOBJECT, TYPE_GTYPE, TYPE_STRV
-from .constants import \
+    TYPE_PYOBJECT, TYPE_GTYPE, TYPE_STRV, TYPE_VARIANT
+from ._gobject import \
     G_MAXFLOAT, G_MAXDOUBLE, \
     G_MININT, G_MAXINT, G_MAXUINT, G_MINLONG, G_MAXLONG, \
     G_MAXULONG
@@ -162,6 +162,10 @@ class Property(object):
         if not isinstance(blurb, _basestring):
             raise TypeError("blurb must be a string")
         self.blurb = blurb
+        # Always clobber __doc__ with blurb even if blurb is empty because
+        # we don't want the lengthy Property class documentation showing up
+        # on instances.
+        self.__doc__ = blurb
 
         if flags < 0 or flags > 32:
             raise TypeError("invalid flag value: %r" % (flags,))
@@ -234,10 +238,10 @@ class Property(object):
 
     def getter(self, fget):
         """Set the getter function to fget. For use as a decorator."""
-        if self.__doc__ is None:
-            self.__doc__ = fget.__doc__
-        if not self.blurb and fget.__doc__:
+        if fget.__doc__:
+            # Always clobber docstring and blurb with the getter docstring.
             self.blurb = fget.__doc__
+            self.__doc__ = fget.__doc__
         self.fget = fget
         return self
 
@@ -260,7 +264,7 @@ class Property(object):
                        TYPE_ULONG, TYPE_INT64, TYPE_UINT64,
                        TYPE_FLOAT, TYPE_DOUBLE, TYPE_POINTER,
                        TYPE_BOXED, TYPE_PARAM, TYPE_OBJECT, TYPE_STRING,
-                       TYPE_PYOBJECT, TYPE_GTYPE, TYPE_STRV):
+                       TYPE_PYOBJECT, TYPE_GTYPE, TYPE_STRV, TYPE_VARIANT):
             return type_
         else:
             raise TypeError("Unsupported type: %r" % (type_,))
@@ -298,6 +302,10 @@ class Property(object):
             for val in default:
                 if type(val) not in (str, bytes):
                     raise TypeError("Strv value %s must contain only strings" % str(default))
+        elif _gobject.type_is_a(ptype, TYPE_VARIANT) and default is not None:
+            if not hasattr(default, '__gtype__') or not _gobject.type_is_a(default, TYPE_VARIANT):
+                raise TypeError("variant value %s must be an instance of %r" %
+                                (default, ptype))
 
     def _get_minimum(self):
         return self._min_value_lookup.get(self.type, None)
@@ -333,7 +341,8 @@ class Property(object):
                      TYPE_INT64, TYPE_UINT64, TYPE_FLOAT, TYPE_DOUBLE):
             args = self.minimum, self.maximum, self.default
         elif (ptype == TYPE_STRING or ptype == TYPE_BOOLEAN or
-              ptype.is_a(TYPE_ENUM) or ptype.is_a(TYPE_FLAGS)):
+              ptype.is_a(TYPE_ENUM) or ptype.is_a(TYPE_FLAGS) or
+              ptype.is_a(TYPE_VARIANT)):
             args = (self.default,)
         elif ptype in (TYPE_PYOBJECT, TYPE_GTYPE):
             args = ()
diff --git a/gi/_gobject/pygobject.c b/gi/_gobject/pygobject.c
index 153a3c7..3d0c819 100644
--- a/gi/_gobject/pygobject.c
+++ b/gi/_gobject/pygobject.c
@@ -51,6 +51,25 @@ GQuark pygobject_wrapper_key;
 GQuark pygobject_has_updated_constructor_key;
 GQuark pygobject_instance_data_key;
 
+/* Copied from glib. gobject uses hyphens in property names, but in Python
+ * we can only represent hyphens as underscores. Convert underscores to
+ * hyphens for glib compatibility. */
+static void
+canonicalize_key (gchar *key)
+{
+    gchar *p;
+
+    for (p = key; *p != 0; p++)
+    {
+        gchar c = *p;
+
+        if (c != '-' &&
+            (c < '0' || c > '9') &&
+            (c < 'A' || c > 'Z') &&
+            (c < 'a' || c > 'z'))
+                *p = '-';
+    }
+}
 
 /* -------------- class <-> wrapper manipulation --------------- */
 
@@ -237,7 +256,7 @@ build_parameter_list(GObjectClass *class)
 static PyObject*
 PyGProps_getattro(PyGProps *self, PyObject *attr)
 {
-    char *attr_name;
+    char *attr_name, *property_name;
     GObjectClass *class;
     GParamSpec *pspec;
     GValue value = { 0, };
@@ -257,15 +276,13 @@ PyGProps_getattro(PyGProps *self, PyObject *attr)
 	return ret;
     }
 
-    if (self->pygobject != NULL) {
-        ret = pygi_get_property_value (self->pygobject, attr_name);
-        if (ret != NULL) {
-	    g_type_class_unref(class);
-            return ret;
-	}
-    }
-
-    pspec = g_object_class_find_property(class, attr_name);
+    /* g_object_class_find_property recurses through the class hierarchy,
+     * so the resulting pspec tells us the owner_type that owns the property
+     * we're dealing with. */
+    property_name = g_strdup(attr_name);
+    canonicalize_key(property_name);
+    pspec = g_object_class_find_property(class, property_name);
+    g_free(property_name);
     g_type_class_unref(class);
 
     if (!pspec) {
@@ -278,14 +295,23 @@ PyGProps_getattro(PyGProps *self, PyObject *attr)
 	return NULL;
     }
 
-    /* If we're doing it without an instance, return a GParamSpec */
     if (!self->pygobject) {
+        /* If we're doing it without an instance, return a GParamSpec */
         return pyg_param_spec_new(pspec);
     }
+
+    /* See if the property's class is from the gi repository. If so,
+     * use gi to correctly read the property value. */
+    ret = pygi_get_property_value (self->pygobject, pspec);
+    if (ret != NULL) {
+        return ret;
+    }
     
+    /* If we reach here, it must be a property defined outside of gi.
+     * Just do a straightforward read. */
     g_value_init(&value, G_PARAM_SPEC_VALUE_TYPE(pspec));
     pyg_begin_allow_threads;
-    g_object_get_property(self->pygobject->obj, attr_name, &value);
+    g_object_get_property(self->pygobject->obj, pspec->name, &value);
     pyg_end_allow_threads;
     ret = pyg_param_gvalue_as_pyobject(&value, TRUE, pspec);
     g_value_unset(&value);
@@ -295,7 +321,6 @@ PyGProps_getattro(PyGProps *self, PyObject *attr)
 
 static gboolean
 set_property_from_pspec(GObject *obj,
-			char *attr_name,
 			GParamSpec *pspec,
 			PyObject *pvalue)
 {
@@ -304,13 +329,13 @@ set_property_from_pspec(GObject *obj,
     if (pspec->flags & G_PARAM_CONSTRUCT_ONLY) {
 	PyErr_Format(PyExc_TypeError,
 		     "property '%s' can only be set in constructor",
-		     attr_name);
+		     pspec->name);
 	return FALSE;
     }	
 
     if (!(pspec->flags & G_PARAM_WRITABLE)) {
 	PyErr_Format(PyExc_TypeError,
-		     "property '%s' is not writable", attr_name);
+		     "property '%s' is not writable", pspec->name);
 	return FALSE;
     }	
 
@@ -322,7 +347,7 @@ set_property_from_pspec(GObject *obj,
     }
 
     pyg_begin_allow_threads;
-    g_object_set_property(obj, attr_name, &value);
+    g_object_set_property(obj, pspec->name, &value);
     pyg_end_allow_threads;
 
     g_value_unset(&value);
@@ -336,7 +361,7 @@ static int
 PyGProps_setattro(PyGProps *self, PyObject *attr, PyObject *pvalue)
 {
     GParamSpec *pspec;
-    char *attr_name;
+    char *attr_name, *property_name;
     GObject *obj;
     int ret = -1;
     
@@ -358,20 +383,33 @@ PyGProps_setattro(PyGProps *self, PyObject *attr, PyObject *pvalue)
         return -1;
     }
 
-    ret = pygi_set_property_value (self->pygobject, attr_name, pvalue);
+    obj = self->pygobject->obj;
+
+    property_name = g_strdup(attr_name);
+    canonicalize_key(property_name);
+
+    /* g_object_class_find_property recurses through the class hierarchy,
+     * so the resulting pspec tells us the owner_type that owns the property
+     * we're dealing with. */
+    pspec = g_object_class_find_property(G_OBJECT_GET_CLASS(obj),
+                                         property_name);
+    g_free(property_name);
+    if (!pspec) {
+	return PyObject_GenericSetAttr((PyObject *)self, attr, pvalue);
+    }
+
+    /* See if the property's class is from the gi repository. If so,
+     * use gi to correctly read the property value. */
+    ret = pygi_set_property_value (self->pygobject, pspec, pvalue);
     if (ret == 0)
         return 0;
     else if (ret == -1)
         if (PyErr_Occurred())
             return -1;
 
-    obj = self->pygobject->obj;
-    pspec = g_object_class_find_property(G_OBJECT_GET_CLASS(obj), attr_name);
-    if (!pspec) {
-	return PyObject_GenericSetAttr((PyObject *)self, attr, pvalue);
-    }
-
-    if (!set_property_from_pspec(obj, attr_name, pspec, pvalue))
+    /* If we reach here, it must be a property defined outside of gi.
+     * Just do a straightforward set. */
+    if (!set_property_from_pspec(obj, pspec, pvalue))
 	return -1;
 				  
     return 0;
@@ -1017,115 +1055,6 @@ pygobject_watch_closure(PyObject *self, GClosure *closure)
 }
 
 
-/* -------------- Freeze Notify Context Manager ----------------- */
-
-/**
- * pygcontext_manager_enter
- * @self: Freeze or Block context instance
- *
- * Method used for __enter__ on both GContextFeezeNotify and
- * GContextHandlerBlock. Does nothing since this is an object returned
- * by the freeze_notify() and handler_block() methods which do the actual
- * work of freezing and blocking.
- */
-static PyObject *
-pygcontext_manager_enter(PyObject *self)
-{
-	Py_INCREF(self);
-	return self;
-}
-
-typedef struct {
-    PyObject_HEAD
-    GObject *obj;
-} PyGContextFreezeNotify;
-
-PYGLIB_DEFINE_TYPE("gi._gobject.GContextFreezeNotify",
-		PyGContextFreezeNotify_Type, PyGContextFreezeNotify);
-
-static PyObject *
-pygcontext_freeze_notify_new(GObject *gobj)
-{
-	PyGContextFreezeNotify *context;
-
-	context = PyObject_New(PyGContextFreezeNotify, &PyGContextFreezeNotify_Type);
-	if (context == NULL)
-		return NULL;
-
-	g_object_ref(gobj);
-	context->obj = gobj;
-	return (PyObject*)context;
-}
-
-static void
-pygcontext_freeze_notify_dealloc(PyGContextFreezeNotify* self)
-{
-    g_object_unref(self->obj);
-    self->obj = NULL;
-    PyObject_Del((PyObject*)self);
-}
-
-static PyObject *
-pygcontext_freeze_notify_exit(PyGContextFreezeNotify *self, PyObject *args)
-{
-	g_object_thaw_notify(self->obj);
-	Py_RETURN_NONE;
-}
-
-static PyMethodDef pygcontext_freeze_notify_methods[] = {
-	{"__enter__", (PyCFunction)pygcontext_manager_enter, METH_NOARGS, ""},
-	{"__exit__", (PyCFunction)pygcontext_freeze_notify_exit, METH_VARARGS, ""},
-    {NULL}
-};
-
-/* -------------- Handler Block Context Manager ----------------- */
-typedef struct {
-    PyObject_HEAD
-    GObject *obj;
-    gulong handler_id;
-} PyGContextHandlerBlock;
-
-PYGLIB_DEFINE_TYPE("gi._gobject.GContextHandlerBlock",
-		PyGContextHandlerBlock_Type, PyGContextHandlerBlock);
-
-static PyObject *
-pygcontext_handler_block_new(GObject *gobj, gulong handler_id)
-{
-	PyGContextHandlerBlock *context;
-
-	context = PyObject_New(PyGContextHandlerBlock, &PyGContextHandlerBlock_Type);
-	if (context == NULL)
-		return NULL;
-
-	g_object_ref(gobj);
-	context->obj = gobj;
-	context->handler_id = handler_id;
-	return (PyObject*)context;
-}
-
-static void
-pygcontext_handler_block_dealloc(PyGContextHandlerBlock* self)
-{
-    g_object_unref(self->obj);
-    self->obj = NULL;
-    PyObject_Del((PyObject*)self);
-}
-
-static PyObject *
-pygcontext_handler_block_exit(PyGContextHandlerBlock *self, PyObject *args)
-{
-	g_signal_handler_unblock(self->obj, self->handler_id);
-	Py_RETURN_NONE;
-}
-
-
-static PyMethodDef pygcontext_handler_block_methods[] = {
-	{"__enter__", (PyCFunction)pygcontext_manager_enter, METH_NOARGS, ""},
-	{"__exit__", (PyCFunction)pygcontext_handler_block_exit, METH_VARARGS, ""},
-    {NULL}
-};
-
-
 /* -------------- PyGObject behaviour ----------------- */
 
 PYGLIB_DEFINE_TYPE("gi._gobject.GObject", PyGObject_Type, PyGObject);
@@ -1458,7 +1387,7 @@ pygobject_set_property(PyGObject *self, PyObject *args)
 	return NULL;
     }
     
-    if (!set_property_from_pspec(self->obj, param_name, pspec, pvalue))
+    if (!set_property_from_pspec(self->obj, pspec, pvalue))
 	return NULL;
     
     Py_INCREF(Py_None);
@@ -1496,7 +1425,7 @@ pygobject_set_properties(PyGObject *self, PyObject *args, PyObject *kwargs)
 	    goto exit;
 	}
 
-	if (!set_property_from_pspec(G_OBJECT(self->obj), key_str, pspec, value))
+	if (!set_property_from_pspec(G_OBJECT(self->obj), pspec, value))
 	    goto exit;
     }
 
@@ -1667,88 +1596,6 @@ pygobject_bind_property(PyGObject *self, PyObject *args)
 }
 
 static PyObject *
-pygobject_freeze_notify(PyGObject *self, PyObject *args)
-{
-    if (!PyArg_ParseTuple(args, ":GObject.freeze_notify"))
-	return NULL;
-
-    CHECK_GOBJECT(self);
-
-    g_object_freeze_notify(self->obj);
-    return pygcontext_freeze_notify_new(self->obj);
-}
-
-static PyObject *
-pygobject_notify(PyGObject *self, PyObject *args)
-{
-    char *property_name;
-
-    if (!PyArg_ParseTuple(args, "s:GObject.notify", &property_name))
-	return NULL;
-
-    CHECK_GOBJECT(self);
-
-    g_object_notify(self->obj, property_name);
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject *
-pygobject_thaw_notify(PyGObject *self, PyObject *args)
-{
-    if (!PyArg_ParseTuple(args, ":GObject.thaw_notify"))
-	return NULL;
-    
-    CHECK_GOBJECT(self);
-    
-    g_object_thaw_notify(self->obj);
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject *
-pygobject_get_data(PyGObject *self, PyObject *args)
-{
-    char *key;
-    GQuark quark;
-    PyObject *data;
-
-    g_warning("GObject.get_data() and set_data() are deprecated. Use normal Python attributes instead");
-
-    if (!PyArg_ParseTuple(args, "s:GObject.get_data", &key))
-	return NULL;
-    
-    CHECK_GOBJECT(self);
-    
-    quark = g_quark_from_string(key);
-    data = g_object_get_qdata(self->obj, quark);
-    if (!data) data = Py_None;
-    Py_INCREF(data);
-    return data;
-}
-
-static PyObject *
-pygobject_set_data(PyGObject *self, PyObject *args)
-{
-    char *key;
-    GQuark quark;
-    PyObject *data;
-
-    g_warning("GObject.get_data() and set_data() are deprecated. Use normal Python attributes instead");
-
-    if (!PyArg_ParseTuple(args, "sO:GObject.set_data", &key, &data))
-	return NULL;
-    
-    CHECK_GOBJECT(self);
-    
-    quark = g_quark_from_string(key);
-    Py_INCREF(data);
-    g_object_set_qdata_full(self->obj, quark, data, pyg_destroy_notify);
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject *
 pygobject_connect(PyGObject *self, PyObject *args)
 {
     PyObject *first, *callback, *extra_args, *repr = NULL;
@@ -2002,11 +1849,12 @@ pygobject_handler_block(PyGObject *self, PyObject *args)
 
     if (!PyArg_ParseTuple(args, "k:GObject.handler_block", &handler_id))
 	return NULL;
-    
+
     CHECK_GOBJECT(self);
-    
+
     g_signal_handler_block(self->obj, handler_id);
-    return pygcontext_handler_block_new(self->obj, handler_id);
+    Py_INCREF(Py_None);
+    return Py_None;
 }
 
 static PyObject *
@@ -2367,11 +2215,6 @@ static PyMethodDef pygobject_methods[] = {
     { "set_property", (PyCFunction)pygobject_set_property, METH_VARARGS },
     { "set_properties", (PyCFunction)pygobject_set_properties, METH_VARARGS|METH_KEYWORDS },
     { "bind_property", (PyCFunction)pygobject_bind_property, METH_VARARGS|METH_KEYWORDS },
-    { "freeze_notify", (PyCFunction)pygobject_freeze_notify, METH_VARARGS },
-    { "notify", (PyCFunction)pygobject_notify, METH_VARARGS },
-    { "thaw_notify", (PyCFunction)pygobject_thaw_notify, METH_VARARGS },
-    { "get_data", (PyCFunction)pygobject_get_data, METH_VARARGS },
-    { "set_data", (PyCFunction)pygobject_set_data, METH_VARARGS },
     { "connect", (PyCFunction)pygobject_connect, METH_VARARGS },
     { "connect_after", (PyCFunction)pygobject_connect_after, METH_VARARGS },
     { "connect_object", (PyCFunction)pygobject_connect_object, METH_VARARGS },
@@ -2728,18 +2571,4 @@ pygobject_object_register_types(PyObject *d)
     if (PyType_Ready(&PyGBindingWeakRef_Type) < 0)
         return;
     PyDict_SetItemString(d, "GBindingWeakRef", (PyObject *) &PyGBindingWeakRef_Type);
-
-    PyGContextFreezeNotify_Type.tp_dealloc = (destructor)pygcontext_freeze_notify_dealloc;
-    PyGContextFreezeNotify_Type.tp_flags = Py_TPFLAGS_DEFAULT;
-    PyGContextFreezeNotify_Type.tp_doc = "Context manager for freeze/thaw of GObjects";
-    PyGContextFreezeNotify_Type.tp_methods = pygcontext_freeze_notify_methods;
-    if (PyType_Ready(&PyGContextFreezeNotify_Type) < 0)
-        return;
-
-    PyGContextHandlerBlock_Type.tp_dealloc = (destructor)pygcontext_handler_block_dealloc;
-    PyGContextHandlerBlock_Type.tp_flags = Py_TPFLAGS_DEFAULT;
-    PyGContextHandlerBlock_Type.tp_doc = "Context manager for handler blocking of GObjects";
-    PyGContextHandlerBlock_Type.tp_methods = pygcontext_handler_block_methods;
-    if (PyType_Ready(&PyGContextHandlerBlock_Type) < 0)
-        return;
 }
diff --git a/gi/_gobject/pygtype.c b/gi/_gobject/pygtype.c
index fe2c3b6..adc8c12 100644
--- a/gi/_gobject/pygtype.c
+++ b/gi/_gobject/pygtype.c
@@ -727,26 +727,6 @@ pyg_value_array_from_pyobject(GValue *value,
     return 0;
 }
 
-static
-PyObject *
-pyg_get_gvariant_type()
-{
-    static PyObject *variant_type = NULL;
-    PyObject *py_module;
-
-    if (variant_type == NULL) {
-	py_module = PyImport_ImportModule ("gi.repository.GLib");
-	if (py_module == NULL)
-	    return NULL;
-
-	variant_type = PyObject_GetAttrString (py_module, "Variant");
-
-	Py_DECREF (py_module);
-    }
-
-    return variant_type;
-}
-
 /**
  * pyg_value_from_pyobject:
  * @value: the GValue object to store the converted value in.
@@ -1013,10 +993,9 @@ pyg_value_from_pyobject(GValue *value, PyObject *obj)
 	break;
     case G_TYPE_VARIANT:
         {
-            PyObject* variant_type = pyg_get_gvariant_type();
             if (obj == Py_None)
                 g_value_set_variant(value, NULL);
-            else if (variant_type != NULL && PyObject_IsInstance(obj, variant_type))
+            else if (pyg_type_from_object_strict(obj, FALSE) == G_TYPE_VARIANT)
                 g_value_set_variant(value, pyg_boxed_get(obj, GVariant));
             else
                 return -1;
diff --git a/gi/gimodule.c b/gi/gimodule.c
index 6ccd87f..76530f1 100644
--- a/gi/gimodule.c
+++ b/gi/gimodule.c
@@ -23,6 +23,7 @@
 
 #include "pygi-private.h"
 #include "pygi.h"
+#include "pyglib.h"
 
 #include <pygobject.h>
 #include <pyglib-python-compat.h>
@@ -455,6 +456,83 @@ _wrap_pyg_variant_type_from_string (PyObject *self, PyObject *args)
     return py_variant;
 }
 
+static PyObject *
+_wrap_pyg_source_new (PyObject *self, PyObject *args)
+{
+    return pyg_source_new ();
+}
+
+#define CHUNK_SIZE 8192
+
+static PyObject*
+pyg_channel_read(PyObject* self, PyObject *args, PyObject *kwargs)
+{
+    int max_count = -1;
+    PyObject *py_iochannel, *ret_obj = NULL;
+    gsize total_read = 0;
+    GError* error = NULL;
+    GIOStatus status = G_IO_STATUS_NORMAL;
+
+    if (!PyArg_ParseTuple (args, "Oi:pyg_channel_read", &py_iochannel, &max_count)) {
+        return NULL;
+    }
+    if (!pyg_boxed_check (py_iochannel, G_TYPE_IO_CHANNEL)) {
+        PyErr_SetString(PyExc_TypeError, "first argument is not a GLib.IOChannel");
+        return NULL;
+    }
+	
+    if (max_count == 0)
+        return PYGLIB_PyBytes_FromString("");
+    
+    while (status == G_IO_STATUS_NORMAL
+	   && (max_count == -1 || total_read < max_count)) {
+	gsize single_read;
+	char* buf;
+	gsize buf_size;
+	
+	if (max_count == -1) 
+	    buf_size = CHUNK_SIZE;
+	else {
+	    buf_size = max_count - total_read;
+	    if (buf_size > CHUNK_SIZE)
+		buf_size = CHUNK_SIZE;
+        }
+	
+	if ( ret_obj == NULL ) {
+	    ret_obj = PYGLIB_PyBytes_FromStringAndSize((char *)NULL, buf_size);
+	    if (ret_obj == NULL)
+		goto failure;
+	}
+	else if (buf_size + total_read > PYGLIB_PyBytes_Size(ret_obj)) {
+	    if (PYGLIB_PyBytes_Resize(&ret_obj, buf_size + total_read) == -1)
+		goto failure;
+	}
+       
+        buf = PYGLIB_PyBytes_AsString(ret_obj) + total_read;
+
+        pyglib_unblock_threads();
+        status = g_io_channel_read_chars(pyg_boxed_get (py_iochannel, GIOChannel),
+                                         buf, buf_size, &single_read, &error);
+        pyglib_block_threads();
+	if (pyglib_error_check(&error))
+	    goto failure;
+	
+	total_read += single_read;
+    }
+	
+    if ( total_read != PYGLIB_PyBytes_Size(ret_obj) ) {
+	if (PYGLIB_PyBytes_Resize(&ret_obj, total_read) == -1)
+	    goto failure;
+    }
+
+    return ret_obj;
+
+  failure:
+    Py_XDECREF(ret_obj);
+    return NULL;
+}
+
+
 static PyMethodDef _gi_functions[] = {
     { "enum_add", (PyCFunction) _wrap_pyg_enum_add, METH_VARARGS | METH_KEYWORDS },
     { "enum_register_new_gtype_and_add", (PyCFunction) _wrap_pyg_enum_register_new_gtype_and_add, METH_VARARGS | METH_KEYWORDS },
@@ -465,6 +543,9 @@ static PyMethodDef _gi_functions[] = {
     { "hook_up_vfunc_implementation", (PyCFunction) _wrap_pyg_hook_up_vfunc_implementation, METH_VARARGS },
     { "variant_new_tuple", (PyCFunction) _wrap_pyg_variant_new_tuple, METH_VARARGS },
     { "variant_type_from_string", (PyCFunction) _wrap_pyg_variant_type_from_string, METH_VARARGS },
+    { "source_new", (PyCFunction) _wrap_pyg_source_new, METH_NOARGS },
+    { "source_set_callback", (PyCFunction) pyg_source_set_callback, METH_VARARGS },
+    { "io_channel_read", (PyCFunction) pyg_channel_read, METH_VARARGS },
     { NULL, NULL, 0 }
 };
 
diff --git a/gi/importer.py b/gi/importer.py
index d83a384..aa95cf6 100644
--- a/gi/importer.py
+++ b/gi/importer.py
@@ -25,7 +25,7 @@ import logging
 import sys
 
 from ._gi import Repository
-from .module import DynamicModule, DynamicGObjectModule, DynamicGLibModule
+from .module import DynamicModule
 
 
 repository = Repository.get_default()
@@ -58,15 +58,7 @@ class DynamicImporter(object):
             return sys.modules[fullname]
 
         path, namespace = fullname.rsplit('.', 1)
-
-        # Special case GObject and GLib
-        if namespace == 'GObject':
-            dynamic_module = DynamicGObjectModule()
-        elif namespace == "GLib":
-            dynamic_module = DynamicGLibModule()
-        else:
-            dynamic_module = DynamicModule(namespace)
-
+        dynamic_module = DynamicModule(namespace)
         modules[namespace] = dynamic_module
 
         dynamic_module.__file__ = '<%s>' % fullname
diff --git a/gi/module.py b/gi/module.py
index e115fc7..db5adf5 100644
--- a/gi/module.py
+++ b/gi/module.py
@@ -27,7 +27,6 @@ import types
 
 _have_py3 = (sys.version_info[0] >= 3)
 
-from . import _glib, _gobject
 try:
     maketrans = ''.maketrans
 except AttributeError:
@@ -60,22 +59,37 @@ from .types import \
     StructMeta, \
     Function
 
+from ._gobject._gobject import \
+    GInterface, \
+    GObject
+
+from ._gobject.constants import \
+    TYPE_NONE, \
+    TYPE_BOXED, \
+    TYPE_POINTER, \
+    TYPE_ENUM, \
+    TYPE_FLAGS
+
+
 repository = Repository.get_default()
 
+# Cache of IntrospectionModules that have been loaded.
+_introspection_modules = {}
+
 
 def get_parent_for_object(object_info):
     parent_object_info = object_info.get_parent()
 
     if not parent_object_info:
+        # Special case GObject.Object as being derived from the static GObject.
+        if object_info.get_namespace() == 'GObject' and object_info.get_name() == 'Object':
+            return GObject
+
         return object
 
     namespace = parent_object_info.get_namespace()
     name = parent_object_info.get_name()
 
-    # Workaround for GObject.Object and GObject.InitiallyUnowned.
-    if namespace == 'GObject' and name == 'Object' or name == 'InitiallyUnowned':
-        return _gobject.GObject
-
     module = __import__('gi.repository.%s' % namespace, fromlist=[name])
     return getattr(module, name)
 
@@ -92,7 +106,13 @@ def get_interfaces_for_object(object_info):
 
 
 class IntrospectionModule(object):
+    """An object which wraps an introspection typelib.
 
+    This wrapping creates a python module like representation of the typelib
+    using gi repository as a foundation. Accessing attributes of the module
+    will dynamically pull them in and create wrappers for the members.
+    These members are then cached on this introspection module.
+    """
     def __init__(self, namespace, version=None):
         repository.require(namespace, version)
         self._namespace = namespace
@@ -120,16 +140,16 @@ class IntrospectionModule(object):
 
             if wrapper is None:
                 if info.is_flags():
-                    if g_type.is_a(_gobject.TYPE_FLAGS):
+                    if g_type.is_a(TYPE_FLAGS):
                         wrapper = flags_add(g_type)
                     else:
-                        assert g_type == _gobject.TYPE_NONE
+                        assert g_type == TYPE_NONE
                         wrapper = flags_register_new_gtype_and_add(info)
                 else:
-                    if g_type.is_a(_gobject.TYPE_ENUM):
+                    if g_type.is_a(TYPE_ENUM):
                         wrapper = enum_add(g_type)
                     else:
-                        assert g_type == _gobject.TYPE_NONE
+                        assert g_type == TYPE_NONE
                         wrapper = enum_register_new_gtype_and_add(info)
 
                 wrapper.__info__ = info
@@ -145,19 +165,12 @@ class IntrospectionModule(object):
                     value_name = value_info.get_name_unescaped().translate(ascii_upper_trans)
                     setattr(wrapper, value_name, wrapper(value_info.get_value()))
 
-            if g_type != _gobject.TYPE_NONE:
+            if g_type != TYPE_NONE:
                 g_type.pytype = wrapper
 
         elif isinstance(info, RegisteredTypeInfo):
             g_type = info.get_g_type()
 
-            # Check if there is already a Python wrapper.
-            if g_type != _gobject.TYPE_NONE:
-                type_ = g_type.pytype
-                if type_ is not None:
-                    self.__dict__[name] = type_
-                    return type_
-
             # Create a wrapper.
             if isinstance(info, ObjectInfo):
                 parent = get_parent_for_object(info)
@@ -169,13 +182,13 @@ class IntrospectionModule(object):
                 bases = (CCallback,)
                 metaclass = GObjectMeta
             elif isinstance(info, InterfaceInfo):
-                bases = (_gobject.GInterface,)
+                bases = (GInterface,)
                 metaclass = GObjectMeta
             elif isinstance(info, (StructInfo, UnionInfo)):
-                if g_type.is_a(_gobject.TYPE_BOXED):
+                if g_type.is_a(TYPE_BOXED):
                     bases = (Boxed,)
-                elif (g_type.is_a(_gobject.TYPE_POINTER) or
-                      g_type == _gobject.TYPE_NONE or
+                elif (g_type.is_a(TYPE_POINTER) or
+                      g_type == TYPE_NONE or
                       g_type.fundamental == g_type):
                     bases = (Struct,)
                 else:
@@ -184,6 +197,17 @@ class IntrospectionModule(object):
             else:
                 raise NotImplementedError(info)
 
+            # Check if there is already a Python wrapper that is not a parent class
+            # of the wrapper being created. If it is a parent, it is ok to clobber
+            # g_type.pytype with a new child class wrapper of the existing parent.
+            # Note that the return here never occurs under normal circumstances due
+            # to caching on the __dict__ itself.
+            if g_type != TYPE_NONE:
+                type_ = g_type.pytype
+                if type_ is not None and type_ not in bases:
+                    self.__dict__[name] = type_
+                    return type_
+
             name = info.get_name()
             dict_ = {
                 '__info__': info,
@@ -193,7 +217,7 @@ class IntrospectionModule(object):
             wrapper = metaclass(name, bases, dict_)
 
             # Register the new Python wrapper.
-            if g_type != _gobject.TYPE_NONE:
+            if g_type != TYPE_NONE:
                 g_type.pytype = wrapper
 
         elif isinstance(info, FunctionInfo):
@@ -203,6 +227,9 @@ class IntrospectionModule(object):
         else:
             raise NotImplementedError(info)
 
+        # Cache the newly created wrapper which will then be
+        # available directly on this introspection module instead of being
+        # lazily constructed through the __getattr__ we are currently in.
         self.__dict__[name] = wrapper
         return wrapper
 
@@ -229,7 +256,29 @@ class IntrospectionModule(object):
         return list(result)
 
 
+def get_introspection_module(namespace):
+    """
+    :Returns:
+        An object directly wrapping the gi module without overrides.
+    """
+    if namespace in _introspection_modules:
+        return _introspection_modules[namespace]
+
+    version = gi.get_required_version(namespace)
+    module = IntrospectionModule(namespace, version)
+    _introspection_modules[namespace] = module
+    return module
+
+
 class DynamicModule(types.ModuleType):
+    """A module composed of an IntrospectionModule and an overrides module.
+
+    DynamicModule wraps up an IntrospectionModule and an overrides module
+    into a single accessible module. This is what is returned from statements
+    like "from gi.repository import Foo". Accessing attributes on a DynamicModule
+    will first look overrides (or the gi.overrides.registry cache) and then
+    in the introspection module if it was not found as an override.
+    """
     def __init__(self, namespace):
         self._namespace = namespace
         self._introspection_module = None
@@ -237,9 +286,7 @@ class DynamicModule(types.ModuleType):
         self.__path__ = None
 
     def _load(self):
-        version = gi.get_required_version(self._namespace)
-        self._introspection_module = IntrospectionModule(self._namespace,
-                                                         version)
+        self._introspection_module = get_introspection_module(self._namespace)
         try:
             overrides_modules = __import__('gi.overrides', fromlist=[self._namespace])
             self._overrides_module = getattr(overrides_modules, self._namespace, None)
@@ -288,62 +335,3 @@ class DynamicModule(types.ModuleType):
                                        self.__class__.__name__,
                                        self._namespace,
                                        path)
-
-
-class DynamicGObjectModule(DynamicModule):
-    """Wrapper for the internal GObject module
-
-    This class allows us to access both the static internal PyGObject module and the GI GObject module
-    through the same interface.  It is returned when by importing GObject from the gi repository:
-
-    from gi.repository import GObject
-
-    We use this because some PyGI interfaces generated from the GIR require GObject types not wrapped
-    by the static bindings.  This also allows access to module attributes in a way that is more
-    familiar to GI application developers.  Take signal flags as an example.  The G_SIGNAL_RUN_FIRST
-    flag would be accessed as GObject.SIGNAL_RUN_FIRST in the static bindings but in the dynamic bindings
-    can be accessed as GObject.SignalFlags.RUN_FIRST.  The latter follows a GI naming convention which
-    would be familiar to GI application developers in a number of languages.
-    """
-
-    def __init__(self):
-        DynamicModule.__init__(self, namespace='GObject')
-
-    def __getattr__(self, name):
-        from . import _gobject
-
-        # first see if this attr is in the internal _gobject module
-        attr = getattr(_gobject, name, None)
-
-        # if not in module assume request for an attr exported through GI
-        if attr is None:
-            attr = super(DynamicGObjectModule, self).__getattr__(name)
-
-        return attr
-
-
-class DynamicGLibModule(DynamicModule):
-    """Wrapper for the internal GLib module
-
-    This class allows us to access both the static internal PyGLib module and the GI GLib module
-    through the same interface.  It is returned when by importing GLib from the gi repository:
-
-    from gi.repository import GLib
-
-    We use this because some PyGI interfaces generated from the GIR require GLib types not wrapped
-    by the static bindings.  This also allows access to module attributes in a way that is more
-    familiar to GI application developers.
-    """
-
-    def __init__(self):
-        DynamicModule.__init__(self, namespace='GLib')
-
-    def __getattr__(self, name):
-        # first see if this attr is in the internal _gobject module
-        attr = getattr(_glib, name, None)
-
-        # if not in module assume request for an attr exported through GI
-        if attr is None:
-            attr = super(DynamicGLibModule, self).__getattr__(name)
-
-        return attr
diff --git a/gi/overrides/GIMarshallingTests.py b/gi/overrides/GIMarshallingTests.py
index a25eda7..cc967b4 100644
--- a/gi/overrides/GIMarshallingTests.py
+++ b/gi/overrides/GIMarshallingTests.py
@@ -19,9 +19,9 @@
 # USA
 
 from ..overrides import override
-from ..importer import modules
+from ..module import get_introspection_module
 
-GIMarshallingTests = modules['GIMarshallingTests']._introspection_module
+GIMarshallingTests = get_introspection_module('GIMarshallingTests')
 
 __all__ = []
 
@@ -63,6 +63,7 @@ class OverridesObject(GIMarshallingTests.OverridesObject):
         return self
 
     def method(self):
+        """Overridden doc string."""
         return GIMarshallingTests.OverridesObject.method(self) / 7
 
 OverridesObject = override(OverridesObject)
diff --git a/gi/overrides/GLib.py b/gi/overrides/GLib.py
index b6f2ce2..ed63679 100644
--- a/gi/overrides/GLib.py
+++ b/gi/overrides/GLib.py
@@ -2,6 +2,7 @@
 # vim: tabstop=4 shiftwidth=4 expandtab
 #
 # Copyright (C) 2010 Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
+# Copyright (C) 2011, 2012 Canonical Ltd.
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -18,13 +19,37 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
 # USA
 
-from ..importer import modules
-from .._gi import variant_new_tuple, variant_type_from_string
+import signal
+import warnings
 
-GLib = modules['GLib']._introspection_module
+from ..module import get_introspection_module
+from .._gi import (variant_new_tuple, variant_type_from_string, source_new,
+                   source_set_callback, io_channel_read)
+from ..overrides import override, deprecated
+from gi import PyGIDeprecationWarning, version_info
+
+GLib = get_introspection_module('GLib')
 
 __all__ = []
 
+from gi._glib import option
+option  # pyflakes
+__all__.append('option')
+
+
+# Types and functions still needed from static bindings
+from gi._glib import _glib
+GError = _glib.GError
+OptionContext = _glib.OptionContext
+OptionGroup = _glib.OptionGroup
+Pid = _glib.Pid
+PollFD = _glib.PollFD
+spawn_async = _glib.spawn_async
+threads_init = _glib.threads_init
+
+__all__ += ['GError', 'OptionContext', 'OptionGroup', 'Pid', 'PollFD',
+            'spawn_async', 'threads_init']
+
 
 class _VariantCreator(object):
 
@@ -406,3 +431,421 @@ setattr(Variant, 'new_tuple', new_tuple)
 setattr(Variant, 'get_string', get_string)
 
 __all__.append('Variant')
+
+
+def markup_escape_text(text, length=-1):
+    if isinstance(text, bytes):
+        return GLib.markup_escape_text(text.decode('UTF-8'), length)
+    else:
+        return GLib.markup_escape_text(text, length)
+__all__.append('markup_escape_text')
+
+
+# backwards compatible names from old static bindings
+for n in ['DESKTOP', 'DOCUMENTS', 'DOWNLOAD', 'MUSIC', 'PICTURES',
+          'PUBLIC_SHARE', 'TEMPLATES', 'VIDEOS']:
+    globals()['USER_DIRECTORY_' + n] = getattr(GLib.UserDirectory, 'DIRECTORY_' + n)
+    __all__.append('USER_DIRECTORY_' + n)
+
+for n in ['ERR', 'HUP', 'IN', 'NVAL', 'OUT', 'PRI']:
+    globals()['IO_' + n] = getattr(GLib.IOCondition, n)
+    __all__.append('IO_' + n)
+
+for n in ['APPEND', 'GET_MASK', 'IS_READABLE', 'IS_SEEKABLE',
+          'MASK', 'NONBLOCK', 'SET_MASK']:
+    globals()['IO_FLAG_' + n] = getattr(GLib.IOFlags, n)
+    __all__.append('IO_FLAG_' + n)
+# spelling for the win
+IO_FLAG_IS_WRITEABLE = GLib.IOFlags.IS_WRITABLE
+__all__.append('IO_FLAG_IS_WRITEABLE')
+
+for n in ['AGAIN', 'EOF', 'ERROR', 'NORMAL']:
+    globals()['IO_STATUS_' + n] = getattr(GLib.IOStatus, n)
+    __all__.append('IO_STATUS_' + n)
+
+for n in ['CHILD_INHERITS_STDIN', 'DO_NOT_REAP_CHILD', 'FILE_AND_ARGV_ZERO',
+          'LEAVE_DESCRIPTORS_OPEN', 'SEARCH_PATH', 'STDERR_TO_DEV_NULL',
+          'STDOUT_TO_DEV_NULL']:
+    globals()['SPAWN_' + n] = getattr(GLib.SpawnFlags, n)
+    __all__.append('SPAWN_' + n)
+
+for n in ['HIDDEN', 'IN_MAIN', 'REVERSE', 'NO_ARG', 'FILENAME', 'OPTIONAL_ARG',
+          'NOALIAS']:
+    globals()['OPTION_FLAG_' + n] = getattr(GLib.OptionFlags, n)
+    __all__.append('OPTION_FLAG_' + n)
+
+for n in ['UNKNOWN_OPTION', 'BAD_VALUE', 'FAILED']:
+    globals()['OPTION_ERROR_' + n] = getattr(GLib.OptionError, n)
+    __all__.append('OPTION_ERROR_' + n)
+
+
+class MainLoop(GLib.MainLoop):
+    # Backwards compatible constructor API
+    def __new__(cls, context=None):
+        return GLib.MainLoop.new(context, False)
+
+    # Retain classic pygobject behaviour of quitting main loops on SIGINT
+    def __init__(self, context=None):
+        def _handler(loop):
+            loop.quit()
+            loop._quit_by_sigint = True
+
+        self._signal_source = GLib.unix_signal_add_full(
+            GLib.PRIORITY_DEFAULT, signal.SIGINT, _handler, self)
+
+    def __del__(self):
+        GLib.source_remove(self._signal_source)
+
+    def run(self):
+        super(MainLoop, self).run()
+        if hasattr(self, '_quit_by_sigint'):
+            # caught by _main_loop_sigint_handler()
+            raise KeyboardInterrupt
+
+MainLoop = override(MainLoop)
+__all__.append('MainLoop')
+
+
+class MainContext(GLib.MainContext):
+    # Backwards compatible API with default value
+    def iteration(self, may_block=True):
+        return super(MainContext, self).iteration(may_block)
+
+MainContext = override(MainContext)
+__all__.append('MainContext')
+
+
+class Source(GLib.Source):
+    def __new__(cls):
+        # use our custom pyg_source_new() here as g_source_new() is not
+        # bindable
+        source = source_new()
+        source.__class__ = cls
+        setattr(source, '__pygi_custom_source', True)
+        return source
+
+    # Backwards compatible API for optional arguments
+    def attach(self, context=None):
+        id = super(Source, self).attach(context)
+        return id
+
+    def set_callback(self, fn, user_data=None):
+        if hasattr(self, '__pygi_custom_source'):
+            # use our custom pyg_source_set_callback() if for a GSource object
+            # with custom functions
+            source_set_callback(self, fn, user_data)
+        else:
+            # otherwise, for Idle and Timeout, use the standard method
+            super(Source, self).set_callback(fn, user_data)
+
+    def get_current_time(self):
+        return GLib.get_real_time() * 0.000001
+
+    get_current_time = deprecated(get_current_time,
+                                  'GLib.Source.get_time() or GLib.get_real_time()')
+
+    # as get/set_priority are introspected, we can't use the static
+    # property(get_priority, ..) here
+    def __get_priority(self):
+        return self.get_priority()
+
+    def __set_priority(self, value):
+        self.set_priority(value)
+
+    priority = property(__get_priority, __set_priority)
+
+    def __get_can_recurse(self):
+        return self.get_can_recurse()
+
+    def __set_can_recurse(self, value):
+        self.set_can_recurse(value)
+
+    can_recurse = property(__get_can_recurse, __set_can_recurse)
+
+Source = override(Source)
+__all__.append('Source')
+
+
+class Idle(Source):
+    def __new__(cls, priority=GLib.PRIORITY_DEFAULT):
+        source = GLib.idle_source_new()
+        source.__class__ = cls
+        return source
+
+    def __init__(self, priority=GLib.PRIORITY_DEFAULT):
+        super(Source, self).__init__()
+        if priority != GLib.PRIORITY_DEFAULT:
+            self.set_priority(priority)
+
+__all__.append('Idle')
+
+
+class Timeout(Source):
+    def __new__(cls, interval=0, priority=GLib.PRIORITY_DEFAULT):
+        source = GLib.timeout_source_new(interval)
+        source.__class__ = cls
+        return source
+
+    def __init__(self, interval=0, priority=GLib.PRIORITY_DEFAULT):
+        if priority != GLib.PRIORITY_DEFAULT:
+            self.set_priority(priority)
+
+__all__.append('Timeout')
+
+
+def user_data_varargs_shim(callback, user_data, cb_num_args=0):
+    '''Adjust callback and user_data varargs for PyGTK backwards compatibility
+
+    GLib only accepts exactly one user_data argument, but older pygtk
+    traditionally accepted zero or more for some specific functions. For "one
+    argument", use the actual user-supplied callback for efficiency; for all
+    others, rewire it to accept zero or more than one.
+
+    Return the adjusted callback and the real user data to pass to GLib.
+    '''
+    if len(user_data) == 1:
+        return (callback, user_data[0])
+
+    if cb_num_args == 0:
+        return (lambda data: callback(*data), user_data)
+    if cb_num_args == 2:
+        return (lambda a1, a2, data: callback(a1, a2, *data), user_data)
+    raise NotImplementedError('%i number of callback arguments not supported' % cb_num_args)
+
+
+# backwards compatible API
+def idle_add(function, *user_data, **kwargs):
+    (fn, data) = user_data_varargs_shim(function, user_data)
+    priority = kwargs.get('priority', GLib.PRIORITY_DEFAULT_IDLE)
+    return GLib.idle_add(priority, fn, data)
+
+__all__.append('idle_add')
+
+
+def timeout_add(interval, function, *user_data, **kwargs):
+    (fn, data) = user_data_varargs_shim(function, user_data)
+    priority = kwargs.get('priority', GLib.PRIORITY_DEFAULT)
+    return GLib.timeout_add(priority, interval, fn, data)
+
+__all__.append('timeout_add')
+
+
+def timeout_add_seconds(interval, function, *user_data, **kwargs):
+    (fn, data) = user_data_varargs_shim(function, user_data)
+    priority = kwargs.get('priority', GLib.PRIORITY_DEFAULT)
+    return GLib.timeout_add_seconds(priority, interval, fn, data)
+
+__all__.append('timeout_add_seconds')
+
+
+# The real GLib API is io_add_watch(IOChannel, priority, condition, callback,
+# user_data). This needs to take into account several deprecated APIs:
+# - calling with an fd as first argument
+# - calling with a Python file object as first argument
+# - calling without a priority as second argument
+# and the usual "call without or multiple user_data", in which case the
+# callback gets the same user data arguments.
+def io_add_watch(channel, priority_, condition, *cb_and_user_data, **kwargs):
+    if not isinstance(priority_, int) or isinstance(priority_, GLib.IOCondition):
+        warnings.warn('Calling io_add_watch without priority as second argument is deprecated',
+                      PyGIDeprecationWarning)
+        # shift the arguments around
+        user_data = cb_and_user_data
+        callback = condition
+        condition = priority_
+        if not callable(callback):
+            raise TypeError('third argument must be callable')
+
+        # backwards compatibility: Call with priority kwarg
+        if 'priority' in kwargs:
+            warnings.warn('Calling io_add_watch with priority keyword argument is deprecated, put it as second positional argument',
+                          PyGIDeprecationWarning)
+            priority_ = kwargs['priority']
+        else:
+            priority_ = GLib.PRIORITY_DEFAULT
+    else:
+        if len(cb_and_user_data) < 1 or not callable(cb_and_user_data[0]):
+            raise TypeError('expecting callback as fourth argument')
+        callback = cb_and_user_data[0]
+        user_data = cb_and_user_data[1:]
+
+    (func, user_data) = user_data_varargs_shim(callback, user_data, 2)
+
+    # backwards compatibility: Allow calling with fd
+    if isinstance(channel, int):
+        warnings.warn('Calling io_add_watch with a file descriptor is deprecated; call it with a GLib.IOChannel object',
+                      PyGIDeprecationWarning)
+        func_fdtransform = lambda _, cond, data: func(channel, cond, data)
+        real_channel = GLib.IOChannel.unix_new(channel)
+    elif hasattr(channel, 'fileno'):
+        # backwards compatibility: Allow calling with Python file
+        warnings.warn('Calling io_add_watch with a file object is deprecated; call it with a GLib.IOChannel object',
+                      PyGIDeprecationWarning)
+        func_fdtransform = lambda _, cond, data: func(channel, cond, data)
+        real_channel = GLib.IOChannel.unix_new(channel.fileno())
+    else:
+        assert isinstance(channel, GLib.IOChannel)
+        func_fdtransform = func
+        real_channel = channel
+
+    return GLib.io_add_watch(real_channel, priority_, condition,
+                             func_fdtransform, user_data)
+
+__all__.append('io_add_watch')
+
+
+# backwards compatible API
+class IOChannel(GLib.IOChannel):
+    def __new__(cls, filedes=None, filename=None, mode=None, hwnd=None):
+        if filedes is not None:
+            return GLib.IOChannel.unix_new(filedes)
+        if filename is not None:
+            return GLib.IOChannel.new_file(filename, mode or 'r')
+        if hwnd is not None:
+            return GLib.IOChannel.win32_new_fd(hwnd)
+        raise TypeError('either a valid file descriptor, file name, or window handle must be supplied')
+
+    def read(self, max_count=-1):
+        return io_channel_read(self, max_count)
+
+    def readline(self, size_hint=-1):
+        # note, size_hint is just to maintain backwards compatible API; the
+        # old static binding did not actually use it
+        (status, buf, length, terminator_pos) = self.read_line()
+        if buf is None:
+            return ''
+        return buf
+
+    def readlines(self, size_hint=-1):
+        # note, size_hint is just to maintain backwards compatible API;
+        # the old static binding did not actually use it
+        lines = []
+        status = GLib.IOStatus.NORMAL
+        while status == GLib.IOStatus.NORMAL:
+            (status, buf, length, terminator_pos) = self.read_line()
+            # note, this appends an empty line after EOF; this is
+            # bug-compatible with the old static bindings
+            if buf is None:
+                buf = ''
+            lines.append(buf)
+        return lines
+
+    def write(self, buf, buflen=-1):
+        if not isinstance(buf, bytes):
+            buf = buf.encode('UTF-8')
+        if buflen == -1:
+            buflen = len(buf)
+        (status, written) = self.write_chars(buf, buflen)
+        return written
+
+    def writelines(self, lines):
+        for line in lines:
+            self.write(line)
+
+    _whence_map = {0: GLib.SeekType.SET, 1: GLib.SeekType.CUR, 2: GLib.SeekType.END}
+
+    def seek(self, offset, whence=0):
+        try:
+            w = self._whence_map[whence]
+        except KeyError:
+            raise ValueError("invalid 'whence' value")
+        return self.seek_position(offset, w)
+
+    def add_watch(self, condition, callback, *user_data, **kwargs):
+        priority = kwargs.get('priority', GLib.PRIORITY_DEFAULT)
+        return io_add_watch(self, priority, condition, callback, *user_data)
+
+    add_watch = deprecated(add_watch, 'GLib.io_add_watch()')
+
+    def __iter__(self):
+        return self
+
+    def __next__(self):
+        (status, buf, length, terminator_pos) = self.read_line()
+        if status == GLib.IOStatus.NORMAL:
+            return buf
+        raise StopIteration
+
+    # Python 2.x compatibility
+    next = __next__
+
+IOChannel = override(IOChannel)
+__all__.append('IOChannel')
+
+
+# The real GLib API is child_watch_add(priority, pid, callback, data).
+# The old static bindings had the following API which we still need to support
+# for a while:
+#   child_watch_add(pid, callback, data=None, priority=GLib.PRIORITY_DEFAULT)
+# and the usual "call without user_data", in which case the callback does not
+# get an user_data either.
+def child_watch_add(priority_or_pid, pid_or_callback, *args, **kwargs):
+    _unspecified = object()
+
+    if callable(pid_or_callback):
+        warnings.warn('Calling child_watch_add without priority as first argument is deprecated',
+                      PyGIDeprecationWarning)
+        pid = priority_or_pid
+        callback = pid_or_callback
+        if len(args) == 0:
+            user_data = kwargs.get('data', _unspecified)
+            priority = kwargs.get('priority', GLib.PRIORITY_DEFAULT)
+        elif len(args) == 1:
+            user_data = args[0]
+            priority = kwargs.get('priority', GLib.PRIORITY_DEFAULT)
+        elif len(args) == 2:
+            user_data = args[0]
+            priority = args[1]
+        else:
+            raise TypeError('expected at most 4 positional arguments')
+    else:
+        priority = priority_or_pid
+        pid = pid_or_callback
+        if len(args) == 0 or not callable(args[0]):
+            raise TypeError('expected callback as third argument')
+        callback = args[0]
+        if len(args) == 1:
+            user_data = kwargs.get('data', _unspecified)
+        else:
+            user_data = args[1]
+
+    if user_data is _unspecified:
+        # we have to call the callback without the user_data argument
+        func = lambda pid, status, data: callback(pid, status)
+        user_data = None
+    else:
+        func = callback
+
+    return GLib.child_watch_add(priority, pid, func, user_data)
+
+__all__.append('child_watch_add')
+
+
+def get_current_time():
+    return GLib.get_real_time() * 0.000001
+
+get_current_time = deprecated(get_current_time, 'GLib.get_real_time()')
+
+__all__.append('get_current_time')
+
+
+# backwards compatible API with default argument, and ignoring bytes_read
+# output argument
+def filename_from_utf8(utf8string, len=-1):
+    return GLib.filename_from_utf8(utf8string, len)[0]
+
+__all__.append('filename_from_utf8')
+
+
+# obsolete constants for backwards compatibility
+glib_version = (GLib.MAJOR_VERSION, GLib.MINOR_VERSION, GLib.MICRO_VERSION)
+__all__.append('glib_version')
+pyglib_version = version_info
+__all__.append('pyglib_version')
+
+# work around wrong constants in GLib GIR, see
+# https://bugzilla.gnome.org/show_bug.cgi?id=685022
+MININT64 = -9223372036854775808
+MAXUINT64 = 18446744073709551615
+__all__.append('MININT64')
+__all__.append('MAXUINT64')
diff --git a/gi/overrides/GObject.py b/gi/overrides/GObject.py
new file mode 100644
index 0000000..c0198b3
--- /dev/null
+++ b/gi/overrides/GObject.py
@@ -0,0 +1,419 @@
+# -*- Mode: Python; py-indent-offset: 4 -*-
+# vim: tabstop=4 shiftwidth=4 expandtab
+#
+# Copyright (C) 2012 Canonical Ltd.
+# Author: Martin Pitt <martin.pitt@ubuntu.com>
+# Copyright (C) 2012 Simon Feltman <sfeltman@src.gnome.org>
+#
+# This library 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 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
+# USA
+
+import sys
+from collections import namedtuple
+
+import gi.overrides
+import gi.module
+from gi.overrides import override
+from gi.repository import GLib
+
+from gi._gobject import _gobject
+from gi._gobject import propertyhelper
+from gi._gobject import signalhelper
+
+GObjectModule = gi.module.get_introspection_module('GObject')
+
+__all__ = []
+
+
+from gi._glib import option
+sys.modules['gi._gobject.option'] = option
+
+
+# API aliases for backwards compatibility
+for name in ['markup_escape_text', 'get_application_name',
+             'set_application_name', 'get_prgname', 'set_prgname',
+             'main_depth', 'filename_display_basename',
+             'filename_display_name', 'filename_from_utf8',
+             'uri_list_extract_uris',
+             'MainLoop', 'MainContext', 'main_context_default',
+             'source_remove', 'Source', 'Idle', 'Timeout', 'PollFD',
+             'idle_add', 'timeout_add', 'timeout_add_seconds',
+             'io_add_watch', 'child_watch_add', 'get_current_time',
+             'spawn_async']:
+    globals()[name] = gi.overrides.deprecated(getattr(GLib, name), 'GLib.' + name)
+    __all__.append(name)
+
+# constants are also deprecated, but cannot mark them as such
+for name in ['PRIORITY_DEFAULT', 'PRIORITY_DEFAULT_IDLE', 'PRIORITY_HIGH',
+             'PRIORITY_HIGH_IDLE', 'PRIORITY_LOW',
+             'IO_IN', 'IO_OUT', 'IO_PRI', 'IO_ERR', 'IO_HUP', 'IO_NVAL',
+             'IO_STATUS_ERROR', 'IO_STATUS_NORMAL', 'IO_STATUS_EOF',
+             'IO_STATUS_AGAIN', 'IO_FLAG_APPEND', 'IO_FLAG_NONBLOCK',
+             'IO_FLAG_IS_READABLE', 'IO_FLAG_IS_WRITEABLE',
+             'IO_FLAG_IS_SEEKABLE', 'IO_FLAG_MASK', 'IO_FLAG_GET_MASK',
+             'IO_FLAG_SET_MASK',
+             'SPAWN_LEAVE_DESCRIPTORS_OPEN', 'SPAWN_DO_NOT_REAP_CHILD',
+             'SPAWN_SEARCH_PATH', 'SPAWN_STDOUT_TO_DEV_NULL',
+             'SPAWN_STDERR_TO_DEV_NULL', 'SPAWN_CHILD_INHERITS_STDIN',
+             'SPAWN_FILE_AND_ARGV_ZERO',
+             'OPTION_FLAG_HIDDEN', 'OPTION_FLAG_IN_MAIN', 'OPTION_FLAG_REVERSE',
+             'OPTION_FLAG_NO_ARG', 'OPTION_FLAG_FILENAME', 'OPTION_FLAG_OPTIONAL_ARG',
+             'OPTION_FLAG_NOALIAS', 'OPTION_ERROR_UNKNOWN_OPTION',
+             'OPTION_ERROR_BAD_VALUE', 'OPTION_ERROR_FAILED', 'OPTION_REMAINING',
+             'glib_version']:
+    globals()[name] = getattr(GLib, name)
+    __all__.append(name)
+
+
+G_MININT8 = GLib.MININT8
+G_MAXINT8 = GLib.MAXINT8
+G_MAXUINT8 = GLib.MAXUINT8
+G_MININT16 = GLib.MININT16
+G_MAXINT16 = GLib.MAXINT16
+G_MAXUINT16 = GLib.MAXUINT16
+G_MININT32 = GLib.MININT32
+G_MAXINT32 = GLib.MAXINT32
+G_MAXUINT32 = GLib.MAXUINT32
+G_MININT64 = GLib.MININT64
+G_MAXINT64 = GLib.MAXINT64
+G_MAXUINT64 = GLib.MAXUINT64
+__all__ += ['G_MININT8', 'G_MAXINT8', 'G_MAXUINT8', 'G_MININT16',
+            'G_MAXINT16', 'G_MAXUINT16', 'G_MININT32', 'G_MAXINT32',
+            'G_MAXUINT32', 'G_MININT64', 'G_MAXINT64', 'G_MAXUINT64']
+
+# these are not currently exported in GLib gir, presumably because they are
+# platform dependent; so get them from our static bindings
+for name in ['G_MINFLOAT', 'G_MAXFLOAT', 'G_MINDOUBLE', 'G_MAXDOUBLE',
+             'G_MINSHORT', 'G_MAXSHORT', 'G_MAXUSHORT', 'G_MININT', 'G_MAXINT',
+             'G_MAXUINT', 'G_MINLONG', 'G_MAXLONG', 'G_MAXULONG', 'G_MAXSIZE',
+             'G_MINSSIZE', 'G_MAXSSIZE', 'G_MINOFFSET', 'G_MAXOFFSET']:
+    globals()[name] = getattr(_gobject, name)
+    __all__.append(name)
+
+
+TYPE_INVALID = GObjectModule.type_from_name('invalid')
+TYPE_NONE = GObjectModule.type_from_name('void')
+TYPE_INTERFACE = GObjectModule.type_from_name('GInterface')
+TYPE_CHAR = GObjectModule.type_from_name('gchar')
+TYPE_UCHAR = GObjectModule.type_from_name('guchar')
+TYPE_BOOLEAN = GObjectModule.type_from_name('gboolean')
+TYPE_INT = GObjectModule.type_from_name('gint')
+TYPE_UINT = GObjectModule.type_from_name('guint')
+TYPE_LONG = GObjectModule.type_from_name('glong')
+TYPE_ULONG = GObjectModule.type_from_name('gulong')
+TYPE_INT64 = GObjectModule.type_from_name('gint64')
+TYPE_UINT64 = GObjectModule.type_from_name('guint64')
+TYPE_ENUM = GObjectModule.type_from_name('GEnum')
+TYPE_FLAGS = GObjectModule.type_from_name('GFlags')
+TYPE_FLOAT = GObjectModule.type_from_name('gfloat')
+TYPE_DOUBLE = GObjectModule.type_from_name('gdouble')
+TYPE_STRING = GObjectModule.type_from_name('gchararray')
+TYPE_POINTER = GObjectModule.type_from_name('gpointer')
+TYPE_BOXED = GObjectModule.type_from_name('GBoxed')
+TYPE_PARAM = GObjectModule.type_from_name('GParam')
+TYPE_OBJECT = GObjectModule.type_from_name('GObject')
+TYPE_PYOBJECT = GObjectModule.type_from_name('PyObject')
+TYPE_GTYPE = GObjectModule.type_from_name('GType')
+TYPE_STRV = GObjectModule.type_from_name('GStrv')
+TYPE_VARIANT = GObjectModule.type_from_name('GVariant')
+TYPE_GSTRING = GObjectModule.type_from_name('GString')
+TYPE_UNICHAR = TYPE_UINT
+__all__ += ['TYPE_INVALID', 'TYPE_NONE', 'TYPE_INTERFACE', 'TYPE_CHAR',
+            'TYPE_UCHAR', 'TYPE_BOOLEAN', 'TYPE_INT', 'TYPE_UINT', 'TYPE_LONG',
+            'TYPE_ULONG', 'TYPE_INT64', 'TYPE_UINT64', 'TYPE_ENUM', 'TYPE_FLAGS',
+            'TYPE_FLOAT', 'TYPE_DOUBLE', 'TYPE_STRING', 'TYPE_POINTER',
+            'TYPE_BOXED', 'TYPE_PARAM', 'TYPE_OBJECT', 'TYPE_PYOBJECT',
+            'TYPE_GTYPE', 'TYPE_STRV', 'TYPE_VARIANT', 'TYPE_GSTRING', 'TYPE_UNICHAR']
+
+
+# Deprecated, use GLib directly
+Pid = GLib.Pid
+GError = GLib.GError
+OptionGroup = GLib.OptionGroup
+OptionContext = GLib.OptionContext
+__all__ += ['Pid', 'GError', 'OptionGroup', 'OptionContext']
+
+
+# Deprecated, use: GObject.ParamFlags.* directly
+PARAM_CONSTRUCT = GObjectModule.ParamFlags.CONSTRUCT
+PARAM_CONSTRUCT_ONLY = GObjectModule.ParamFlags.CONSTRUCT_ONLY
+PARAM_LAX_VALIDATION = GObjectModule.ParamFlags.LAX_VALIDATION
+PARAM_READABLE = GObjectModule.ParamFlags.READABLE
+PARAM_WRITABLE = GObjectModule.ParamFlags.WRITABLE
+# PARAM_READWRITE should come from the gi module but cannot due to:
+# https://bugzilla.gnome.org/show_bug.cgi?id=687615
+PARAM_READWRITE = PARAM_READABLE | PARAM_WRITABLE
+__all__ += ['PARAM_CONSTRUCT', 'PARAM_CONSTRUCT_ONLY', 'PARAM_LAX_VALIDATION',
+            'PARAM_READABLE', 'PARAM_WRITABLE', 'PARAM_READWRITE']
+
+
+# Deprecated, use: GObject.SignalFlags.* directly
+SIGNAL_ACTION = GObjectModule.SignalFlags.ACTION
+SIGNAL_DETAILED = GObjectModule.SignalFlags.DETAILED
+SIGNAL_NO_HOOKS = GObjectModule.SignalFlags.NO_HOOKS
+SIGNAL_NO_RECURSE = GObjectModule.SignalFlags.NO_RECURSE
+SIGNAL_RUN_CLEANUP = GObjectModule.SignalFlags.RUN_CLEANUP
+SIGNAL_RUN_FIRST = GObjectModule.SignalFlags.RUN_FIRST
+SIGNAL_RUN_LAST = GObjectModule.SignalFlags.RUN_LAST
+__all__ += ['SIGNAL_ACTION', 'SIGNAL_DETAILED', 'SIGNAL_NO_HOOKS',
+            'SIGNAL_NO_RECURSE', 'SIGNAL_RUN_CLEANUP', 'SIGNAL_RUN_FIRST',
+            'SIGNAL_RUN_LAST']
+
+
+# Static types
+GBoxed = _gobject.GBoxed
+GEnum = _gobject.GEnum
+GFlags = _gobject.GFlags
+GInterface = _gobject.GInterface
+GObject = _gobject.GObject
+GObjectWeakRef = _gobject.GObjectWeakRef
+GParamSpec = _gobject.GParamSpec
+GPointer = _gobject.GPointer
+GType = _gobject.GType
+Warning = _gobject.Warning
+__all__ += ['GBoxed', 'GEnum', 'GFlags', 'GInterface', 'GObject',
+            'GObjectWeakRef', 'GParamSpec', 'GPointer', 'GType',
+            'Warning']
+
+
+add_emission_hook = _gobject.add_emission_hook
+features = _gobject.features
+list_properties = _gobject.list_properties
+new = _gobject.new
+pygobject_version = _gobject.pygobject_version
+remove_emission_hook = _gobject.remove_emission_hook
+signal_accumulator_true_handled = _gobject.signal_accumulator_true_handled
+signal_new = _gobject.signal_new
+threads_init = _gobject.threads_init
+type_register = _gobject.type_register
+__all__ += ['add_emission_hook', 'features', 'list_properties',
+            'new', 'pygobject_version', 'remove_emission_hook',
+            'signal_accumulator_true_handled',
+            'signal_new', 'threads_init', 'type_register']
+
+
+class Value(GObjectModule.Value):
+    def __del__(self):
+        if self._free_on_dealloc:
+            self.unset()
+
+Value = override(Value)
+__all__.append('Value')
+
+
+def type_from_name(name):
+    type_ = GObjectModule.type_from_name(name)
+    if type_ == TYPE_INVALID:
+        raise RuntimeError('unknown type name: %s' % name)
+    return type_
+
+__all__.append('type_from_name')
+
+
+def type_parent(type_):
+    parent = GObjectModule.type_parent(type_)
+    if parent == TYPE_INVALID:
+        raise RuntimeError('no parent for type')
+    return parent
+
+__all__.append('type_parent')
+
+
+def _validate_type_for_signal_method(type_):
+    if hasattr(type_, '__gtype__'):
+        type_ = type_.__gtype__
+    if not type_.is_instantiatable() and not type_.is_interface():
+        raise TypeError('type must be instantiable or an interface, got %s' % type_)
+
+
+def signal_list_ids(type_):
+    _validate_type_for_signal_method(type_)
+    return GObjectModule.signal_list_ids(type_)
+
+__all__.append('signal_list_ids')
+
+
+def signal_list_names(type_):
+    ids = signal_list_ids(type_)
+    return tuple(GObjectModule.signal_name(i) for i in ids)
+
+__all__.append('signal_list_names')
+
+
+def signal_lookup(name, type_):
+    _validate_type_for_signal_method(type_)
+    return GObjectModule.signal_lookup(name, type_)
+
+__all__.append('signal_lookup')
+
+
+def signal_query(id_or_name, type_=None):
+    SignalQuery = namedtuple('SignalQuery',
+                             ['signal_id',
+                              'signal_name',
+                              'itype',
+                              'signal_flags',
+                              'return_type',
+                              # n_params',
+                              'param_types'])
+
+    # signal_query needs to use a static method until the following bugs are fixed:
+    # https://bugzilla.gnome.org/show_bug.cgi?id=687550
+    # https://bugzilla.gnome.org/show_bug.cgi?id=687545
+    # https://bugzilla.gnome.org/show_bug.cgi?id=687541
+    if type_ is not None:
+        id_or_name = signal_lookup(id_or_name, type_)
+
+    res = _gobject.signal_query(id_or_name)
+    if res is None:
+        return None
+
+    # Return a named tuple which allows indexing like the static bindings
+    # along with field like access of the gi struct.
+    # Note however that the n_params was not returned from the static bindings.
+    return SignalQuery(*res)
+
+__all__.append('signal_query')
+
+
+class _HandlerBlockManager(object):
+    def __init__(self, obj, handler_id):
+        self.obj = obj
+        self.handler_id = handler_id
+
+    def __enter__(self):
+        pass
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        _gobject.GObject.handler_unblock(self.obj, self.handler_id)
+
+
+class _FreezeNotifyManager(object):
+    def __init__(self, obj):
+        self.obj = obj
+
+    def __enter__(self):
+        pass
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        self.obj.thaw_notify()
+
+
+class Object(GObjectModule.Object):
+    def _unsupported_method(self, *args, **kargs):
+        raise RuntimeError('This method is currently unsupported.')
+
+    def _unsupported_data_method(self, *args, **kargs):
+        raise RuntimeError('Data access methods are unsupported. '
+                           'Use normal Python attributes instead')
+
+    # Generic data methods are not needed in python as it can be handled
+    # with standard attribute access: https://bugzilla.gnome.org/show_bug.cgi?id=641944
+    get_data = _unsupported_data_method
+    get_qdata = _unsupported_data_method
+    set_data = _unsupported_data_method
+    steal_data = _unsupported_data_method
+    steal_qdata = _unsupported_data_method
+    replace_data = _unsupported_data_method
+    replace_qdata = _unsupported_data_method
+
+    # The following methods as unsupported until we verify
+    # they work as gi methods.
+    bind_property_full = _unsupported_method
+    compat_control = _unsupported_method
+    force_floating = _unsupported_method
+    interface_find_property = _unsupported_method
+    interface_install_property = _unsupported_method
+    interface_list_properties = _unsupported_method
+    is_floating = _unsupported_method
+    notify_by_pspec = _unsupported_method
+    ref = _unsupported_method
+    ref_count = _unsupported_method
+    ref_sink = _unsupported_method
+    run_dispose = _unsupported_method
+    unref = _unsupported_method
+    watch_closure = _unsupported_method
+
+    # The following methods are static APIs which need to leap frog the
+    # gi methods until we verify the gi methods can replace them.
+    get_property = _gobject.GObject.get_property
+    get_properties = _gobject.GObject.get_properties
+    set_property = _gobject.GObject.set_property
+    set_properties = _gobject.GObject.set_properties
+    bind_property = _gobject.GObject.bind_property
+    connect = _gobject.GObject.connect
+    connect_after = _gobject.GObject.connect_after
+    connect_object = _gobject.GObject.connect_object
+    connect_object_after = _gobject.GObject.connect_object_after
+    disconnect = _gobject.GObject.disconnect
+    disconnect_by_func = _gobject.GObject.disconnect_by_func
+    handler_disconnect = _gobject.GObject.handler_disconnect
+    handler_is_connected = _gobject.GObject.handler_is_connected
+    handler_block_by_func = _gobject.GObject.handler_block_by_func
+    handler_unblock_by_func = _gobject.GObject.handler_unblock_by_func
+    emit = _gobject.GObject.emit
+    emit_stop_by_name = _gobject.GObject.emit_stop_by_name
+    stop_emission = _gobject.GObject.stop_emission
+    chain = _gobject.GObject.chain
+    weak_ref = _gobject.GObject.weak_ref
+    __copy__ = _gobject.GObject.__copy__
+    __deepcopy__ = _gobject.GObject.__deepcopy__
+
+    def handler_block(self, handler_id):
+        """Blocks the signal handler from being invoked until handler_unblock() is called.
+
+        Returns a context manager which optionally can be used to
+        automatically unblock the handler:
+
+        >>> with obj.handler_block(id):
+        >>>    pass
+        """
+
+        # Note Object.handler_block is a static method specific to pygobject and not
+        # found in introspection. We need to continue using the static method
+        # until we figure out a technique to call the global signal_handler_block.
+        # But this requires a gpointer to the Object which we currently don't have
+        # access to in python.
+        _gobject.GObject.handler_block(self, handler_id)
+        return _HandlerBlockManager(self, handler_id)
+
+    def freeze_notify(self):
+        """Freezes the object's property-changed notification queue.
+
+        This will freeze the object so that "notify" signals are blocked until
+        the thaw_notify() method is called.
+
+        Returns a context manager which optionally can be used to
+        automatically thaw notifications:
+
+        >>> with obj.freeze_notify():
+        >>>     pass
+        """
+        super(Object, self).freeze_notify()
+        return _FreezeNotifyManager(self)
+
+
+Object = override(Object)
+GObject = Object
+__all__ += ['Object', 'GObject']
+
+
+Property = propertyhelper.Property
+Signal = signalhelper.Signal
+SignalOverride = signalhelper.SignalOverride
+# Deprecated naming "property" available for backwards compatibility.
+# Keep this at the end of the file to avoid clobbering the builtin.
+property = Property
+__all__ += ['Property', 'Signal', 'SignalOverride', 'property']
diff --git a/gi/overrides/Gdk.py b/gi/overrides/Gdk.py
index 20ef910..dc06f92 100644
--- a/gi/overrides/Gdk.py
+++ b/gi/overrides/Gdk.py
@@ -20,11 +20,11 @@
 # USA
 
 from ..overrides import override
-from ..importer import modules
+from ..module import get_introspection_module
 
 import sys
 
-Gdk = modules['Gdk']._introspection_module
+Gdk = get_introspection_module('Gdk')
 
 __all__ = []
 
@@ -287,7 +287,7 @@ for event_class in event_member_classes:
 
 class DragContext(Gdk.DragContext):
     def finish(self, success, del_, time):
-        Gtk = modules['Gtk']._introspection_module
+        Gtk = get_introspection_module('Gtk')
         Gtk.drag_finish(self, success, del_, time)
 
 DragContext = override(DragContext)
@@ -345,6 +345,29 @@ def color_parse(color):
         return None
     return color
 
+
+# Note, we cannot override the entire class as Gdk.Atom has no gtype, so just
+# hack some individual methods
+def _gdk_atom_str(atom):
+    n = atom.name()
+    if n:
+        return n
+    # fall back to atom index
+    return 'Gdk.Atom<%i>' % hash(atom)
+
+
+def _gdk_atom_repr(atom):
+    n = atom.name()
+    if n:
+        return 'Gdk.Atom<%s>' % n
+    # fall back to atom index
+    return 'Gdk.Atom<%i>' % hash(atom)
+
+
+Gdk.Atom.__str__ = _gdk_atom_str
+Gdk.Atom.__repr__ = _gdk_atom_repr
+
+
 # constants
 if Gdk._version >= '3.0':
     SELECTION_PRIMARY = Gdk.atom_intern('PRIMARY', True)
diff --git a/gi/overrides/Gio.py b/gi/overrides/Gio.py
index 9f96440..6ecd1c4 100644
--- a/gi/overrides/Gio.py
+++ b/gi/overrides/Gio.py
@@ -19,13 +19,13 @@
 # USA
 
 from ..overrides import override
-from ..importer import modules
+from ..module import get_introspection_module
 
 from gi.repository import GLib
 
 import sys
 
-Gio = modules['Gio']._introspection_module
+Gio = get_introspection_module('Gio')
 
 __all__ = []
 
diff --git a/gi/overrides/Gtk.py b/gi/overrides/Gtk.py
index 5eab41b..78bbd36 100644
--- a/gi/overrides/Gtk.py
+++ b/gi/overrides/Gtk.py
@@ -22,7 +22,8 @@
 import sys
 from gi.repository import GObject
 from ..overrides import override
-from ..importer import modules
+from ..module import get_introspection_module
+from gi import PyGIDeprecationWarning
 
 if sys.version_info >= (3, 0):
     _basestring = str
@@ -31,7 +32,8 @@ else:
     _basestring = basestring
     _callable = callable
 
-Gtk = modules['Gtk']._introspection_module
+Gtk = get_introspection_module('Gtk')
+
 __all__ = []
 
 if Gtk._version == '2.0':
@@ -441,7 +443,7 @@ class Dialog(Gtk.Dialog, Container):
         if hasattr(Gtk.DialogFlags, "NO_SEPARATOR") and (flags & Gtk.DialogFlags.NO_SEPARATOR):
             self.set_has_separator(False)
             import warnings
-            warnings.warn("Gtk.DialogFlags.NO_SEPARATOR has been depricated since Gtk+-3.0", DeprecationWarning)
+            warnings.warn("Gtk.DialogFlags.NO_SEPARATOR has been depricated since Gtk+-3.0", PyGIDeprecationWarning)
 
         if buttons is not None:
             self.add_buttons(*buttons)
@@ -492,7 +494,7 @@ class MessageDialog(Gtk.MessageDialog, Dialog):
         # type keyword is used for backwards compat with PyGTK
         if 'type' in kwds:
             import warnings
-            warnings.warn("The use of the keyword type as a parameter of the Gtk.MessageDialog constructor has been depricated. Please use message_type instead.", DeprecationWarning)
+            warnings.warn("The use of the keyword type as a parameter of the Gtk.MessageDialog constructor has been depricated. Please use message_type instead.", PyGIDeprecationWarning)
             message_type = kwds.pop('type')
 
         Gtk.MessageDialog.__init__(self,
diff --git a/gi/overrides/Makefile.am b/gi/overrides/Makefile.am
index 8d95eee..e69c91c 100644
--- a/gi/overrides/Makefile.am
+++ b/gi/overrides/Makefile.am
@@ -4,6 +4,7 @@ pygioverrides_PYTHON = \
 	GLib.py \
 	Gtk.py \
 	Gdk.py \
+	GObject.py \
 	Gio.py \
 	GIMarshallingTests.py \
 	Pango.py \
diff --git a/gi/overrides/Makefile.in b/gi/overrides/Makefile.in
index bb0f0d9..14b3f4b 100644
--- a/gi/overrides/Makefile.in
+++ b/gi/overrides/Makefile.in
@@ -55,8 +55,10 @@ DIST_COMMON = $(pygioverrides_PYTHON) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \
-	$(top_srcdir)/m4/jhflags.m4 $(top_srcdir)/m4/python.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/jhflags.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -122,6 +124,9 @@ CAIRO_LIBS = @CAIRO_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -139,6 +144,7 @@ EXEEXT = @EXEEXT@
 FFI_CFLAGS = @FFI_CFLAGS@
 FFI_LIBS = @FFI_LIBS@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
 GI_CFLAGS = @GI_CFLAGS@
@@ -158,6 +164,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBFFI_PC = @LIBFFI_PC@
@@ -167,7 +174,6 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -271,6 +277,7 @@ pygioverrides_PYTHON = \
 	GLib.py \
 	Gtk.py \
 	Gdk.py \
+	GObject.py \
 	Gio.py \
 	GIMarshallingTests.py \
 	Pango.py \
@@ -280,7 +287,7 @@ pygioverrides_PYTHON = \
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -305,9 +312,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
diff --git a/gi/overrides/Pango.py b/gi/overrides/Pango.py
index 34c76cc..15d5edc 100644
--- a/gi/overrides/Pango.py
+++ b/gi/overrides/Pango.py
@@ -19,9 +19,9 @@
 # USA
 
 from ..overrides import override
-from ..importer import modules
+from ..module import get_introspection_module
 
-Pango = modules['Pango']._introspection_module
+Pango = get_introspection_module('Pango')
 
 __all__ = []
 
diff --git a/gi/overrides/__init__.py b/gi/overrides/__init__.py
index 0e4c489..b7d365c 100644
--- a/gi/overrides/__init__.py
+++ b/gi/overrides/__init__.py
@@ -1,6 +1,11 @@
 import types
+import warnings
+import functools
 
-from gi import _gobject
+from gi import PyGIDeprecationWarning
+from gi._gobject.constants import \
+    TYPE_NONE, \
+    TYPE_INVALID
 
 # support overrides in different directories than our gi module
 from pkgutil import extend_path
@@ -31,8 +36,8 @@ class _Registry(dict):
             raise KeyError('You have tried to modify the registry outside of the overrides module.  This is not allowed')
 
         g_type = info.get_g_type()
-        assert g_type != _gobject.TYPE_NONE
-        if g_type != _gobject.TYPE_INVALID:
+        assert g_type != TYPE_NONE
+        if g_type != TYPE_INVALID:
             g_type.pytype = value
 
             # strip gi.overrides from module name
@@ -69,3 +74,13 @@ def override(type_):
     else:
         registry.register(type_)
         return type_
+
+
+def deprecated(fn, replacement):
+    '''Decorator for marking methods and classes as deprecated'''
+    @functools.wraps(fn)
+    def wrapped(*args, **kwargs):
+        warnings.warn('%s is deprecated; use %s instead' % (fn.__name__, replacement),
+                      PyGIDeprecationWarning, stacklevel=2)
+        return fn(*args, **kwargs)
+    return wrapped
diff --git a/gi/pygi-argument.c b/gi/pygi-argument.c
index bffe9c4..61453e0 100644
--- a/gi/pygi-argument.c
+++ b/gi/pygi-argument.c
@@ -879,7 +879,15 @@ _pygi_argument_from_object (PyObject   *object,
     switch (type_tag) {
         case GI_TYPE_TAG_VOID:
             g_warn_if_fail (transfer == GI_TRANSFER_NOTHING);
-            arg.v_pointer = object == Py_None ? NULL : object;
+            if (object == Py_None) {
+                arg.v_pointer = NULL;
+            } else if (!PYGLIB_PyLong_Check(object)  && !PyLong_Check(object)) {
+                PyErr_SetString(PyExc_TypeError,
+                    "Pointer assignment is restricted to integer values. "
+                    "See: https://bugzilla.gnome.org/show_bug.cgi?id=683599");
+            } else {
+                arg.v_pointer = PyLong_AsVoidPtr (object);
+            }
             break;
         case GI_TYPE_TAG_BOOLEAN:
         {
@@ -1285,7 +1293,12 @@ array_success:
                     } else if (g_type_is_a (type, G_TYPE_POINTER) || 
                                g_type_is_a (type, G_TYPE_VARIANT) || 
                                type == G_TYPE_NONE) {
-			g_warn_if_fail (g_type_is_a (type, G_TYPE_VARIANT) || !g_type_info_is_pointer (type_info) || transfer == GI_TRANSFER_NOTHING);
+                        g_warn_if_fail (g_type_is_a (type, G_TYPE_VARIANT) || !g_type_info_is_pointer (type_info) || transfer == GI_TRANSFER_NOTHING);
+
+                        if (g_type_is_a (type, G_TYPE_VARIANT) && pyg_type_from_object (object) != G_TYPE_VARIANT) {
+                            PyErr_SetString (PyExc_TypeError, "expected GLib.Variant");
+                            break;
+                        }
                         arg.v_pointer = pyg_pointer_get (object, void);
                     } else {
                         PyErr_Format (PyExc_NotImplementedError, "structure type '%s' is not supported yet", g_type_name (type));
@@ -1531,15 +1544,22 @@ _pygi_argument_to_object (GIArgument  *arg,
     type_tag = g_type_info_get_tag (type_info);
     switch (type_tag) {
         case GI_TYPE_TAG_VOID:
+        {
             if (g_type_info_is_pointer (type_info) &&
                     (arg->v_pointer != NULL)) {
-                /* Raw Python objects are passed to void* args */
                 g_warn_if_fail (transfer == GI_TRANSFER_NOTHING);
-                object = arg->v_pointer;
-            } else
+                object = PyLong_FromVoidPtr (arg->v_pointer);
+            } else {
+                /* None is used instead of zero for parity with ctypes.
+                 * This is helpful in case the values are being used for
+                 * actual memory addressing, in which case None will
+                 * raise as opposed to 0 which will crash.
+                 */
                 object = Py_None;
-            Py_XINCREF (object);
+                Py_INCREF (object);
+            }
             break;
+        }
         case GI_TYPE_TAG_BOOLEAN:
         {
             object = PyBool_FromLong (arg->v_boolean);
diff --git a/gi/pygi-boxed.c b/gi/pygi-boxed.c
index 2fd446c..ff3db9b 100644
--- a/gi/pygi-boxed.c
+++ b/gi/pygi-boxed.c
@@ -165,6 +165,17 @@ _pygi_boxed_new (PyTypeObject *type,
     return (PyObject *) self;
 }
 
+static PyObject *
+_pygi_boxed_get_free_on_dealloc(PyGIBoxed *self, void *closure)
+{
+  return PyBool_FromLong( ((PyGBoxed *)self)->free_on_dealloc );
+}
+
+static PyGetSetDef pygi_boxed_getsets[] = {
+    { "_free_on_dealloc", (getter)_pygi_boxed_get_free_on_dealloc, (setter)0 },
+    { NULL, 0, 0 }
+};
+
 void
 _pygi_boxed_register_types (PyObject *m)
 {
@@ -174,6 +185,7 @@ _pygi_boxed_register_types (PyObject *m)
     PyGIBoxed_Type.tp_init = (initproc) _boxed_init;
     PyGIBoxed_Type.tp_dealloc = (destructor) _boxed_dealloc;
     PyGIBoxed_Type.tp_flags = (Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE);
+    PyGIBoxed_Type.tp_getset = pygi_boxed_getsets;
 
     if (PyType_Ready (&PyGIBoxed_Type))
         return;
diff --git a/gi/pygi-callbacks.c b/gi/pygi-callbacks.c
deleted file mode 100644
index 32ddf63..0000000
--- a/gi/pygi-callbacks.c
+++ /dev/null
@@ -1,217 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- * vim: tabstop=4 shiftwidth=4 expandtab
- *
- *   pygi-callbacks.c: PyGI C Callback Functions and Helpers
- *
- * This library 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 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- */
-
-#include "pygi-private.h"
-
-static PyGICClosure *global_destroy_notify;
-
-static void
-_pygi_destroy_notify_callback_closure (ffi_cif *cif,
-                                       void *result,
-                                       void **args,
-                                       void *data)
-{
-    PyGICClosure *info = * (void**) (args[0]);
-
-    g_assert (info);
-
-    _pygi_invoke_closure_free (info);
-}
-
-
-PyGICClosure*
-_pygi_destroy_notify_create (void)
-{
-    if (!global_destroy_notify) {
-
-        PyGICClosure *destroy_notify = g_slice_new0 (PyGICClosure);
-
-        g_assert (destroy_notify);
-
-        GIBaseInfo* glib_destroy_notify = g_irepository_find_by_name (NULL, "GLib", "DestroyNotify");
-        g_assert (glib_destroy_notify != NULL);
-        g_assert (g_base_info_get_type (glib_destroy_notify) == GI_INFO_TYPE_CALLBACK);
-
-        destroy_notify->closure = g_callable_info_prepare_closure ( (GICallableInfo*) glib_destroy_notify,
-                                                                    &destroy_notify->cif,
-                                                                    _pygi_destroy_notify_callback_closure,
-                                                                    NULL);
-
-        global_destroy_notify = destroy_notify;
-    }
-
-    return global_destroy_notify;
-}
-
-
-gboolean
-_pygi_scan_for_callbacks (GIFunctionInfo *function_info,
-                          gboolean       is_method,
-                          guint8        *callback_index,
-                          guint8        *user_data_index,
-                          guint8        *destroy_notify_index)
-{
-    guint i, n_args;
-
-    *callback_index = G_MAXUINT8;
-    *user_data_index = G_MAXUINT8;
-    *destroy_notify_index = G_MAXUINT8;
-
-    n_args = g_callable_info_get_n_args ( (GICallableInfo *) function_info);
-    for (i = 0; i < n_args; i++) {
-        GIArgInfo *arg_info;
-        GITypeInfo *type_info;
-        guint8 destroy, closure;
-        GITypeTag type_tag;
-
-        arg_info = g_callable_info_get_arg ( (GICallableInfo*) function_info, i);
-        type_info = g_arg_info_get_type (arg_info);
-        type_tag = g_type_info_get_tag (type_info);
-
-        if (type_tag == GI_TYPE_TAG_INTERFACE) {
-            GIBaseInfo* interface_info;
-            GIInfoType interface_type;
-
-            interface_info = g_type_info_get_interface (type_info);
-            interface_type = g_base_info_get_type (interface_info);
-            if (interface_type == GI_INFO_TYPE_CALLBACK &&
-                    ! (strcmp (g_base_info_get_namespace ( (GIBaseInfo*) interface_info), "GLib") == 0 &&
-                       (strcmp (g_base_info_get_name ( (GIBaseInfo*) interface_info), "DestroyNotify") == 0 ||
-                       (strcmp (g_base_info_get_name ( (GIBaseInfo*) interface_info), "FreeFunc") == 0)))) {
-                if (*callback_index != G_MAXUINT8) {
-                    PyErr_Format (PyExc_TypeError, "Function %s.%s has multiple callbacks, not supported",
-                                  g_base_info_get_namespace ( (GIBaseInfo*) function_info),
-                                  g_base_info_get_name ( (GIBaseInfo*) function_info));
-                    g_base_info_unref (interface_info);
-                    return FALSE;
-                }
-                *callback_index = i;
-            }
-            g_base_info_unref (interface_info);
-        }
-        destroy = g_arg_info_get_destroy (arg_info);
-        
-        closure = g_arg_info_get_closure (arg_info);
-
-        if (destroy > 0 && destroy < n_args) {
-            if (*destroy_notify_index != G_MAXUINT8) {
-                PyErr_Format (PyExc_TypeError, "Function %s has multiple GDestroyNotify, not supported",
-                              g_base_info_get_name ( (GIBaseInfo*) function_info));
-                return FALSE;
-            }
-            *destroy_notify_index = destroy;
-        }
-
-        if (closure > 0 && closure < n_args) {
-            if (*user_data_index != G_MAXUINT8) {
-                PyErr_Format (PyExc_TypeError, "Function %s has multiple user_data arguments, not supported",
-                              g_base_info_get_name ( (GIBaseInfo*) function_info));
-                return FALSE;
-            }
-            *user_data_index = closure;
-        }
-
-        g_base_info_unref ( (GIBaseInfo*) arg_info);
-        g_base_info_unref ( (GIBaseInfo*) type_info);
-    }
-
-    return TRUE;
-}
-
-gboolean
-_pygi_create_callback (GIBaseInfo  *function_info,
-                       gboolean       is_method,
-                       gboolean       is_constructor,
-                       int            n_args,
-                       Py_ssize_t     py_argc,
-                       PyObject      *py_argv,
-                       guint8         callback_index,
-                       guint8         user_data_index,
-                       guint8         destroy_notify_index,
-                       PyGICClosure **closure_out)
-{
-    GIArgInfo *callback_arg;
-    GITypeInfo *callback_type;
-    GICallbackInfo *callback_info;
-    gboolean found_py_function;
-    PyObject *py_function;
-    guint8 i, py_argv_pos;
-    PyObject *py_user_data;
-    gboolean allow_none;
-
-    callback_arg = g_callable_info_get_arg ( (GICallableInfo*) function_info, callback_index);
-    allow_none = g_arg_info_may_be_null (callback_arg);
-
-    callback_type = g_arg_info_get_type (callback_arg);
-    g_assert (g_type_info_get_tag (callback_type) == GI_TYPE_TAG_INTERFACE);
-
-    callback_info = (GICallbackInfo*) g_type_info_get_interface (callback_type);
-    g_assert (g_base_info_get_type ( (GIBaseInfo*) callback_info) == GI_INFO_TYPE_CALLBACK);
-
-    /* Find the Python function passed for the callback */
-    found_py_function = FALSE;
-    py_function = Py_None;
-    py_user_data = NULL;
-
-    /* if its a method then we need to skip over 'self' */
-    if (is_method || is_constructor)
-        py_argv_pos = 1;
-    else
-        py_argv_pos = 0;
-
-    for (i = 0; i < n_args && i < py_argc; i++) {
-        if (i == callback_index) {
-            py_function = PyTuple_GetItem (py_argv, py_argv_pos);
-            /* if we allow none then set the closure to NULL and return */
-            if (allow_none && py_function == Py_None) {
-                *closure_out = NULL;
-                goto out;
-            }
-            found_py_function = TRUE;
-        } else if (i == user_data_index) {
-            py_user_data = PyTuple_GetItem (py_argv, py_argv_pos);
-        }
-        py_argv_pos++;
-    }
-
-    if (!found_py_function
-            || (py_function == Py_None || !PyCallable_Check (py_function))) {
-        PyErr_Format (PyExc_TypeError, "Error invoking %s.%s: Unexpected value "
-                      "for argument '%s'",
-                      g_base_info_get_namespace ( (GIBaseInfo*) function_info),
-                      g_base_info_get_name ( (GIBaseInfo*) function_info),
-                      g_base_info_get_name ( (GIBaseInfo*) callback_arg));
-        g_base_info_unref ( (GIBaseInfo*) callback_info);
-        g_base_info_unref ( (GIBaseInfo*) callback_type);
-        return FALSE;
-    }
-
-    /** Now actually build the closure **/
-    *closure_out = _pygi_make_native_closure ( (GICallableInfo *) callback_info,
-                                               g_arg_info_get_scope (callback_arg),
-                                               py_function,
-                                               py_user_data);
-out:
-    g_base_info_unref ( (GIBaseInfo*) callback_info);
-    g_base_info_unref ( (GIBaseInfo*) callback_type);
-
-    return TRUE;
-}
diff --git a/gi/pygi-callbacks.h b/gi/pygi-callbacks.h
deleted file mode 100644
index 7535bba..0000000
--- a/gi/pygi-callbacks.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- * vim: tabstop=4 shiftwidth=4 expandtab
- *
- * This library 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 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- */
-
-#ifndef __PYGI_CALLBACKS_H__
-#define __PYGI_CALLBACKS_H__
-
-G_BEGIN_DECLS
-
-void _pygi_callback_notify_info_free (gpointer user_data);
-
-PyGICClosure*_pygi_destroy_notify_create (void);
-
-gboolean _pygi_scan_for_callbacks (GIFunctionInfo *self,
-                                   gboolean       is_method,
-                                   guint8        *callback_index,
-                                   guint8        *user_data_index,
-                                   guint8        *destroy_notify_index);
-
-gboolean _pygi_create_callback (GIFunctionInfo *self,
-                                gboolean       is_method,
-                                gboolean       is_constructor,
-                                int            n_args,
-                                Py_ssize_t     py_argc,
-                                PyObject      *py_argv,
-                                guint8         callback_index,
-                                guint8         user_data_index,
-                                guint8         destroy_notify_index,
-                                PyGICClosure **closure_out);
-
-G_END_DECLS
-
-#endif
diff --git a/gi/pygi-foreign-cairo.c b/gi/pygi-foreign-cairo.c
index d1846c5..3fe6a39 100644
--- a/gi/pygi-foreign-cairo.c
+++ b/gi/pygi-foreign-cairo.c
@@ -26,11 +26,11 @@
 
 #if PY_VERSION_HEX < 0x03000000
 #include <pycairo.h>
+static Pycairo_CAPI_t *Pycairo_CAPI;
 #else
 #include <pycairo/py3cairo.h>
 #endif
 
-static Pycairo_CAPI_t *Pycairo_CAPI;
 
 #include "pygi-foreign.h"
 
@@ -191,7 +191,7 @@ PYGLIB_MODULE_START(_gi_cairo, "_gi_cairo")
 #if PY_VERSION_HEX < 0x03000000
     Pycairo_IMPORT;
 #else
-    Pycairo_CAPI = (Pycairo_CAPI_t*) PyCapsule_Import("cairo.CAPI", 0);
+    import_cairo();
 #endif
 
     if (Pycairo_CAPI == NULL)
diff --git a/gi/pygi-foreign-gvariant.c b/gi/pygi-foreign-gvariant.c
deleted file mode 100644
index e799d98..0000000
--- a/gi/pygi-foreign-gvariant.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
-/*
- * Copyright (c) 2010  Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-#include "pygobject.h"
-
-#include "pygi-private.h"
-#include "pygi-foreign-gvariant.h"
-
-PyObject *
-g_variant_to_arg (PyObject        *value,
-                  GIInterfaceInfo *interface_info,
-                  GITransfer       transfer,
-                  GIArgument      *arg)
-{
-    g_assert (transfer == GI_TRANSFER_NOTHING);
-
-    /* TODO check that value is a PyGPointer */
-
-    arg->v_pointer = (GVariant *) ( (PyGPointer *) value)->pointer;
-    Py_RETURN_NONE;
-}
-
-PyObject *
-g_variant_from_arg (GIInterfaceInfo *interface_info,
-                    gpointer         data)
-{
-    GVariant *variant = (GVariant *) data;
-
-    PyObject *type = _pygi_type_import_by_gi_info (interface_info);
-
-    g_variant_ref_sink (variant);
-
-    return _pygi_struct_new ( (PyTypeObject *) type, variant, FALSE);
-}
-
-PyObject *
-g_variant_release_foreign (GIBaseInfo *base_info,
-                           gpointer struct_)
-{
-    g_variant_unref ( (GVariant *) struct_);
-    Py_RETURN_NONE;
-}
-
diff --git a/gi/pygi-foreign.c b/gi/pygi-foreign.c
index 14d20af..ef5abaa 100644
--- a/gi/pygi-foreign.c
+++ b/gi/pygi-foreign.c
@@ -26,8 +26,8 @@
 #  include <config.h>
 #endif
 
+#include "pygobject.h"
 #include "pygi-foreign.h"
-#include "pygi-foreign-gvariant.h"
 
 #include <girepository.h>
 
@@ -45,12 +45,6 @@ static void
 init_foreign_structs ()
 {
     foreign_structs = g_ptr_array_new ();
-
-    pygi_register_foreign_struct ("GLib",
-                                  "Variant",
-                                  g_variant_to_arg,
-                                  g_variant_from_arg,
-                                  g_variant_release_foreign);
 }
 
 static PyGIForeignStruct *
diff --git a/gi/pygi-info.c b/gi/pygi-info.c
index 6f93eee..e726b2d 100644
--- a/gi/pygi-info.c
+++ b/gi/pygi-info.c
@@ -357,13 +357,91 @@ static PyMethodDef _PyGIPropertyInfo_methods[] = {
     { NULL, NULL, 0 }
 };
 
+
 /* ArgInfo */
 PYGLIB_DEFINE_TYPE ("gi.ArgInfo", PyGIArgInfo_Type, PyGIBaseInfo);
 
+static PyObject *
+_wrap_g_arg_info_get_direction (PyGIBaseInfo *self)
+{
+    return PyLong_FromLong (
+	    g_arg_info_get_direction ((GIArgInfo*)self->info) );
+}
+
+static PyObject *
+_wrap_g_arg_info_is_caller_allocates (PyGIBaseInfo *self)
+{
+    return PyBool_FromLong (
+	    g_arg_info_is_caller_allocates ((GIArgInfo*)self->info) );
+}
+
+static PyObject *
+_wrap_g_arg_info_is_return_value (PyGIBaseInfo *self)
+{
+    return PyBool_FromLong (
+	    g_arg_info_is_return_value ((GIArgInfo*)self->info) );
+}
+
+static PyObject *
+_wrap_g_arg_info_is_optional (PyGIBaseInfo *self)
+{
+    return PyBool_FromLong (
+	    g_arg_info_is_optional ((GIArgInfo*)self->info) );
+}
+
+static PyObject *
+_wrap_g_arg_info_may_be_null (PyGIBaseInfo *self)
+{
+    return PyBool_FromLong (
+	    g_arg_info_may_be_null ((GIArgInfo*)self->info) );
+}
+
+/* _g_arg_get_pytype_hint
+ *
+ * Returns new value reference to a string hinting at the python type
+ * which can be used for the given gi argument info.
+ */
+static PyObject *
+_g_arg_get_pytype_hint (PyGIBaseInfo *self)
+{
+    GIArgInfo *arg_info = (GIArgInfo*)self->info;
+    GITypeInfo type_info;
+    g_arg_info_load_type(arg_info, &type_info);
+    GITypeTag type_tag = g_type_info_get_tag(&type_info);
+
+    /* First attempt getting a python type object. */
+    PyObject *py_type = _pygi_get_py_type_hint(type_tag);
+    if (py_type != Py_None && PyObject_HasAttrString(py_type, "__name__")) {
+	PyObject *name = PyObject_GetAttrString(py_type, "__name__");
+	Py_DecRef(py_type);
+	return name;
+    } else {
+	Py_DecRef(py_type);
+	if (type_tag == GI_TYPE_TAG_INTERFACE) {
+	    GIBaseInfo *iface = g_type_info_get_interface(&type_info);
+	    gchar *name = g_strdup_printf("%s.%s",
+		    g_base_info_get_namespace(iface),
+		    g_base_info_get_name (iface));
+	    g_base_info_unref(iface);
+	    PyObject *py_string = PYGLIB_PyUnicode_FromString(name);
+	    g_free(name);
+	    return py_string;
+	}
+	return PYGLIB_PyUnicode_FromString(g_type_tag_to_string(type_tag));
+    }
+}
+
 static PyMethodDef _PyGIArgInfo_methods[] = {
+    { "get_direction", (PyCFunction) _wrap_g_arg_info_get_direction, METH_NOARGS },
+    { "is_caller_allocates", (PyCFunction) _wrap_g_arg_info_is_caller_allocates, METH_NOARGS },
+    { "is_return_value", (PyCFunction) _wrap_g_arg_info_is_return_value, METH_NOARGS },
+    { "is_optional", (PyCFunction) _wrap_g_arg_info_is_optional, METH_NOARGS },
+    { "may_be_null", (PyCFunction) _wrap_g_arg_info_may_be_null, METH_NOARGS },
+    { "get_pytype_hint", (PyCFunction) _g_arg_get_pytype_hint, METH_NOARGS },
     { NULL, NULL, 0 }
 };
 
+
 /* TypeInfo */
 PYGLIB_DEFINE_TYPE ("gi.TypeInfo", PyGITypeInfo_Type, PyGIBaseInfo);
 
@@ -1433,34 +1511,14 @@ _wrap_g_field_info_set_value (PyGIBaseInfo *self,
         g_base_info_unref (info);
     } else if (g_type_info_is_pointer (field_type_info)
             && g_type_info_get_tag (field_type_info) == GI_TYPE_TAG_VOID) {
-        int offset;
 
-        if (py_value != Py_None && !PYGLIB_PyLong_Check(py_value)) {
-            if (PyErr_WarnEx(PyExc_RuntimeWarning,
-                         "Usage of gpointers to store objects is being deprecated. "
-                         "Please use integer values only, see: https://bugzilla.gnome.org/show_bug.cgi?id=683599",
-                         1))
-                goto out;
-        }
-
-        offset = g_field_info_get_offset ((GIFieldInfo *) self->info);
         value = _pygi_argument_from_object (py_value, field_type_info, GI_TRANSFER_NOTHING);
+        if (PyErr_Occurred()) {
+            goto out;
+        }
 
-        /* Decrement the previous python object stashed on the void pointer.
-         * This seems somewhat dangerous as the code is blindly assuming any
-         * void pointer field stores a python object pointer and then decrefs it.
-         * This is essentially the same as something like:
-         *  Py_XDECREF(struct->void_ptr); */
-        Py_XDECREF(G_STRUCT_MEMBER (gpointer, pointer, offset));
-
-        /* Assign and increment the newly assigned object. At this point the value
-         * arg will hold a pointer the python object "py_value" or NULL.
-         * This is essentially:
-         *  struct->void_ptr = value.v_pointer;
-         *  Py_XINCREF(struct->void_ptr);
-         */
+        int offset = g_field_info_get_offset ((GIFieldInfo *) self->info);
         G_STRUCT_MEMBER (gpointer, pointer, offset) = (gpointer)value.v_pointer;
-        Py_XINCREF(G_STRUCT_MEMBER (gpointer, pointer, offset));
 
         retval = Py_None;
         goto out;
@@ -1664,27 +1722,34 @@ _pygi_info_register_types (PyObject *m)
     if (PyModule_AddObject(m, "BaseInfo", (PyObject *)&PyGIBaseInfo_Type))
         return;
 
+    if (PyModule_AddObject(m, "DIRECTION_IN", PyLong_FromLong(GI_DIRECTION_IN)))
+        return;
+    if (PyModule_AddObject(m, "DIRECTION_OUT", PyLong_FromLong(GI_DIRECTION_OUT)))
+        return;
+    if (PyModule_AddObject(m, "DIRECTION_INOUT", PyLong_FromLong(GI_DIRECTION_INOUT)))
+        return;
+
     _PyGI_REGISTER_TYPE (m, PyGIUnresolvedInfo_Type, UnresolvedInfo,
                          PyGIBaseInfo_Type);
-    _PyGI_REGISTER_TYPE (m, PyGICallableInfo_Type, CallableInfo, 
+    _PyGI_REGISTER_TYPE (m, PyGICallableInfo_Type, CallableInfo,
                          PyGIBaseInfo_Type);
     _PyGI_REGISTER_TYPE (m, PyGICallbackInfo_Type, CallbackInfo,
                          PyGIBaseInfo_Type);
-    _PyGI_REGISTER_TYPE (m, PyGIFunctionInfo_Type, FunctionInfo, 
+    _PyGI_REGISTER_TYPE (m, PyGIFunctionInfo_Type, FunctionInfo,
                          PyGICallableInfo_Type);
-    _PyGI_REGISTER_TYPE (m, PyGIRegisteredTypeInfo_Type, RegisteredTypeInfo, 
+    _PyGI_REGISTER_TYPE (m, PyGIRegisteredTypeInfo_Type, RegisteredTypeInfo,
                          PyGIBaseInfo_Type);
-    _PyGI_REGISTER_TYPE (m, PyGIStructInfo_Type, StructInfo, 
+    _PyGI_REGISTER_TYPE (m, PyGIStructInfo_Type, StructInfo,
                          PyGIRegisteredTypeInfo_Type);
-    _PyGI_REGISTER_TYPE (m, PyGIEnumInfo_Type, EnumInfo, 
+    _PyGI_REGISTER_TYPE (m, PyGIEnumInfo_Type, EnumInfo,
                          PyGIRegisteredTypeInfo_Type);
-    _PyGI_REGISTER_TYPE (m, PyGIObjectInfo_Type, ObjectInfo, 
+    _PyGI_REGISTER_TYPE (m, PyGIObjectInfo_Type, ObjectInfo,
                          PyGIRegisteredTypeInfo_Type);
-    _PyGI_REGISTER_TYPE (m, PyGIInterfaceInfo_Type, InterfaceInfo, 
+    _PyGI_REGISTER_TYPE (m, PyGIInterfaceInfo_Type, InterfaceInfo,
                          PyGIRegisteredTypeInfo_Type);
-    _PyGI_REGISTER_TYPE (m, PyGIConstantInfo_Type, ConstantInfo, 
+    _PyGI_REGISTER_TYPE (m, PyGIConstantInfo_Type, ConstantInfo,
                          PyGIBaseInfo_Type);
-    _PyGI_REGISTER_TYPE (m, PyGIValueInfo_Type, ValueInfo, 
+    _PyGI_REGISTER_TYPE (m, PyGIValueInfo_Type, ValueInfo,
                          PyGIBaseInfo_Type);
     _PyGI_REGISTER_TYPE (m, PyGIFieldInfo_Type, FieldInfo,
                          PyGIBaseInfo_Type);
diff --git a/gi/pygi-marshal-from-py.c b/gi/pygi-marshal-from-py.c
index b4c9fa0..dc14ca5 100644
--- a/gi/pygi-marshal-from-py.c
+++ b/gi/pygi-marshal-from-py.c
@@ -40,11 +40,39 @@ gi_argument_from_py_ssize_t (GIArgument   *arg_out,
     switch (type_tag) {
     case GI_TYPE_TAG_VOID:
     case GI_TYPE_TAG_BOOLEAN:
+        goto unhandled_type;
+
     case GI_TYPE_TAG_INT8:
+        if (size_in >= G_MININT8 && size_in <= G_MAXINT8) {
+            arg_out->v_int8 = size_in;
+            return TRUE;
+        } else {
+            goto overflow;
+        }
+
     case GI_TYPE_TAG_UINT8:
+        if (size_in >= 0 && size_in <= G_MAXUINT8) {
+            arg_out->v_uint8 = size_in;
+            return TRUE;
+        } else {
+            goto overflow;
+        }
+
     case GI_TYPE_TAG_INT16:
+        if (size_in >= G_MININT16 && size_in <= G_MAXINT16) {
+            arg_out->v_int16 = size_in;
+            return TRUE;
+        } else {
+            goto overflow;
+        }
+
     case GI_TYPE_TAG_UINT16:
-        goto unhandled_type;
+        if (size_in >= 0 && size_in <= G_MAXUINT16) {
+            arg_out->v_uint16 = size_in;
+            return TRUE;
+        } else {
+            goto overflow;
+        }
 
         /* Ranges assume two's complement */
     case GI_TYPE_TAG_INT32:
@@ -902,6 +930,7 @@ _pygi_marshal_from_py_array (PyGIInvokeState   *state,
     if (sequence_cache->item_cache->type_tag == GI_TYPE_TAG_UINT8 &&
         PYGLIB_PyBytes_Check (py_arg)) {
         memcpy(array_->data, PYGLIB_PyBytes_AsString (py_arg), length);
+        array_->len = length;
         if (sequence_cache->is_zero_terminated) {
             /* If array_ has been created with zero_termination, space for the
              * terminator is properly allocated, so we're not off-by-one here. */
@@ -1314,6 +1343,50 @@ static void
 _pygi_destroy_notify_dummy (gpointer data) {
 }
 
+static PyGICClosure *global_destroy_notify;
+
+static void
+_pygi_destroy_notify_callback_closure (ffi_cif *cif,
+                                       void *result,
+                                       void **args,
+                                       void *data)
+{
+    PyGICClosure *info = * (void**) (args[0]);
+
+    g_assert (info);
+
+    _pygi_invoke_closure_free (info);
+}
+
+/* _pygi_destroy_notify_create:
+ *
+ * Method used in the occasion when a method has a GDestroyNotify
+ * argument with user data.
+ */
+static PyGICClosure*
+_pygi_destroy_notify_create (void)
+{
+    if (!global_destroy_notify) {
+
+        PyGICClosure *destroy_notify = g_slice_new0 (PyGICClosure);
+
+        g_assert (destroy_notify);
+
+        GIBaseInfo* glib_destroy_notify = g_irepository_find_by_name (NULL, "GLib", "DestroyNotify");
+        g_assert (glib_destroy_notify != NULL);
+        g_assert (g_base_info_get_type (glib_destroy_notify) == GI_INFO_TYPE_CALLBACK);
+
+        destroy_notify->closure = g_callable_info_prepare_closure ( (GICallableInfo*) glib_destroy_notify,
+                                                                    &destroy_notify->cif,
+                                                                    _pygi_destroy_notify_callback_closure,
+                                                                    NULL);
+
+        global_destroy_notify = destroy_notify;
+    }
+
+    return global_destroy_notify;
+}
+
 gboolean
 _pygi_marshal_from_py_interface_callback (PyGIInvokeState   *state,
                                           PyGICallableCache *callable_cache,
diff --git a/gi/pygi-marshal-to-py.c b/gi/pygi-marshal-to-py.c
index 811d8b0..950895d 100644
--- a/gi/pygi-marshal-to-py.c
+++ b/gi/pygi-marshal-to-py.c
@@ -439,7 +439,10 @@ _pygi_marshal_to_py_array (PyGIInvokeState   *state,
                                 memcpy (_struct, array_->data + i * item_size,
                                         item_size);
                                 item_arg.v_pointer = _struct;
-                            } else
+                            } else if (item_arg_cache->is_pointer)
+                                /* this is the case for GAtom* arrays */
+                                item_arg.v_pointer = g_array_index (array_, gpointer, i);
+                            else
                                 item_arg.v_pointer = array_->data + i * item_size;
                             break;
                         default:
diff --git a/gi/pygi-private.h b/gi/pygi-private.h
index 29ec131..1f59fdf 100644
--- a/gi/pygi-private.h
+++ b/gi/pygi-private.h
@@ -27,11 +27,11 @@
 #include "pygi-foreign.h"
 #include "pygi-closure.h"
 #include "pygi-ccallback.h"
-#include "pygi-callbacks.h"
 #include "pygi-property.h"
 #include "pygi-signal-closure.h"
 #include "pygi-invoke.h"
 #include "pygi-cache.h"
+#include "pygi-source.h"
 
 G_BEGIN_DECLS
 #if PY_VERSION_HEX >= 0x03000000
diff --git a/gi/pygi-property.c b/gi/pygi-property.c
index 14564d0..6079efc 100644
--- a/gi/pygi-property.c
+++ b/gi/pygi-property.c
@@ -25,92 +25,95 @@
 
 #include <girepository.h>
 
-/* Copied from glib */
-static void
-canonicalize_key (gchar *key)
+static GIPropertyInfo *
+lookup_property_from_object_info (GIObjectInfo *info, const gchar *attr_name)
 {
-    gchar *p;
+    gssize n_infos;
+    gssize i;
+
+    n_infos = g_object_info_get_n_properties (info);
+    for (i = 0; i < n_infos; i++) {
+        GIPropertyInfo *property_info;
+
+        property_info = g_object_info_get_property (info, i);
+        g_assert (info != NULL);
 
-    for (p = key; *p != 0; p++)
-    {
-        gchar c = *p;
+        if (strcmp (attr_name, g_base_info_get_name (property_info)) == 0) {
+            return property_info;
+        }
 
-        if (c != '-' &&
-            (c < '0' || c > '9') &&
-            (c < 'A' || c > 'Z') &&
-            (c < 'a' || c > 'z'))
-                *p = '-';
+        g_base_info_unref (property_info);
     }
+
+    return NULL;
 }
 
 static GIPropertyInfo *
-_pygi_lookup_property_from_g_type (GType g_type, const gchar *attr_name)
+lookup_property_from_interface_info (GIInterfaceInfo *info,
+                                     const gchar *attr_name)
 {
-    GIRepository *repository;
-    GIBaseInfo *info;
     gssize n_infos;
     gssize i;
-    GType parent;
-
-    repository = g_irepository_get_default();
-    info = g_irepository_find_by_gtype (repository, g_type);
-    if (info != NULL) {
 
-        n_infos = g_object_info_get_n_properties ( (GIObjectInfo *) info);
-        for (i = 0; i < n_infos; i++) {
-            GIPropertyInfo *property_info;
+    n_infos = g_interface_info_get_n_properties (info);
+    for (i = 0; i < n_infos; i++) {
+        GIPropertyInfo *property_info;
 
-            property_info = g_object_info_get_property ( (GIObjectInfo *) info,
-                                                         i);
-            g_assert (info != NULL);
+        property_info = g_interface_info_get_property (info, i);
+        g_assert (info != NULL);
 
-            if (strcmp (attr_name, g_base_info_get_name (property_info)) == 0) {
-                g_base_info_unref (info);
-                return property_info;
-            }
-
-            g_base_info_unref (property_info);
+        if (strcmp (attr_name, g_base_info_get_name (property_info)) == 0) {
+            return property_info;
         }
 
-        g_base_info_unref (info);
+        g_base_info_unref (property_info);
     }
 
-    parent = g_type_parent (g_type);
-    if (parent > 0)
-        return _pygi_lookup_property_from_g_type (parent, attr_name);
-
     return NULL;
 }
 
+static GIPropertyInfo *
+_pygi_lookup_property_from_g_type (GType g_type, const gchar *attr_name)
+{
+    GIPropertyInfo *ret = NULL;
+    GIRepository *repository;
+    GIBaseInfo *info;
+
+    repository = g_irepository_get_default();
+    info = g_irepository_find_by_gtype (repository, g_type);
+    if (info == NULL)
+       return NULL;
+
+    if (GI_IS_OBJECT_INFO (info))
+        ret = lookup_property_from_object_info ((GIObjectInfo *) info,
+                                                attr_name);
+    else if (GI_IS_INTERFACE_INFO (info))
+        ret = lookup_property_from_interface_info ((GIInterfaceInfo *) info,
+                                                   attr_name);
+
+    g_base_info_unref (info);
+    return ret;
+}
+
 PyObject *
-pygi_get_property_value_real (PyGObject *instance,
-                              const gchar *attr_name)
+pygi_get_property_value_real (PyGObject *instance, GParamSpec *pspec)
 {
-    GType g_type;
     GIPropertyInfo *property_info = NULL;
-    char *property_name = g_strdup (attr_name);
-    GParamSpec *pspec = NULL;
     GValue value = { 0, };
     GIArgument arg = { 0, };
     PyObject *py_value = NULL;
     GITypeInfo *type_info = NULL;
     GITransfer transfer;
 
-    canonicalize_key (property_name);
-
-    g_type = pyg_type_from_object ((PyObject *)instance);
-    property_info = _pygi_lookup_property_from_g_type (g_type, property_name);
+    /* The owner_type of the pspec gives us the exact type that introduced the
+     * property, even if it is a parent class of the instance in question. */
+    property_info = _pygi_lookup_property_from_g_type (pspec->owner_type, pspec->name);
 
     if (property_info == NULL)
         goto out;
 
-    pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (instance->obj),
-                                          attr_name);
-    if (pspec == NULL)
-        goto out;
-
     g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (pspec));
-    g_object_get_property (instance->obj, attr_name, &value);
+    g_object_get_property (instance->obj, pspec->name, &value);
 
     type_info = g_property_info_get_type (property_info);
     transfer = g_property_info_get_ownership_transfer (property_info);
@@ -193,6 +196,8 @@ pygi_get_property_value_real (PyGObject *instance,
                         arg.v_pointer = g_value_get_boxed (&value);
                     } else if (g_type_is_a (type, G_TYPE_POINTER)) {
                         arg.v_pointer = g_value_get_pointer (&value);
+                    } else if (g_type_is_a (type, G_TYPE_VARIANT)) {
+                        arg.v_pointer = g_value_get_variant (&value);
                     } else {
                         PyErr_Format (PyExc_NotImplementedError,
                                       "Retrieving properties of type '%s' is not implemented",
@@ -243,7 +248,6 @@ pygi_get_property_value_real (PyGObject *instance,
     py_value = _pygi_argument_to_object (&arg, type_info, transfer);
 
 out:
-    g_free (property_name);
     if (property_info != NULL)
         g_base_info_unref (property_info);
     if (type_info != NULL)
@@ -254,33 +258,24 @@ out:
 
 gint
 pygi_set_property_value_real (PyGObject *instance,
-                              const gchar *attr_name,
+                              GParamSpec *pspec,
                               PyObject *py_value)
 {
-    GType g_type;
     GIPropertyInfo *property_info = NULL;
-    char *property_name = g_strdup (attr_name);
     GITypeInfo *type_info = NULL;
     GITypeTag type_tag;
     GITransfer transfer;
     GValue value = { 0, };
     GIArgument arg = { 0, };
-    GParamSpec *pspec = NULL;
     gint ret_value = -1;
 
-    canonicalize_key (property_name);
-
-    g_type = pyg_type_from_object ((PyObject *)instance);
-    property_info = _pygi_lookup_property_from_g_type (g_type, property_name);
-
+    /* The owner_type of the pspec gives us the exact type that introduced the
+     * property, even if it is a parent class of the instance in question. */
+    property_info = _pygi_lookup_property_from_g_type (pspec->owner_type,
+                                                       pspec->name);
     if (property_info == NULL)
         goto out;
 
-    pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (instance->obj),
-                                          attr_name);
-    if (pspec == NULL)
-        goto out;
-
     if (! (pspec->flags & G_PARAM_WRITABLE))
         goto out;
 
@@ -321,12 +316,14 @@ pygi_set_property_value_real (PyGObject *instance,
                 case GI_INFO_TYPE_UNION:
                     if (g_type_is_a (type, G_TYPE_BOXED)) {
                         g_value_set_boxed (&value, arg.v_pointer);
+                    } else if (g_type_is_a (type, G_TYPE_VARIANT)) {
+                        g_value_set_variant (&value, arg.v_pointer);
                     } else {
                         PyErr_Format (PyExc_NotImplementedError,
                                       "Setting properties of type '%s' is not implemented",
                                       g_type_name (type));
                     }
-                    break;
+                    goto out;
                 default:
                     PyErr_Format (PyExc_NotImplementedError,
                                   "Setting properties of type '%s' is not implemented",
@@ -391,6 +388,9 @@ pygi_set_property_value_real (PyGObject *instance,
             break;
         case GI_TYPE_TAG_ARRAY:
         {
+            /* This is assumes GI_TYPE_TAG_ARRAY is always a GStrv
+             * https://bugzilla.gnome.org/show_bug.cgi?id=688232
+             */
             GArray *arg_items = (GArray*) arg.v_pointer;
             gchar** strings;
             int i;
@@ -398,12 +398,13 @@ pygi_set_property_value_real (PyGObject *instance,
             if (arg_items == NULL)
                 goto out;
 
-            strings = g_new0 (char*, arg_items->len);
+            strings = g_new0 (char*, arg_items->len + 1);
             for (i = 0; i < arg_items->len; ++i) {
                 strings[i] = g_array_index (arg_items, GIArgument, i).v_string;
             }
-            g_array_free (arg_items, TRUE);
+            strings[arg_items->len] = NULL;
             g_value_set_boxed (&value, strings);
+            g_array_free (arg_items, TRUE);
             break;
         }
         default:
@@ -413,12 +414,11 @@ pygi_set_property_value_real (PyGObject *instance,
             goto out;
     }
 
-    g_object_set_property (instance->obj, attr_name, &value);
+    g_object_set_property (instance->obj, pspec->name, &value);
 
     ret_value = 0;
 
 out:
-    g_free (property_name);
     if (property_info != NULL)
         g_base_info_unref (property_info);
     if (type_info != NULL)
diff --git a/gi/pygi-property.h b/gi/pygi-property.h
index 31d0e42..875d21e 100644
--- a/gi/pygi-property.h
+++ b/gi/pygi-property.h
@@ -30,10 +30,10 @@
 #include "pygi.h"
 
 PyObject *pygi_get_property_value_real (PyGObject *instance,
-                                        const gchar *attr_name);
+                                        GParamSpec *pspec);
 
 gint pygi_set_property_value_real (PyGObject *instance,
-                                   const gchar *attr_name,
+                                   GParamSpec *pspec,
                                    PyObject *py_value);
 
 #endif /* __PYGI_PROPERTY_H__ */
diff --git a/gi/pygi-signal-closure.c b/gi/pygi-signal-closure.c
index 83f9a41..36ea168 100644
--- a/gi/pygi-signal-closure.c
+++ b/gi/pygi-signal-closure.c
@@ -44,29 +44,16 @@ _pygi_lookup_signal_from_g_type (GType g_type,
 {
     GIRepository *repository;
     GIBaseInfo *info;
-    gssize n_infos;
-    gssize i;
     GType parent;
 
     repository = g_irepository_get_default();
     info = g_irepository_find_by_gtype (repository, g_type);
     if (info != NULL) {
-        n_infos = g_object_info_get_n_signals ( (GIObjectInfo *) info);
-        for (i = 0; i < n_infos; i++) {
-            GISignalInfo *signal_info;
-
-            signal_info = g_object_info_get_signal ( (GIObjectInfo *) info, i);
-            g_assert (info != NULL);
-
-            if (strcmp (signal_name, g_base_info_get_name (signal_info)) == 0) {
-                g_base_info_unref (info);
-                return signal_info;
-            }
-
-            g_base_info_unref (signal_info);
-        }
-
+        GISignalInfo *signal_info;
+        signal_info = g_object_info_find_signal ((GIObjectInfo *) info, signal_name);
         g_base_info_unref (info);
+        if (signal_info != NULL)
+            return signal_info;
     }
 
     parent = g_type_parent (g_type);
diff --git a/gi/pygi-source.c b/gi/pygi-source.c
new file mode 100644
index 0000000..73772bd
--- /dev/null
+++ b/gi/pygi-source.c
@@ -0,0 +1,246 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+/*
+ * Copyright (C) 1998-2003  James Henstridge
+ * Copyright (C) 2005       Oracle
+ * Copyright (c) 2012       Canonical Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#define NO_IMPORT
+#include "pygobject.h"
+
+#include "pygi-private.h"
+#include "pyglib.h"
+#include "pyglib-private.h"
+#include "pygi-source.h"
+
+typedef struct
+{
+    GSource source;
+    PyObject *obj;
+} PyGRealSource;
+
+static gboolean
+pyg_source_prepare(GSource *source, gint *timeout)
+{
+    PyGRealSource *pysource = (PyGRealSource *)source;
+    PyObject *t;
+    gboolean ret = FALSE;
+    gboolean got_err = TRUE;
+    PyGILState_STATE state;
+
+    state = pyglib_gil_state_ensure();
+
+    t = PyObject_CallMethod(pysource->obj, "prepare", NULL);
+
+    if (t == NULL) {
+	goto bail;
+    } else if (!PyObject_IsTrue(t)) {
+	got_err = FALSE;
+	goto bail;
+    } else if (!PyTuple_Check(t)) {
+	PyErr_SetString(PyExc_TypeError,
+			"source prepare function must return a tuple or False");
+	goto bail;
+    } else if (PyTuple_Size(t) != 2) {
+	PyErr_SetString(PyExc_TypeError,
+			"source prepare function return tuple must be exactly "
+			"2 elements long");
+	goto bail;
+    }
+
+    ret = PyObject_IsTrue(PyTuple_GET_ITEM(t, 0));
+	*timeout = PYGLIB_PyLong_AsLong(PyTuple_GET_ITEM(t, 1));
+
+	if (*timeout == -1 && PyErr_Occurred()) {
+	    ret = FALSE;
+	    goto bail;
+	}
+
+    got_err = FALSE;
+
+bail:
+    if (got_err)
+	PyErr_Print();
+
+    Py_XDECREF(t);
+
+    pyglib_gil_state_release(state);
+
+    return ret;
+}
+
+static gboolean
+pyg_source_check(GSource *source)
+{
+    PyGRealSource *pysource = (PyGRealSource *)source;
+    PyObject *t;
+    gboolean ret;
+    PyGILState_STATE state;
+
+    state = pyglib_gil_state_ensure();
+
+    t = PyObject_CallMethod(pysource->obj, "check", NULL);
+
+    if (t == NULL) {
+	PyErr_Print();
+	ret = FALSE;
+    } else {
+	ret = PyObject_IsTrue(t);
+	Py_DECREF(t);
+    }
+
+    pyglib_gil_state_release(state);
+
+    return ret;
+}
+
+static gboolean
+pyg_source_dispatch(GSource *source, GSourceFunc callback, gpointer user_data)
+{
+    PyGRealSource *pysource = (PyGRealSource *)source;
+    PyObject *func, *args, *tuple, *t;
+    gboolean ret;
+    PyGILState_STATE state;
+
+    state = pyglib_gil_state_ensure();
+
+    if (callback) {
+	tuple = user_data;
+
+	func = PyTuple_GetItem(tuple, 0);
+        args = PyTuple_GetItem(tuple, 1);
+    } else {
+	func = Py_None;
+	args = Py_None;
+    }
+
+    t = PyObject_CallMethod(pysource->obj, "dispatch", "OO", func, args);
+
+    if (t == NULL) {
+	PyErr_Print();
+	ret = FALSE;
+    } else {
+	ret = PyObject_IsTrue(t);
+	Py_DECREF(t);
+    }
+
+    pyglib_gil_state_release(state);
+
+    return ret;
+}
+
+static void
+pyg_source_finalize(GSource *source)
+{
+    PyGRealSource *pysource = (PyGRealSource *)source;
+    PyObject *func, *t;
+    PyGILState_STATE state;
+
+    state = pyglib_gil_state_ensure();
+
+    func = PyObject_GetAttrString(pysource->obj, "finalize");
+    if (func) {
+	t = PyObject_CallObject(func, NULL);
+	Py_DECREF(func);
+
+	if (t == NULL) {
+	    PyErr_Print();
+	} else {
+	    Py_DECREF(t);
+	}
+    }
+
+    pyglib_gil_state_release(state);
+}
+
+static GSourceFuncs pyg_source_funcs =
+{
+    pyg_source_prepare,
+    pyg_source_check,
+    pyg_source_dispatch,
+    pyg_source_finalize
+};
+
+PyObject *
+pyg_source_set_callback(PyGObject *self_module, PyObject *args)
+{
+    PyObject *self, *first, *callback, *cbargs = NULL, *data;
+    gint len;
+
+    len = PyTuple_Size (args);
+    if (len < 2) {
+	PyErr_SetString(PyExc_TypeError,
+			"set_callback requires at least 2 arguments");
+	return NULL;
+    }
+
+    first = PySequence_GetSlice(args, 0, 2);
+    if (!PyArg_ParseTuple(first, "OO:set_callback", &self, &callback)) {
+	Py_DECREF (first);
+	return NULL;
+    }
+    Py_DECREF(first);
+    
+    if (!pyg_boxed_check (self, G_TYPE_SOURCE)) {
+	PyErr_SetString(PyExc_TypeError, "first argument is not a GLib.Source");
+	return NULL;
+    }
+
+    if (!PyCallable_Check(callback)) {
+	PyErr_SetString(PyExc_TypeError, "second argument not callable");
+	return NULL;
+    }
+
+    cbargs = PySequence_GetSlice(args, 2, len);
+    if (cbargs == NULL)
+	return NULL;
+
+    data = Py_BuildValue("(ON)", callback, cbargs);
+    if (data == NULL)
+	return NULL;
+
+    g_source_set_callback(pyg_boxed_get (self, GSource),
+			  _pyglib_handler_marshal, data,
+			  _pyglib_destroy_notify);
+
+    Py_INCREF(Py_None);
+    return Py_None;
+}
+
+/**
+ * pyg_source_new:
+ *
+ * Wrap the un-bindable g_source_new() and provide wrapper callbacks in the
+ * GSourceFuncs which call back to Python.
+ */
+PyObject*
+pyg_source_new ()
+{
+    PyGRealSource *source = NULL;
+    PyObject      *py_type;
+
+    source = (PyGRealSource*) g_source_new (&pyg_source_funcs, sizeof (PyGRealSource));
+
+    py_type = _pygi_type_import_by_name ("GLib", "Source");
+    source->obj = _pygi_boxed_new ( (PyTypeObject *) py_type, source, FALSE);
+
+    return source->obj;
+}
diff --git a/gi/pygi-foreign-gvariant.h b/gi/pygi-source.h
index 43ea9c7..024cf15 100644
--- a/gi/pygi-foreign-gvariant.h
+++ b/gi/pygi-source.h
@@ -1,6 +1,6 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /*
- * Copyright (c) 2010  Collabora Ltd. <http://www.collabora.co.uk/>
+ * Copyright (c) 2012 Canonical Ltd.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -21,21 +21,11 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef __PYGI_FOREIGN_G_VARIANT_H__
-#define __PYGI_FOREIGN_G_VARIANT_H__
+#ifndef __PYGI_SOURCE_H__
+#define __PYGI_SOURCE_H__
 
-#include "pygi-foreign.h"
+PyObject *pyg_source_new ();
+PyObject *pyg_source_set_callback (PyGObject *self, PyObject *args);
 
-PyObject *g_variant_to_arg(PyObject        *value,
-                           GIInterfaceInfo *interface_info,
-                           GITransfer       transfer,
-                           GIArgument      *arg);
-
-PyObject *g_variant_from_arg(GITypeInfo *type_info,
-                             gpointer    data);
-
-PyObject *g_variant_release_foreign (GIBaseInfo *base_info,
-                                     gpointer    struct_);
-
-#endif /* __PYGI_FOREIGN_G_VARIANT_H__ */
+#endif /* __PYGI_SOURCE_H__ */
 
diff --git a/gi/pygi-type.c b/gi/pygi-type.c
index 129ea98..dfaadb0 100644
--- a/gi/pygi-type.c
+++ b/gi/pygi-type.c
@@ -23,6 +23,8 @@
 
 #include "pygi-private.h"
 
+#include <pyglib-python-compat.h>
+
 
 PyObject *
 _pygi_type_import_by_name (const char *namespace_,
@@ -97,3 +99,61 @@ _pygi_type_get_from_g_type (GType g_type)
     return py_type;
 }
 
+/* _pygi_get_py_type_hint
+ *
+ * This gives a hint to what python type might be used as
+ * a particular gi type.
+ */
+PyObject *
+_pygi_get_py_type_hint(GITypeTag type_tag)
+{
+    PyObject *type = Py_None;
+
+    switch (type_tag) {
+        case GI_TYPE_TAG_BOOLEAN:
+            type = (PyObject *) &PyBool_Type;
+            break;
+
+        case GI_TYPE_TAG_INT8:
+        case GI_TYPE_TAG_UINT8:
+        case GI_TYPE_TAG_INT16:
+        case GI_TYPE_TAG_UINT16:
+        case GI_TYPE_TAG_INT32:
+        case GI_TYPE_TAG_UINT32:
+        case GI_TYPE_TAG_INT64:
+        case GI_TYPE_TAG_UINT64:
+            type = (PyObject *) &PYGLIB_PyLong_Type;
+            break;
+
+        case GI_TYPE_TAG_FLOAT:
+        case GI_TYPE_TAG_DOUBLE:
+            type = (PyObject *) &PyFloat_Type;
+            break;
+
+        case GI_TYPE_TAG_GLIST:
+        case GI_TYPE_TAG_GSLIST:
+        case GI_TYPE_TAG_ARRAY:
+            type = (PyObject *) &PyList_Type;
+            break;
+
+        case GI_TYPE_TAG_GHASH:
+            type = (PyObject *) &PyDict_Type;
+            break;
+
+        case GI_TYPE_TAG_UTF8:
+        case GI_TYPE_TAG_FILENAME:
+        case GI_TYPE_TAG_UNICHAR:
+            type = (PyObject *) &PYGLIB_PyUnicode_Type;
+            break;
+
+        case GI_TYPE_TAG_INTERFACE:
+        case GI_TYPE_TAG_GTYPE:
+        case GI_TYPE_TAG_ERROR:
+        case GI_TYPE_TAG_VOID:
+            break;
+    }
+
+    Py_INCREF(type);
+    return type;
+}
+
diff --git a/gi/pygi-type.h b/gi/pygi-type.h
index bb43d19..01b5994 100644
--- a/gi/pygi-type.h
+++ b/gi/pygi-type.h
@@ -39,6 +39,7 @@ PyObject *_pygi_type_import_by_gi_info (GIBaseInfo *info);
 
 PyObject *_pygi_type_get_from_g_type (GType g_type);
 
+PyObject *_pygi_get_py_type_hint (GITypeTag type_tag);
 
 G_END_DECLS
 
diff --git a/gi/pygi.h b/gi/pygi.h
index 121eae5..86da07f 100644
--- a/gi/pygi.h
+++ b/gi/pygi.h
@@ -77,9 +77,9 @@ typedef PyObject * (*PyGIArgOverrideReleaseFunc) (GITypeInfo *type_info,
 struct PyGI_API {
     PyObject* (*type_import_by_g_type) (GType g_type);
     PyObject* (*get_property_value) (PyGObject *instance,
-                                     const gchar *attr_name);
+                                     GParamSpec *pspec);
     gint (*set_property_value) (PyGObject *instance,
-                                const gchar *attr_name,
+                                GParamSpec *pspec,
                                 PyObject *value);
     GClosure * (*signal_closure_new) (PyGObject *instance,
                                       const gchar *sig_name,
@@ -124,23 +124,23 @@ pygi_type_import_by_g_type (GType g_type)
 
 static inline PyObject *
 pygi_get_property_value (PyGObject *instance,
-                         const gchar *attr_name)
+                         GParamSpec *pspec)
 {
     if (_pygi_import() < 0) {
         return NULL;
     }
-    return PyGI_API->get_property_value(instance, attr_name);
+    return PyGI_API->get_property_value(instance, pspec);
 }
 
 static inline gint
 pygi_set_property_value (PyGObject *instance,
-                         const gchar *attr_name,
+                         GParamSpec *pspec,
                          PyObject *value)
 {
     if (_pygi_import() < 0) {
         return -1;
     }
-    return PyGI_API->set_property_value(instance, attr_name, value);
+    return PyGI_API->set_property_value(instance, pspec, value);
 }
 
 static inline GClosure *
diff --git a/gi/pygobject-external.h b/gi/pygobject-external.h
index 113c229..4a1456d 100644
--- a/gi/pygobject-external.h
+++ b/gi/pygobject-external.h
@@ -26,10 +26,8 @@
 
 G_BEGIN_DECLS
 
-static PyTypeObject *_PyGObject_Type;
 static PyTypeObject *_PyGTypeWrapper_Type;
 
-#define PyGObject_Type (*_PyGObject_Type)
 #define PyGTypeWrapper_Type (*_PyGTypeWrapper_Type)
 
 __attribute__ ( (unused))
@@ -45,7 +43,7 @@ _pygobject_import (void)
         return 1;
     }
 
-    from_list = Py_BuildValue ("(ss)", "GObject", "GType");
+    from_list = Py_BuildValue ("(s)", "GType");
     if (from_list == NULL) {
         return -1;
     }
@@ -58,12 +56,6 @@ _pygobject_import (void)
         return -1;
     }
 
-    _PyGObject_Type = (PyTypeObject *) PyObject_GetAttrString (module, "GObject");
-    if (_PyGObject_Type == NULL) {
-        retval = -1;
-        goto out;
-    }
-
     _PyGTypeWrapper_Type = (PyTypeObject *) PyObject_GetAttrString (module, "GType");
     if (_PyGTypeWrapper_Type == NULL) {
         retval = -1;
diff --git a/gi/pygtkcompat.py b/gi/pygtkcompat.py
index 2c81d3f..91b5cc1 100644
--- a/gi/pygtkcompat.py
+++ b/gi/pygtkcompat.py
@@ -1,501 +1,25 @@
-# -*- Mode: Python; py-indent-offset: 4 -*-
-# vim: tabstop=4 shiftwidth=4 expandtab
-#
-# Copyright (C) 2011-2012 Johan Dahlin <johan@gnome.org>
-#
-# This library 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 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
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
-# USA
-
-"""
-PyGTK compatibility layer.
-
-This modules goes a little bit longer to maintain PyGTK compatibility than
-the normal overrides system.
-
-It is recommended to not depend on this layer, but only use it as an
-intermediate step when porting your application to PyGI.
-
-Compatibility might never be 100%, but the aim is to make it possible to run
-a well behaved PyGTK application mostly unmodified on top of PyGI.
-
-"""
-
-import sys
 import warnings
-
-try:
-    # Python 3
-    from collections import UserList
-    from imp import reload
-    UserList  # pyflakes
-except ImportError:
-    # Python 2 ships that in a different module
-    from UserList import UserList
-    UserList  # pyflakes
-
-import gi
-from gi.repository import GObject
-
-
-def _install_enums(module, dest=None, strip=''):
-    if dest is None:
-        dest = module
-    modname = dest.__name__.rsplit('.', 1)[1].upper()
-    for attr in dir(module):
-        try:
-            obj = getattr(module, attr, None)
-        except:
-            continue
-        try:
-            if issubclass(obj, GObject.GEnum):
-                for value, enum in obj.__enum_values__.items():
-                    name = enum.value_name
-                    name = name.replace(modname + '_', '')
-                    if strip and name.startswith(strip):
-                        name = name[len(strip):]
-                    setattr(dest, name, enum)
-        except TypeError:
-            continue
-        try:
-            if issubclass(obj, GObject.GFlags):
-                for value, flag in obj.__flags_values__.items():
-                    name = flag.value_names[-1].replace(modname + '_', '')
-                    setattr(dest, name, flag)
-        except TypeError:
-            continue
-
-
-def enable():
-    # gobject
-    from gi.repository import GLib
-    sys.modules['glib'] = GLib
-
-    # gobject
-    from gi.repository import GObject
-    sys.modules['gobject'] = GObject
-    from gi._gobject import propertyhelper
-    sys.modules['gobject.propertyhelper'] = propertyhelper
-
-    # gio
-    from gi.repository import Gio
-    sys.modules['gio'] = Gio
-
-_unset = object()
-
-
-def enable_gtk(version='2.0'):
-    # set the default encoding like PyGTK
-    reload(sys)
-    if sys.version_info < (3, 0):
-        sys.setdefaultencoding('utf-8')
-
-    # atk
-    gi.require_version('Atk', '1.0')
-    from gi.repository import Atk
-    sys.modules['atk'] = Atk
-    _install_enums(Atk)
-
-    # pango
-    gi.require_version('Pango', '1.0')
-    from gi.repository import Pango
-    sys.modules['pango'] = Pango
-    _install_enums(Pango)
-
-    # pangocairo
-    gi.require_version('PangoCairo', '1.0')
-    from gi.repository import PangoCairo
-    sys.modules['pangocairo'] = PangoCairo
-
-    # gdk
-    gi.require_version('Gdk', version)
-    gi.require_version('GdkPixbuf', '2.0')
-    from gi.repository import Gdk
-    from gi.repository import GdkPixbuf
-    sys.modules['gtk.gdk'] = Gdk
-    _install_enums(Gdk)
-    _install_enums(GdkPixbuf, dest=Gdk)
-    Gdk._2BUTTON_PRESS = 5
-    Gdk.BUTTON_PRESS = 4
-
-    Gdk.screen_get_default = Gdk.Screen.get_default
-    Gdk.Pixbuf = GdkPixbuf.Pixbuf
-    Gdk.PixbufLoader = GdkPixbuf.PixbufLoader.new_with_type
-    Gdk.pixbuf_new_from_data = GdkPixbuf.Pixbuf.new_from_data
-    Gdk.pixbuf_new_from_file = GdkPixbuf.Pixbuf.new_from_file
-    Gdk.pixbuf_new_from_file_at_scale = GdkPixbuf.Pixbuf.new_from_file_at_scale
-    Gdk.pixbuf_new_from_file_at_size = GdkPixbuf.Pixbuf.new_from_file_at_size
-    Gdk.pixbuf_new_from_inline = GdkPixbuf.Pixbuf.new_from_inline
-    Gdk.pixbuf_new_from_stream = GdkPixbuf.Pixbuf.new_from_stream
-    Gdk.pixbuf_new_from_stream_at_scale = GdkPixbuf.Pixbuf.new_from_stream_at_scale
-    Gdk.pixbuf_new_from_xpm_data = GdkPixbuf.Pixbuf.new_from_xpm_data
-    Gdk.pixbuf_get_file_info = GdkPixbuf.Pixbuf.get_file_info
-
-    orig_get_formats = GdkPixbuf.Pixbuf.get_formats
-
-    def get_formats():
-        formats = orig_get_formats()
-        result = []
-
-        def make_dict(format_):
-            result = {}
-            result['description'] = format_.get_description()
-            result['name'] = format_.get_name()
-            result['mime_types'] = format_.get_mime_types()
-            result['extensions'] = format_.get_extensions()
-            return result
-
-        for format_ in formats:
-            result.append(make_dict(format_))
-        return result
-
-    Gdk.pixbuf_get_formats = get_formats
-
-    orig_get_frame_extents = Gdk.Window.get_frame_extents
-
-    def get_frame_extents(window):
-        try:
-            try:
-                rect = Gdk.Rectangle(0, 0, 0, 0)
-            except TypeError:
-                rect = Gdk.Rectangle()
-            orig_get_frame_extents(window, rect)
-        except TypeError:
-            rect = orig_get_frame_extents(window)
-        return rect
-    Gdk.Window.get_frame_extents = get_frame_extents
-
-    orig_get_origin = Gdk.Window.get_origin
-
-    def get_origin(self):
-        return orig_get_origin(self)[1:]
-    Gdk.Window.get_origin = get_origin
-
-    Gdk.screen_width = Gdk.Screen.width
-    Gdk.screen_height = Gdk.Screen.height
-
-    # gtk
-    gi.require_version('Gtk', version)
-    from gi.repository import Gtk
-    sys.modules['gtk'] = Gtk
-    Gtk.gdk = Gdk
-
-    Gtk.pygtk_version = (2, 99, 0)
-
-    Gtk.gtk_version = (Gtk.MAJOR_VERSION,
-                       Gtk.MINOR_VERSION,
-                       Gtk.MICRO_VERSION)
-    _install_enums(Gtk)
-
-    # Action
-
-    def set_tool_item_type(menuaction, gtype):
-        warnings.warn('set_tool_item_type() is not supported',
-                      DeprecationWarning, stacklevel=2)
-    Gtk.Action.set_tool_item_type = classmethod(set_tool_item_type)
-
-    # Alignment
-
-    orig_Alignment = Gtk.Alignment
-
-    class Alignment(orig_Alignment):
-        def __init__(self, xalign=0.0, yalign=0.0, xscale=0.0, yscale=0.0):
-            orig_Alignment.__init__(self)
-            self.props.xalign = xalign
-            self.props.yalign = yalign
-            self.props.xscale = xscale
-            self.props.yscale = yscale
-
-    Gtk.Alignment = Alignment
-
-    # Box
-
-    orig_pack_end = Gtk.Box.pack_end
-
-    def pack_end(self, child, expand=True, fill=True, padding=0):
-        orig_pack_end(self, child, expand, fill, padding)
-    Gtk.Box.pack_end = pack_end
-
-    orig_pack_start = Gtk.Box.pack_start
-
-    def pack_start(self, child, expand=True, fill=True, padding=0):
-        orig_pack_start(self, child, expand, fill, padding)
-    Gtk.Box.pack_start = pack_start
-
-    # TreeViewColumn
-
-    orig_tree_view_column_pack_end = Gtk.TreeViewColumn.pack_end
-
-    def tree_view_column_pack_end(self, cell, expand=True):
-        orig_tree_view_column_pack_end(self, cell, expand)
-    Gtk.TreeViewColumn.pack_end = tree_view_column_pack_end
-
-    orig_tree_view_column_pack_start = Gtk.TreeViewColumn.pack_start
-
-    def tree_view_column_pack_start(self, cell, expand=True):
-        orig_tree_view_column_pack_start(self, cell, expand)
-    Gtk.TreeViewColumn.pack_start = tree_view_column_pack_start
-
-    # CellLayout
-
-    orig_cell_pack_end = Gtk.CellLayout.pack_end
-
-    def cell_pack_end(self, cell, expand=True):
-        orig_cell_pack_end(self, cell, expand)
-    Gtk.CellLayout.pack_end = cell_pack_end
-
-    orig_cell_pack_start = Gtk.CellLayout.pack_start
-
-    def cell_pack_start(self, cell, expand=True):
-        orig_cell_pack_start(self, cell, expand)
-    Gtk.CellLayout.pack_start = cell_pack_start
-
-    orig_set_cell_data_func = Gtk.CellLayout.set_cell_data_func
-
-    def set_cell_data_func(self, cell, func, user_data=_unset):
-        def callback(*args):
-            if args[-1] == _unset:
-                args = args[:-1]
-            return func(*args)
-        orig_set_cell_data_func(self, cell, callback, user_data)
-    Gtk.CellLayout.set_cell_data_func = set_cell_data_func
-
-    # CellRenderer
-
-    class GenericCellRenderer(Gtk.CellRenderer):
-        pass
-    Gtk.GenericCellRenderer = GenericCellRenderer
-
-    # ComboBox
-
-    orig_combo_row_separator_func = Gtk.ComboBox.set_row_separator_func
-
-    def combo_row_separator_func(self, func, user_data=_unset):
-        def callback(*args):
-            if args[-1] == _unset:
-                args = args[:-1]
-            return func(*args)
-        orig_combo_row_separator_func(self, callback, user_data)
-    Gtk.ComboBox.set_row_separator_func = combo_row_separator_func
-
-    # ComboBoxEntry
-
-    class ComboBoxEntry(Gtk.ComboBox):
-        def __init__(self, **kwds):
-            Gtk.ComboBox.__init__(self, has_entry=True, **kwds)
-
-        def set_text_column(self, text_column):
-            self.set_entry_text_column(text_column)
-
-        def get_text_column(self):
-            return self.get_entry_text_column()
-    Gtk.ComboBoxEntry = ComboBoxEntry
-
-    def combo_box_entry_new():
-        return Gtk.ComboBoxEntry()
-    Gtk.combo_box_entry_new = combo_box_entry_new
-
-    def combo_box_entry_new_with_model(model):
-        return Gtk.ComboBoxEntry(model=model)
-    Gtk.combo_box_entry_new_with_model = combo_box_entry_new_with_model
-
-    # Container
-
-    def install_child_property(container, flag, pspec):
-        warnings.warn('install_child_property() is not supported',
-                      DeprecationWarning, stacklevel=2)
-    Gtk.Container.install_child_property = classmethod(install_child_property)
-
-    def new_text():
-        combo = Gtk.ComboBox()
-        model = Gtk.ListStore(str)
-        combo.set_model(model)
-        combo.set_entry_text_column(0)
-        return combo
-    Gtk.combo_box_new_text = new_text
-
-    def append_text(self, text):
-        model = self.get_model()
-        model.append([text])
-    Gtk.ComboBox.append_text = append_text
-    Gtk.expander_new_with_mnemonic = Gtk.Expander.new_with_mnemonic
-    Gtk.icon_theme_get_default = Gtk.IconTheme.get_default
-    Gtk.image_new_from_pixbuf = Gtk.Image.new_from_pixbuf
-    Gtk.image_new_from_stock = Gtk.Image.new_from_stock
-    Gtk.image_new_from_animation = Gtk.Image.new_from_animation
-    Gtk.image_new_from_icon_set = Gtk.Image.new_from_icon_set
-    Gtk.image_new_from_file = Gtk.Image.new_from_file
-    Gtk.settings_get_default = Gtk.Settings.get_default
-    Gtk.window_set_default_icon = Gtk.Window.set_default_icon
-    Gtk.clipboard_get = Gtk.Clipboard.get
-
-    #AccelGroup
-    Gtk.AccelGroup.connect_group = Gtk.AccelGroup.connect
-
-    #StatusIcon
-    Gtk.status_icon_position_menu = Gtk.StatusIcon.position_menu
-    Gtk.StatusIcon.set_tooltip = Gtk.StatusIcon.set_tooltip_text
-
-    # Scale
-
-    orig_HScale = Gtk.HScale
-    orig_VScale = Gtk.VScale
-
-    class HScale(orig_HScale):
-        def __init__(self, adjustment=None):
-            orig_HScale.__init__(self, adjustment=adjustment)
-    Gtk.HScale = HScale
-
-    class VScale(orig_VScale):
-        def __init__(self, adjustment=None):
-            orig_VScale.__init__(self, adjustment=adjustment)
-    Gtk.VScale = VScale
-
-    Gtk.stock_add = lambda items: None
-
-    # Widget
-
-    Gtk.widget_get_default_direction = Gtk.Widget.get_default_direction
-    orig_size_request = Gtk.Widget.size_request
-
-    def size_request(widget):
-        class SizeRequest(UserList):
-            def __init__(self, req):
-                self.height = req.height
-                self.width = req.width
-                UserList.__init__(self, [self.width, self.height])
-        return SizeRequest(orig_size_request(widget))
-    Gtk.Widget.size_request = size_request
-    Gtk.Widget.hide_all = Gtk.Widget.hide
-
-    class BaseGetter(object):
-        def __init__(self, context):
-            self.context = context
-
-        def __getitem__(self, state):
-            color = self.context.get_background_color(state)
-            return Gdk.Color(red=int(color.red * 65535),
-                             green=int(color.green * 65535),
-                             blue=int(color.blue * 65535))
-
-    class Styles(object):
-        def __init__(self, widget):
-            context = widget.get_style_context()
-            self.base = BaseGetter(context)
-            self.black = Gdk.Color(red=0, green=0, blue=0)
-
-    class StyleDescriptor(object):
-        def __get__(self, instance, class_):
-            return Styles(instance)
-    Gtk.Widget.style = StyleDescriptor()
-
-    # gtk.unixprint
-
-    class UnixPrint(object):
-        pass
-    unixprint = UnixPrint()
-    sys.modules['gtkunixprint'] = unixprint
-
-    # gtk.keysyms
-
-    class Keysyms(object):
-        pass
-    keysyms = Keysyms()
-    sys.modules['gtk.keysyms'] = keysyms
-    Gtk.keysyms = keysyms
-    for name in dir(Gdk):
-        if name.startswith('KEY_'):
-            target = name[4:]
-            if target[0] in '0123456789':
-                target = '_' + target
-            value = getattr(Gdk, name)
-            setattr(keysyms, target, value)
-
-
-def enable_vte():
-    gi.require_version('Vte', '0.0')
-    from gi.repository import Vte
-    sys.modules['vte'] = Vte
-
-
-def enable_poppler():
-    gi.require_version('Poppler', '0.18')
-    from gi.repository import Poppler
-    sys.modules['poppler'] = Poppler
-    Poppler.pypoppler_version = (1, 0, 0)
-
-
-def enable_webkit(version='1.0'):
-    gi.require_version('WebKit', version)
-    from gi.repository import WebKit
-    sys.modules['webkit'] = WebKit
-    WebKit.WebView.get_web_inspector = WebKit.WebView.get_inspector
-
-
-def enable_gudev():
-    gi.require_version('GUdev', '1.0')
-    from gi.repository import GUdev
-    sys.modules['gudev'] = GUdev
-
-
-def enable_gst():
-    gi.require_version('Gst', '0.10')
-    from gi.repository import Gst
-    sys.modules['gst'] = Gst
-    _install_enums(Gst)
-    Gst.registry_get_default = Gst.Registry.get_default
-    Gst.element_register = Gst.Element.register
-    Gst.element_factory_make = Gst.ElementFactory.make
-    Gst.caps_new_any = Gst.Caps.new_any
-    Gst.get_pygst_version = lambda: (0, 10, 19)
-    Gst.get_gst_version = lambda: (0, 10, 40)
-
-    from gi.repository import GstInterfaces
-    sys.modules['gst.interfaces'] = GstInterfaces
-    _install_enums(GstInterfaces)
-
-    from gi.repository import GstAudio
-    sys.modules['gst.audio'] = GstAudio
-    _install_enums(GstAudio)
-
-    from gi.repository import GstVideo
-    sys.modules['gst.video'] = GstVideo
-    _install_enums(GstVideo)
-
-    from gi.repository import GstBase
-    sys.modules['gst.base'] = GstBase
-    _install_enums(GstBase)
-
-    Gst.BaseTransform = GstBase.BaseTransform
-    Gst.BaseSink = GstBase.BaseSink
-
-    from gi.repository import GstController
-    sys.modules['gst.controller'] = GstController
-    _install_enums(GstController, dest=Gst)
-
-    from gi.repository import GstPbutils
-    sys.modules['gst.pbutils'] = GstPbutils
-    _install_enums(GstPbutils)
-
-
-def enable_goocanvas():
-    gi.require_version('GooCanvas', '2.0')
-    from gi.repository import GooCanvas
-    sys.modules['goocanvas'] = GooCanvas
-    _install_enums(GooCanvas, strip='GOO_CANVAS_')
-    GooCanvas.ItemSimple = GooCanvas.CanvasItemSimple
-    GooCanvas.Item = GooCanvas.CanvasItem
-    GooCanvas.Image = GooCanvas.CanvasImage
-    GooCanvas.Group = GooCanvas.CanvasGroup
-    GooCanvas.Rect = GooCanvas.CanvasRect
+from gi import PyGIDeprecationWarning
+
+warnings.warn('gi.pygtkcompat is being deprecated in favor of using "pygtkcompat" directly.',
+              PyGIDeprecationWarning, stacklevel=2)
+
+# pyflakes.ignore
+from pygtkcompat import (enable,
+                         enable_gtk,
+                         enable_vte,
+                         enable_poppler,
+                         enable_webkit,
+                         enable_gudev,
+                         enable_gst,
+                         enable_goocanvas)
+
+
+__all__ = ['enable',
+           'enable_gtk',
+           'enable_vte',
+           'enable_poppler',
+           'enable_webkit',
+           'enable_gudev',
+           'enable_gst',
+           'enable_goocanvas']
diff --git a/gi/repository/Makefile.in b/gi/repository/Makefile.in
index 05006f1..ed0ae40 100644
--- a/gi/repository/Makefile.in
+++ b/gi/repository/Makefile.in
@@ -55,8 +55,10 @@ DIST_COMMON = $(pygirepository_PYTHON) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \
-	$(top_srcdir)/m4/jhflags.m4 $(top_srcdir)/m4/python.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/jhflags.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -122,6 +124,9 @@ CAIRO_LIBS = @CAIRO_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -139,6 +144,7 @@ EXEEXT = @EXEEXT@
 FFI_CFLAGS = @FFI_CFLAGS@
 FFI_LIBS = @FFI_LIBS@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
 GI_CFLAGS = @GI_CFLAGS@
@@ -158,6 +164,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBFFI_PC = @LIBFFI_PC@
@@ -167,7 +174,6 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -273,7 +279,7 @@ pygirepository_PYTHON = \
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -298,9 +304,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
diff --git a/gi/types.py b/gi/types.py
index 3b94294..f049da7 100644
--- a/gi/types.py
+++ b/gi/types.py
@@ -23,62 +23,118 @@
 from __future__ import absolute_import
 
 import sys
+
 from . import _gobject
+from ._gobject._gobject import GInterface
+from ._gobject.constants import TYPE_INVALID
 
 from ._gi import \
     InterfaceInfo, \
     ObjectInfo, \
     StructInfo, \
     VFuncInfo, \
+    FunctionInfo, \
     register_interface_info, \
-    hook_up_vfunc_implementation
+    hook_up_vfunc_implementation, \
+    DIRECTION_IN, \
+    DIRECTION_OUT, \
+    DIRECTION_INOUT
 
 
 StructInfo  # pyflakes
 
-if sys.version_info > (3, 0):
+if (3, 0) <= sys.version_info < (3, 3):
+    # callable not available for python 3.0 thru 3.2
     def callable(obj):
         return hasattr(obj, '__call__')
 
 
-def Function(info):
+def split_function_info_args(info):
+    """Split a functions args into a tuple of two lists.
 
+    Note that args marked as DIRECTION_INOUT will be in both lists.
+
+    :Returns:
+        Tuple of (in_args, out_args)
+    """
+    in_args = []
+    out_args = []
+    for arg in info.get_arguments():
+        direction = arg.get_direction()
+        if direction in (DIRECTION_IN, DIRECTION_INOUT):
+            in_args.append(arg)
+        if direction in (DIRECTION_OUT, DIRECTION_INOUT):
+            out_args.append(arg)
+    return (in_args, out_args)
+
+
+def get_callable_info_doc_string(info):
+    """Build a signature string which can be used for documentation."""
+    in_args, out_args = split_function_info_args(info)
+    in_args_strs = []
+    if isinstance(info, VFuncInfo):
+        in_args_strs = ['self']
+    elif isinstance(info, FunctionInfo):
+        if info.is_method():
+            in_args_strs = ['self']
+        elif info.is_constructor():
+            in_args_strs = ['cls']
+
+    for arg in in_args:
+        argstr = arg.get_name() + ':' + arg.get_pytype_hint()
+        if arg.is_optional():
+            argstr += '=<optional>'
+        in_args_strs.append(argstr)
+    in_args_str = ', '.join(in_args_strs)
+
+    if out_args:
+        out_args_str = ', '.join(arg.get_name() + ':' + arg.get_pytype_hint()
+                                 for arg in out_args)
+        return '%s(%s) -> %s' % (info.get_name(), in_args_str, out_args_str)
+    else:
+        return '%s(%s)' % (info.get_name(), in_args_str)
+
+
+def wraps_callable_info(info):
+    """Similar to functools.wraps but with specific GICallableInfo support."""
+    def update_func(func):
+        func.__info__ = info
+        func.__name__ = info.get_name()
+        func.__module__ = info.get_namespace()
+        func.__doc__ = get_callable_info_doc_string(info)
+        return func
+    return update_func
+
+
+def Function(info):
+    """Warps GIFunctionInfo"""
+    @wraps_callable_info(info)
     def function(*args, **kwargs):
         return info.invoke(*args, **kwargs)
-    function.__info__ = info
-    function.__name__ = info.get_name()
-    function.__module__ = info.get_namespace()
 
     return function
 
 
 class NativeVFunc(object):
-
+    """Wraps GINativeVFuncInfo"""
     def __init__(self, info):
-        self._info = info
+        self.__info__ = info
 
     def __get__(self, instance, klass):
+        @wraps_callable_info(self.__info__)
         def native_vfunc(*args, **kwargs):
-            return self._info.invoke(klass.__gtype__, *args, **kwargs)
-        native_vfunc.__info__ = self._info
-        native_vfunc.__name__ = self._info.get_name()
-        native_vfunc.__module__ = self._info.get_namespace()
-
+            return self.__info__.invoke(klass.__gtype__, *args, **kwargs)
         return native_vfunc
 
 
 def Constructor(info):
-
+    """Warps GIFunctionInfo with get_constructor() == True"""
+    @wraps_callable_info(info)
     def constructor(cls, *args, **kwargs):
         cls_name = info.get_container().get_name()
         if cls.__name__ != cls_name:
             raise TypeError('%s constructor cannot be used to create instances of a subclass' % cls_name)
         return info.invoke(cls, *args, **kwargs)
-
-    constructor.__info__ = info
-    constructor.__name__ = info.get_name()
-    constructor.__module__ = info.get_namespace()
-
     return constructor
 
 
@@ -169,6 +225,11 @@ class MetaClassHelper(object):
         if class_info is None or not isinstance(class_info, ObjectInfo):
             return
 
+        # Special case skipping of vfuncs for GObject.Object because they will break
+        # the static bindings which will try to use them.
+        if cls.__module__ == 'gi.repository.GObject' and cls.__name__ == 'Object':
+            return
+
         for vfunc_info in class_info.get_vfuncs():
             name = 'do_%s' % vfunc_info.get_name()
             value = NativeVFunc(vfunc_info)
@@ -181,8 +242,10 @@ def find_vfunc_info_in_interface(bases, vfunc_name):
         # This can be seen in IntrospectionModule.__getattr__() in module.py.
         # We do not need to search regular classes here, only wrapped interfaces.
         # We also skip GInterface, because it is not wrapped and has no __info__ attr.
-        if base is _gobject.GInterface or\
-                not issubclass(base, _gobject.GInterface) or\
+        # Skip bases without __info__ (static _gobject._gobject.GObject)
+        if base is GInterface or\
+                not issubclass(base, GInterface) or\
+                not hasattr(base, '__info__') or\
                 not isinstance(base.__info__, InterfaceInfo):
             continue
 
@@ -260,7 +323,7 @@ def mro(C):
         for subclass_bases in bases_of_subclasses:
             candidate = subclass_bases[0]
             not_head = [s for s in bases_of_subclasses if candidate in s[1:]]
-            if not_head and _gobject.GInterface not in candidate.__bases__:
+            if not_head and GInterface not in candidate.__bases__:
                 candidate = None  # conflict, reject candidate
             else:
                 break
@@ -287,7 +350,7 @@ class StructMeta(type, MetaClassHelper):
 
         # Avoid touching anything else than the base class.
         g_type = cls.__info__.get_g_type()
-        if g_type != _gobject.TYPE_INVALID and g_type.pytype is not None:
+        if g_type != TYPE_INVALID and g_type.pytype is not None:
             return
 
         cls._setup_fields()
diff --git a/ltmain.sh b/ltmain.sh
index 0096fe6..69a4518 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -70,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu2
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1.1ubuntu1
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -80,7 +80,7 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1ubuntu2"
+VERSION="2.4.2 Debian-2.4.2-1.1ubuntu1"
 TIMESTAMP=""
 package_revision=1.3337
 
diff --git a/m4/libtool.m4 b/m4/libtool.m4
new file mode 100644
index 0000000..534d1cc
--- /dev/null
+++ b/m4/libtool.m4
@@ -0,0 +1,7983 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+# 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.
+
+m4_define([_LT_COPYING], [dnl
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+])
+
+# serial 57 LT_INIT
+
+
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
+m4_defun([LT_PREREQ],
+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
+       [m4_default([$3],
+		   [m4_fatal([Libtool version $1 or higher is required],
+		             63)])],
+       [$2])])
+
+
+# _LT_CHECK_BUILDDIR
+# ------------------
+# Complain if the absolute build directory name contains unusual characters
+m4_defun([_LT_CHECK_BUILDDIR],
+[case `pwd` in
+  *\ * | *\	*)
+    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
+esac
+])
+
+
+# LT_INIT([OPTIONS])
+# ------------------
+AC_DEFUN([LT_INIT],
+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+AC_BEFORE([$0], [LT_LANG])dnl
+AC_BEFORE([$0], [LT_OUTPUT])dnl
+AC_BEFORE([$0], [LTDL_INIT])dnl
+m4_require([_LT_CHECK_BUILDDIR])dnl
+
+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
+dnl unless we require an AC_DEFUNed macro:
+AC_REQUIRE([LTOPTIONS_VERSION])dnl
+AC_REQUIRE([LTSUGAR_VERSION])dnl
+AC_REQUIRE([LTVERSION_VERSION])dnl
+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+m4_require([_LT_PROG_LTMAIN])dnl
+
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
+dnl Parse OPTIONS
+_LT_SET_OPTIONS([$0], [$1])
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+_LT_SETUP
+
+# Only expand once:
+m4_define([LT_INIT])
+])# LT_INIT
+
+# Old names:
+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+m4_defun([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+  case $cc_temp in
+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+])
+
+
+# _LT_FILEUTILS_DEFAULTS
+# ----------------------
+# It is okay to use these file commands and assume they have been set
+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+m4_defun([_LT_FILEUTILS_DEFAULTS],
+[: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+])# _LT_FILEUTILS_DEFAULTS
+
+
+# _LT_SETUP
+# ---------
+m4_defun([_LT_SETUP],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
+_LT_DECL([], [host_alias], [0], [The host system])dnl
+_LT_DECL([], [host], [0])dnl
+_LT_DECL([], [host_os], [0])dnl
+dnl
+_LT_DECL([], [build_alias], [0], [The build system])dnl
+_LT_DECL([], [build], [0])dnl
+_LT_DECL([], [build_os], [0])dnl
+dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+test -z "$LN_S" && LN_S="ln -s"
+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
+dnl
+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
+m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
+
+_LT_CONFIG_LIBTOOL_INIT([
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+])
+if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+_LT_CHECK_OBJDIR
+
+m4_require([_LT_TAG_COMPILER])dnl
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+_LT_CC_BASENAME([$compiler])
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    _LT_PATH_MAGIC
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+LT_SUPPORTED_TAG([CC])
+_LT_LANG_C_CONFIG
+_LT_LANG_DEFAULT_CONFIG
+_LT_CONFIG_COMMANDS
+])# _LT_SETUP
+
+
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+])
+
+# _LT_PROG_LTMAIN
+# ---------------
+# Note that this code is called both from `configure', and `config.status'
+# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
+# `config.status' has no value for ac_aux_dir unless we are using Automake,
+# so we pass a copy along to make sure it has a sensible value anyway.
+m4_defun([_LT_PROG_LTMAIN],
+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
+ltmain="$ac_aux_dir/ltmain.sh"
+])# _LT_PROG_LTMAIN
+
+
+## ------------------------------------- ##
+## Accumulate code for creating libtool. ##
+## ------------------------------------- ##
+
+# So that we can recreate a full libtool script including additional
+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
+# in macros and then make a single call at the end using the `libtool'
+# label.
+
+
+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
+# ----------------------------------------
+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL_INIT],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
+
+
+# _LT_CONFIG_LIBTOOL([COMMANDS])
+# ------------------------------
+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
+
+
+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
+# -----------------------------------------------------
+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
+[_LT_CONFIG_LIBTOOL([$1])
+_LT_CONFIG_LIBTOOL_INIT([$2])
+])
+
+
+# _LT_FORMAT_COMMENT([COMMENT])
+# -----------------------------
+# Add leading comment marks to the start of each line, and a trailing
+# full-stop to the whole comment if one is not present already.
+m4_define([_LT_FORMAT_COMMENT],
+[m4_ifval([$1], [
+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
+              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
+)])
+
+
+
+## ------------------------ ##
+## FIXME: Eliminate VARNAME ##
+## ------------------------ ##
+
+
+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
+# -------------------------------------------------------------------
+# CONFIGNAME is the name given to the value in the libtool script.
+# VARNAME is the (base) name used in the configure script.
+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
+# VARNAME.  Any other value will be used directly.
+m4_define([_LT_DECL],
+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
+    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
+	[m4_ifval([$1], [$1], [$2])])
+    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
+    m4_ifval([$4],
+	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
+    lt_dict_add_subkey([lt_decl_dict], [$2],
+	[tagged?], [m4_ifval([$5], [yes], [no])])])
+])
+
+
+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
+# --------------------------------------------------------
+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
+
+
+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_tag_varnames],
+[_lt_decl_filter([tagged?], [yes], $@)])
+
+
+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
+# ---------------------------------------------------------
+m4_define([_lt_decl_filter],
+[m4_case([$#],
+  [0], [m4_fatal([$0: too few arguments: $#])],
+  [1], [m4_fatal([$0: too few arguments: $#: $1])],
+  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
+  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
+  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
+])
+
+
+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
+# --------------------------------------------------
+m4_define([lt_decl_quote_varnames],
+[_lt_decl_filter([value], [1], $@)])
+
+
+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_dquote_varnames],
+[_lt_decl_filter([value], [2], $@)])
+
+
+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_varnames_tagged],
+[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...])
+# ------------------------------------------------
+m4_define([lt_decl_all_varnames],
+[_$0(m4_quote(m4_default([$1], [[, ]])),
+     m4_if([$2], [],
+	   m4_quote(lt_decl_varnames),
+	m4_quote(m4_shift($@))))[]dnl
+])
+m4_define([_lt_decl_all_varnames],
+[lt_join($@, lt_decl_varnames_tagged([$1],
+			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
+])
+
+
+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
+# ------------------------------------
+# Quote a variable value, and forward it to `config.status' so that its
+# declaration there will have the same value as in `configure'.  VARNAME
+# must have a single quote delimited value for this to work.
+m4_define([_LT_CONFIG_STATUS_DECLARE],
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
+
+
+# _LT_CONFIG_STATUS_DECLARATIONS
+# ------------------------------
+# We delimit libtool config variables with single quotes, so when
+# we write them to config.status, we have to be sure to quote all
+# embedded single quotes properly.  In configure, this macro expands
+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
+#
+#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
+    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAGS
+# ----------------
+# Output comment and list of tags supported by the script
+m4_defun([_LT_LIBTOOL_TAGS],
+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
+available_tags="_LT_TAGS"dnl
+])
+
+
+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
+# -----------------------------------
+# Extract the dictionary values for VARNAME (optionally with TAG) and
+# expand to a commented shell variable setting:
+#
+#    # Some comment about what VAR is for.
+#    visible_name=$lt_internal_name
+m4_define([_LT_LIBTOOL_DECLARE],
+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
+					   [description])))[]dnl
+m4_pushdef([_libtool_name],
+    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
+    [0], [_libtool_name=[$]$1],
+    [1], [_libtool_name=$lt_[]$1],
+    [2], [_libtool_name=$lt_[]$1],
+    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
+])
+
+
+# _LT_LIBTOOL_CONFIG_VARS
+# -----------------------
+# Produce commented declarations of non-tagged libtool config variables
+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
+# section) are produced by _LT_LIBTOOL_TAG_VARS.
+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
+[m4_foreach([_lt_var],
+    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAG_VARS(TAG)
+# -------------------------
+m4_define([_LT_LIBTOOL_TAG_VARS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
+
+
+# _LT_TAGVAR(VARNAME, [TAGNAME])
+# ------------------------------
+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
+
+
+# _LT_CONFIG_COMMANDS
+# -------------------
+# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
+# variables for single and double quote escaping we saved from calls
+# to _LT_DECL, we can put quote escaped variables declarations
+# into `config.status', and then the shell code to quote escape them in
+# for loops in `config.status'.  Finally, any additional code accumulated
+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
+m4_defun([_LT_CONFIG_COMMANDS],
+[AC_PROVIDE_IFELSE([LT_OUTPUT],
+	dnl If the libtool generation code has been placed in $CONFIG_LT,
+	dnl instead of duplicating it all over again into config.status,
+	dnl then we will have config.status run $CONFIG_LT later, so it
+	dnl needs to know what name is stored there:
+        [AC_CONFIG_COMMANDS([libtool],
+            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
+    dnl If the libtool generation code is destined for config.status,
+    dnl expand the accumulated commands and init code now:
+    [AC_CONFIG_COMMANDS([libtool],
+        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
+])#_LT_CONFIG_COMMANDS
+
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
+[
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+_LT_CONFIG_STATUS_DECLARATIONS
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$[]1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_quote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_dquote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+_LT_OUTPUT_LIBTOOL_INIT
+])
+
+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+# ------------------------------------
+# Generate a child script FILE with all initialization necessary to
+# reuse the environment learned by the parent script, and make the
+# file executable.  If COMMENT is supplied, it is inserted after the
+# `#!' sequence but before initialization text begins.  After this
+# macro, additional text can be appended to FILE to form the body of
+# the child script.  The macro ends with non-zero status if the
+# file could not be fully written (such as if the disk is full).
+m4_ifdef([AS_INIT_GENERATED],
+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+[m4_defun([_LT_GENERATED_FILE_INIT],
+[m4_require([AS_PREPARE])]dnl
+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+[lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test $lt_write_fail = 0 && chmod +x $1[]dnl
+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
+
+# LT_OUTPUT
+# ---------
+# This macro allows early generation of the libtool script (before
+# AC_OUTPUT is called), incase it is used in configure for compilation
+# tests.
+AC_DEFUN([LT_OUTPUT],
+[: ${CONFIG_LT=./config.lt}
+AC_MSG_NOTICE([creating $CONFIG_LT])
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+lt_cl_silent=false
+exec AS_MESSAGE_LOG_FD>>config.log
+{
+  echo
+  AS_BOX([Running $as_me.])
+} >&AS_MESSAGE_LOG_FD
+
+lt_cl_help="\
+\`$as_me' creates a local libtool stub from the current configuration,
+for use in further configure time tests before the real libtool is
+generated.
+
+Usage: $[0] [[OPTIONS]]
+
+  -h, --help      print this help, then exit
+  -V, --version   print version number, then exit
+  -q, --quiet     do not print progress messages
+  -d, --debug     don't remove temporary files
+
+Report bugs to <bug-libtool@gnu.org>."
+
+lt_cl_version="\
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+configured by $[0], generated by m4_PACKAGE_STRING.
+
+Copyright (C) 2011 Free Software Foundation, Inc.
+This config.lt script is free software; the Free Software Foundation
+gives unlimited permision to copy, distribute and modify it."
+
+while test $[#] != 0
+do
+  case $[1] in
+    --version | --v* | -V )
+      echo "$lt_cl_version"; exit 0 ;;
+    --help | --h* | -h )
+      echo "$lt_cl_help"; exit 0 ;;
+    --debug | --d* | -d )
+      debug=: ;;
+    --quiet | --q* | --silent | --s* | -q )
+      lt_cl_silent=: ;;
+
+    -*) AC_MSG_ERROR([unrecognized option: $[1]
+Try \`$[0] --help' for more information.]) ;;
+
+    *) AC_MSG_ERROR([unrecognized argument: $[1]
+Try \`$[0] --help' for more information.]) ;;
+  esac
+  shift
+done
+
+if $lt_cl_silent; then
+  exec AS_MESSAGE_FD>/dev/null
+fi
+_LTEOF
+
+cat >>"$CONFIG_LT" <<_LTEOF
+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AC_MSG_NOTICE([creating $ofile])
+_LT_OUTPUT_LIBTOOL_COMMANDS
+AS_EXIT(0)
+_LTEOF
+chmod +x "$CONFIG_LT"
+
+# configure is writing to config.log, but config.lt does its own redirection,
+# appending to config.log, which fails on DOS, as config.log is still kept
+# open by configure.  Here we exec the FD to /dev/null, effectively closing
+# config.log, so it can be properly (re)opened and appended to by config.lt.
+lt_cl_success=:
+test "$silent" = yes &&
+  lt_config_lt_args="$lt_config_lt_args --quiet"
+exec AS_MESSAGE_LOG_FD>/dev/null
+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
+])# LT_OUTPUT
+
+
+# _LT_CONFIG(TAG)
+# ---------------
+# If TAG is the built-in tag, create an initial libtool script with a
+# default configuration from the untagged config vars.  Otherwise add code
+# to config.status for appending the configuration named by TAG from the
+# matching tagged config vars.
+m4_defun([_LT_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_CONFIG_SAVE_COMMANDS([
+  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
+  m4_if(_LT_TAG, [C], [
+    # See if we are running on zsh, and set the options which allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}" ; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile="${ofile}T"
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+_LT_COPYING
+_LT_LIBTOOL_TAGS
+
+# ### BEGIN LIBTOOL CONFIG
+_LT_LIBTOOL_CONFIG_VARS
+_LT_LIBTOOL_TAG_VARS
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+  _LT_PROG_LTMAIN
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+
+  _LT_PROG_REPLACE_SHELLFNS
+
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+],
+[cat <<_LT_EOF >> "$ofile"
+
+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
+dnl in a comment (ie after a #).
+# ### BEGIN LIBTOOL TAG CONFIG: $1
+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
+# ### END LIBTOOL TAG CONFIG: $1
+_LT_EOF
+])dnl /m4_if
+],
+[m4_if([$1], [], [
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    TIMESTAMP='$TIMESTAMP'
+    RM='$RM'
+    ofile='$ofile'], [])
+])dnl /_LT_CONFIG_SAVE_COMMANDS
+])# _LT_CONFIG
+
+
+# LT_SUPPORTED_TAG(TAG)
+# ---------------------
+# Trace this macro to discover what tags are supported by the libtool
+# --tag option, using:
+#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
+AC_DEFUN([LT_SUPPORTED_TAG], [])
+
+
+# C support is built-in for now
+m4_define([_LT_LANG_C_enabled], [])
+m4_define([_LT_TAGS], [])
+
+
+# LT_LANG(LANG)
+# -------------
+# Enable libtool support for the given language if not already enabled.
+AC_DEFUN([LT_LANG],
+[AC_BEFORE([$0], [LT_OUTPUT])dnl
+m4_case([$1],
+  [C],			[_LT_LANG(C)],
+  [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
+  [Java],		[_LT_LANG(GCJ)],
+  [Fortran 77],		[_LT_LANG(F77)],
+  [Fortran],		[_LT_LANG(FC)],
+  [Windows Resource],	[_LT_LANG(RC)],
+  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
+    [_LT_LANG($1)],
+    [m4_fatal([$0: unsupported language: "$1"])])])dnl
+])# LT_LANG
+
+
+# _LT_LANG(LANGNAME)
+# ------------------
+m4_defun([_LT_LANG],
+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
+  [LT_SUPPORTED_TAG([$1])dnl
+  m4_append([_LT_TAGS], [$1 ])dnl
+  m4_define([_LT_LANG_]$1[_enabled], [])dnl
+  _LT_LANG_$1_CONFIG($1)])dnl
+])# _LT_LANG
+
+
+m4_ifndef([AC_PROG_GO], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
+# _LT_LANG_DEFAULT_CONFIG
+# -----------------------
+m4_defun([_LT_LANG_DEFAULT_CONFIG],
+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
+  [LT_LANG(CXX)],
+  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_F77],
+  [LT_LANG(F77)],
+  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_FC],
+  [LT_LANG(FC)],
+  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
+
+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
+dnl pulling things in needlessly.
+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+  [LT_LANG(GCJ)],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+    [LT_LANG(GCJ)],
+    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
+      [LT_LANG(GCJ)],
+      [m4_ifdef([AC_PROG_GCJ],
+	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([A][M_PROG_GCJ],
+	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([LT_PROG_GCJ],
+	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
+AC_PROVIDE_IFELSE([LT_PROG_RC],
+  [LT_LANG(RC)],
+  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
+])# _LT_LANG_DEFAULT_CONFIG
+
+# Obsolete macros:
+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
+
+
+# _LT_TAG_COMPILER
+# ----------------
+m4_defun([_LT_TAG_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_TAG_COMPILER
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+m4_defun([_LT_COMPILER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+m4_defun([_LT_LINKER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
+# _LT_REQUIRED_DARWIN_CHECKS
+# -------------------------
+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+    AC_CHECK_TOOL([LIPO], [lipo], [:])
+    AC_CHECK_TOOL([OTOOL], [otool], [:])
+    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
+    _LT_DECL([], [DSYMUTIL], [1],
+      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
+    _LT_DECL([], [NMEDIT], [1],
+      [Tool to change global to local symbols on Mac OS X])
+    _LT_DECL([], [LIPO], [1],
+      [Tool to manipulate fat objects and archives on Mac OS X])
+    _LT_DECL([], [OTOOL], [1],
+      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
+    _LT_DECL([], [OTOOL64], [1],
+      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi])
+
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+	[lt_cv_ld_exported_symbols_list=yes],
+	[lt_cv_ld_exported_symbols_list=no])
+	LDFLAGS="$save_LDFLAGS"
+    ])
+
+    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+      [lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[012]])
+      _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
+      # 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?
+      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' ;;
+	10.[[012]]*)
+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
+
+
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
+# Checks for linker and compiler features on darwin
+m4_defun([_LT_DARWIN_LINKER_FEATURES],
+[
+  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_automatic, $1)=yes
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
+  else
+    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  fi
+  _LT_TAGVAR(link_all_deplibs, $1)=yes
+  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+  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=func_echo_all
+    _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}"
+    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+    m4_if([$1], [CXX],
+[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+    fi
+],[])
+  else
+  _LT_TAGVAR(ld_shlibs, $1)=no
+  fi
+])
+
+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
+# ----------------------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+# Store the results from the different compilers for each TAGNAME.
+# Allow to override them for all tags through lt_cv_aix_libpath.
+m4_defun([_LT_SYS_MODULE_PATH_AIX],
+[m4_require([_LT_DECL_SED])dnl
+if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+  lt_aix_libpath_sed='[
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }]'
+  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi],[])
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
+  fi
+  ])
+  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+fi
+])# _LT_SYS_MODULE_PATH_AIX
+
+
+# _LT_SHELL_INIT(ARG)
+# -------------------
+m4_define([_LT_SHELL_INIT],
+[m4_divert_text([M4SH-INIT], [$1
+])])# _LT_SHELL_INIT
+
+
+
+# _LT_PROG_ECHO_BACKSLASH
+# -----------------------
+# Find how we can fake an echo command that does not interpret backslash.
+# In particular, with Autoconf 2.60 or later we add some code to the start
+# of the generated configure script which will find a shell with a builtin
+# printf (which we can use as an echo command).
+m4_defun([_LT_PROG_ECHO_BACKSLASH],
+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+AC_MSG_CHECKING([how to print strings])
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$[]1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*" 
+}
+
+case "$ECHO" in
+  printf*) AC_MSG_RESULT([printf]) ;;
+  print*) AC_MSG_RESULT([print -r]) ;;
+  *) AC_MSG_RESULT([cat]) ;;
+esac
+
+m4_ifdef([_AS_DETECT_SUGGESTED],
+[_AS_DETECT_SUGGESTED([
+  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test "X`printf %s $ECHO`" = "X$ECHO" \
+      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
+
+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
+])# _LT_PROG_ECHO_BACKSLASH
+
+
+# _LT_WITH_SYSROOT
+# ----------------
+AC_DEFUN([_LT_WITH_SYSROOT],
+[AC_MSG_CHECKING([for sysroot])
+AC_ARG_WITH([sysroot],
+[  --with-sysroot[=DIR] Search for dependent libraries within DIR
+                        (or the compiler's sysroot if not specified).],
+[], [with_sysroot=no])
+
+dnl lt_sysroot will always be passed unquoted.  We quote it here
+dnl in case the user passed a directory name.
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+   if test "$GCC" = yes; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   AC_MSG_RESULT([${with_sysroot}])
+   AC_MSG_ERROR([The sysroot must be an absolute path.])
+   ;;
+esac
+
+ AC_MSG_RESULT([${lt_sysroot:-no}])
+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
+[dependent libraries, and in which our libraries should be installed.])])
+
+# _LT_ENABLE_LOCK
+# ---------------
+m4_defun([_LT_ENABLE_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+  [AS_HELP_STRING([--disable-libtool-lock],
+    [avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE="32"
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE="64"
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    if test "$lt_cv_prog_gnu_ld" = yes; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_i386"
+	    ;;
+	  ppc64-*linux*|powerpc64-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  ppc*-*linux*|powerpc*-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_LANG_PUSH(C)
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LANG_POP])
+  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"
+  fi
+  ;;
+*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks="$enable_libtool_lock"
+])# _LT_ENABLE_LOCK
+
+
+# _LT_PROG_AR
+# -----------
+m4_defun([_LT_PROG_AR],
+[AC_CHECK_TOOLS(AR, [ar], false)
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
+
+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
+  [lt_cv_ar_at_file=no
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
+     [echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL([lt_ar_try])
+      if test "$ac_status" -eq 0; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	AC_TRY_EVAL([lt_ar_try])
+	if test "$ac_status" -ne 0; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+     ])
+  ])
+
+if test "x$lt_cv_ar_at_file" = xno; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+_LT_DECL([], [archiver_list_spec], [1],
+  [How to feed a file listing to the archiver])
+])# _LT_PROG_AR
+
+
+# _LT_CMD_OLD_ARCHIVE
+# -------------------
+m4_defun([_LT_CMD_OLD_ARCHIVE],
+[_LT_PROG_AR
+
+AC_CHECK_TOOL(STRIP, strip, :)
+test -z "$STRIP" && STRIP=:
+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
+
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+test -z "$RANLIB" && RANLIB=:
+_LT_DECL([], [RANLIB], [1],
+    [Commands used to install an old-style archive])
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+_LT_DECL([], [old_postinstall_cmds], [2])
+_LT_DECL([], [old_postuninstall_cmds], [2])
+_LT_TAGDECL([], [old_archive_cmds], [2],
+    [Commands used to build an old-style archive])
+_LT_DECL([], [lock_old_archive_extraction], [0],
+    [Whether to use a lock for old archive extraction])
+])# _LT_CMD_OLD_ARCHIVE
+
+
+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([_LT_COMPILER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -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:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   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.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       $2=yes
+     fi
+   fi
+   $RM conftest*
+])
+
+if test x"[$]$2" = xyes; then
+    m4_if([$5], , :, [$5])
+else
+    m4_if([$6], , :, [$6])
+fi
+])# _LT_COMPILER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
+
+
+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                  [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------
+# Check whether the given linker option works
+AC_DEFUN([_LT_LINKER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $3"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
+     else
+       $2=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+])
+
+if test x"[$]$2" = xyes; then
+    m4_if([$4], , :, [$4])
+else
+    m4_if([$5], , :, [$5])
+fi
+])# _LT_LINKER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
+
+
+# LT_CMD_MAX_LEN
+#---------------
+AC_DEFUN([LT_CMD_MAX_LEN],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  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,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8 ; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+])
+if test -n $lt_cv_sys_max_cmd_len ; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+  AC_MSG_RESULT(none)
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+_LT_DECL([], [max_cmd_len], [0],
+    [What is the maximum length of a command?])
+])# LT_CMD_MAX_LEN
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
+
+
+# _LT_HEADER_DLFCN
+# ----------------
+m4_defun([_LT_HEADER_DLFCN],
+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
+])# _LT_HEADER_DLFCN
+
+
+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ----------------------------------------------------------------
+m4_defun([_LT_TRY_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "$cross_compiling" = yes; then :
+  [$4]
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+[#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}]
+_LT_EOF
+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_dlunknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
+fi
+rm -fr conftest*
+])# _LT_TRY_DLOPEN_SELF
+
+
+# LT_SYS_DLOPEN_SELF
+# ------------------
+AC_DEFUN([LT_SYS_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ])
+    ;;
+
+  *)
+    AC_CHECK_FUNC([shl_load],
+	  [lt_cv_dlopen="shl_load"],
+      [AC_CHECK_LIB([dld], [shl_load],
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+	[AC_CHECK_FUNC([dlopen],
+	      [lt_cv_dlopen="dlopen"],
+	  [AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+	    [AC_CHECK_LIB([svld], [dlopen],
+		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+	      [AC_CHECK_LIB([dld], [dld_link],
+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+	      ])
+	    ])
+	  ])
+	])
+      ])
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+	  lt_cv_dlopen_self, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+	  lt_cv_dlopen_self_static, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+_LT_DECL([dlopen_support], [enable_dlopen], [0],
+	 [Whether dlopen is supported])
+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
+	 [Whether dlopen of programs is supported])
+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
+	 [Whether dlopen of statically linked programs is supported])
+])# LT_SYS_DLOPEN_SELF
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
+
+
+# _LT_COMPILER_C_O([TAGNAME])
+# ---------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler.
+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
+m4_defun([_LT_COMPILER_C_O],
+[m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -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:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+     fi
+   fi
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+])
+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
+	[Does compiler simultaneously support -c and -o options?])
+])# _LT_COMPILER_C_O
+
+
+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
+# ----------------------------------
+# Check to see if we can do hard links to lock some files if needed
+m4_defun([_LT_COMPILER_FILE_LOCKS],
+[m4_require([_LT_ENABLE_LOCK])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_COMPILER_C_O([$1])
+
+hard_links="nottested"
+if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  AC_MSG_CHECKING([if we can lock with hard links])
+  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
+  AC_MSG_RESULT([$hard_links])
+  if test "$hard_links" = no; then
+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
+])# _LT_COMPILER_FILE_LOCKS
+
+
+# _LT_CHECK_OBJDIR
+# ----------------
+m4_defun([_LT_CHECK_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+_LT_DECL([], [objdir], [0],
+         [The name of the directory that contains temporary libtool files])dnl
+m4_pattern_allow([LT_OBJDIR])dnl
+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
+  [Define to the sub-directory in which libtool stores uninstalled libraries.])
+])# _LT_CHECK_OBJDIR
+
+
+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
+# --------------------------------------
+# Check hardcoding attributes.
+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
+   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
+   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+
+  # We can hardcode non-existent directories.
+  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
+    # Linking always hardcodes the temporary library directory.
+    _LT_TAGVAR(hardcode_action, $1)=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    _LT_TAGVAR(hardcode_action, $1)=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  _LT_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
+
+if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
+   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+_LT_TAGDECL([], [hardcode_action], [0],
+    [How to hardcode a shared library path into an executable])
+])# _LT_LINKER_HARDCODE_LIBPATH
+
+
+# _LT_CMD_STRIPLIB
+# ----------------
+m4_defun([_LT_CMD_STRIPLIB],
+[m4_require([_LT_DECL_EGREP])
+striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+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"
+  AC_MSG_RESULT([yes])
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP" ; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no])
+    fi
+    ;;
+  *)
+    AC_MSG_RESULT([no])
+    ;;
+  esac
+fi
+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
+_LT_DECL([], [striplib], [1])
+])# _LT_CMD_STRIPLIB
+
+
+# _LT_SYS_DYNAMIC_LINKER([TAG])
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+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
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
+m4_if([$1],
+	[], [
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
+    *) lt_sed_strip_eq="s,=/,/,g" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[[4-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[[01]] | aix4.[[01]].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[[45]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+m4_if([$1], [],[
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[23]].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[[3-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+    [lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+	 [lt_cv_shlibpath_overrides_runpath=yes])])
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+    ])
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[[89]] | openbsd2.[[89]].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  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
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+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
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+_LT_DECL([], [variables_saved_for_relink], [1],
+    [Variables whose values should be saved in libtool wrapper scripts and
+    restored at link time])
+_LT_DECL([], [need_lib_prefix], [0],
+    [Do we need the "lib" prefix for modules?])
+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
+_LT_DECL([], [version_type], [0], [Library versioning type])
+_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
+_LT_DECL([], [shlibpath_overrides_runpath], [0],
+    [Is shlibpath searched before the hard-coded library search path?])
+_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
+_LT_DECL([], [library_names_spec], [1],
+    [[List of archive names.  First name is the real one, the rest are links.
+    The last name is the one that the linker finds with -lNAME]])
+_LT_DECL([], [soname_spec], [1],
+    [[The coded name of the library, if different from the real name]])
+_LT_DECL([], [install_override_mode], [1],
+    [Permission mode override for installation of shared libraries])
+_LT_DECL([], [postinstall_cmds], [2],
+    [Command to use after installation of a shared archive])
+_LT_DECL([], [postuninstall_cmds], [2],
+    [Command to use after uninstallation of a shared archive])
+_LT_DECL([], [finish_cmds], [2],
+    [Commands used to finish a libtool library installation in a directory])
+_LT_DECL([], [finish_eval], [1],
+    [[As "finish_cmds", except a single script fragment to be evaled but
+    not shown]])
+_LT_DECL([], [hardcode_into_libs], [0],
+    [Whether we should hardcode library paths into libraries])
+_LT_DECL([], [sys_lib_search_path_spec], [2],
+    [Compile-time system search path for libraries])
+_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
+    [Run-time system search path for libraries])
+])# _LT_SYS_DYNAMIC_LINKER
+
+
+# _LT_PATH_TOOL_PREFIX(TOOL)
+# --------------------------
+# find a file program which can recognize shared library
+AC_DEFUN([_LT_PATH_TOOL_PREFIX],
+[m4_require([_LT_DECL_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] |  ?:[\\/]*])
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word.  This closes a longstanding sh security hole.
+  ac_dummy="m4_if([$2], , $PATH, [$2])"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$1; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac])
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
+else
+  AC_MSG_RESULT(no)
+fi
+_LT_DECL([], [MAGIC_CMD], [0],
+	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
+])# _LT_PATH_TOOL_PREFIX
+
+# Old name:
+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
+
+
+# _LT_PATH_MAGIC
+# --------------
+# find a file program which can recognize a shared library
+m4_defun([_LT_PATH_MAGIC],
+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+  else
+    MAGIC_CMD=:
+  fi
+fi
+])# _LT_PATH_MAGIC
+
+
+# LT_PATH_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([LT_PATH_LD],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by $CC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+_LT_PATH_LD_GNU
+AC_SUBST([LD])
+
+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
+])# LT_PATH_LD
+
+# Old names:
+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_LD], [])
+dnl AC_DEFUN([AC_PROG_LD], [])
+
+
+# _LT_PATH_LD_GNU
+#- --------------
+m4_defun([_LT_PATH_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# _LT_PATH_LD_GNU
+
+
+# _LT_CMD_RELOAD
+# --------------
+# find reload flag for linker
+#   -- PORTME Some linkers may need a different reload flag.
+m4_defun([_LT_CMD_RELOAD],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
+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
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test "$GCC" != yes; then
+      reload_cmds=false
+    fi
+    ;;
+  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
+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_TAGDECL([], [reload_cmds], [2])dnl
+])# _LT_CMD_RELOAD
+
+
+# _LT_CHECK_MAGIC_METHOD
+# ----------------------
+# how to check for library dependencies
+#  -- 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'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[[4-9]]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[[45]]*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  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
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[[3-9]]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd* | netbsdelf*-gnu)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+])
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
+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
+
+_LT_DECL([], [deplibs_check_method], [1],
+    [Method to check whether dependent libraries are shared objects])
+_LT_DECL([], [file_magic_cmd], [1],
+    [Command to use when deplibs_check_method = "file_magic"])
+_LT_DECL([], [file_magic_glob], [1],
+    [How to find potential files when deplibs_check_method = "file_magic"])
+_LT_DECL([], [want_nocaseglob], [1],
+    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
+])# _LT_CHECK_MAGIC_METHOD
+
+
+# LT_PATH_NM
+# ----------
+# find the pathname to a BSD- or MS-compatible name lister
+AC_DEFUN([LT_PATH_NM],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  : ${lt_cv_path_NM=no}
+fi])
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+  AC_SUBST([DUMPBIN])
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
+fi
+test -z "$NM" && NM=nm
+AC_SUBST([NM])
+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
+
+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
+  [lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
+  cat conftest.out >&AS_MESSAGE_LOG_FD
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*])
+])# LT_PATH_NM
+
+# Old names:
+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_NM], [])
+dnl AC_DEFUN([AC_PROG_NM], [])
+
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+# --------------------------------
+# how to determine the name of the shared library
+# associated with a specific link library.
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+m4_require([_LT_DECL_DLLTOOL])
+AC_CACHE_CHECK([how to associate runtime and link libraries],
+lt_cv_sharedlib_from_linklib_cmd,
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh
+  # decide which to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  ;;
+esac
+])
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
+    [Command to associate shared and link libraries])
+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+
+
+# _LT_PATH_MANIFEST_TOOL
+# ----------------------
+# locate the manifest tool
+m4_defun([_LT_PATH_MANIFEST_TOOL],
+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
+  [lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*])
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+  MANIFEST_TOOL=:
+fi
+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
+])# _LT_PATH_MANIFEST_TOOL
+
+
+# LT_LIB_M
+# --------
+# check for math library
+AC_DEFUN([LT_LIB_M],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, cos, LIBM="-lm")
+  ;;
+esac
+AC_SUBST([LIBM])
+])# LT_LIB_M
+
+# Old name:
+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_CHECK_LIBM], [])
+
+
+# _LT_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------
+m4_defun([_LT_COMPILER_NO_RTTI],
+[m4_require([_LT_TAG_COMPILER])dnl
+
+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test "$GCC" = yes; then
+  case $cc_basename in
+  nvcc*)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+  esac
+
+  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
+	[Compiler flag to turn off builtin functions])
+])# _LT_COMPILER_NO_RTTI
+
+
+# _LT_CMD_GLOBAL_SYMBOLS
+# ----------------------
+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDEGRST]]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[[BCDEGRST]]'
+  ;;
+osf*)
+  symcode='[[BCDEGQRST]]'
+  ;;
+solaris*)
+  symcode='[[BDRT]]'
+  ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+esac
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function
+    # and D for any global variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK ['"\
+"     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx]"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT@&t@_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT@&t@_DLSYM_CONST
+#else
+# define LT@&t@_DLSYM_CONST const
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+LT@&t@_DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[[]] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
+	else
+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  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
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
+    [Take the output of nm and produce a listing of raw symbols and C names])
+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
+    [Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_c_name_address],
+    [lt_cv_sys_global_symbol_to_c_name_address], [1],
+    [Transform the output of nm in a C name address pair])
+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
+    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
+    [Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([], [nm_file_list_spec], [1],
+    [Specify filename containing input files for $NM])
+]) # _LT_CMD_GLOBAL_SYMBOLS
+
+
+# _LT_COMPILER_PIC([TAGNAME])
+# ---------------------------
+m4_defun([_LT_COMPILER_PIC],
+[m4_require([_LT_TAG_COMPILER])dnl
+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_TAGVAR(lt_prog_compiler_static, $1)=
+
+m4_if([$1], [CXX], [
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    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
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # 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*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[[4-9]]*)
+	# All AIX code is PIC.
+	if test "$host_cpu" = ia64; then
+	  # AIX 5 now supports IA64 processor
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	else
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      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).
+	m4_if([$1], [GCJ], [],
+	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    if test "$host_cpu" != ia64; then
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    ;;
+	  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,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd* | netbsdelf*-gnu)
+	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	;;
+    esac
+  fi
+],
+[
+  if test "$GCC" = yes; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    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
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+
+    hpux*)
+      # 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*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    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], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+      case $cc_basename in
+      # 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'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      ccc*)
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    rdos*)
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    unicos*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
+  fi
+])
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
+
+AC_CACHE_CHECK([for $compiler option to produce PIC],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
+    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
+    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
+	[Additional compiler flags for building library objects])
+
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+	[How to pass a linker flag through the compiler])
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
+	[Compiler flag to prevent dynamic linking])
+])# _LT_COMPILER_PIC
+
+
+# _LT_LINKER_SHLIBS([TAGNAME])
+# ----------------------------
+# See if the linker supports building shared libraries.
+m4_defun([_LT_LINKER_SHLIBS],
+[AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+m4_if([$1], [CXX], [
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  case $host_os in
+  aix[[4-9]]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    # Also, AIX nm treats weak defined symbols like other global defined
+    # symbols, whereas GNU nm marks them as "W".
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+    ;;
+  cygwin* | mingw* | cegcc*)
+    case $cc_basename in
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+      ;;
+    esac
+    ;;
+  linux* | k*bsd*-gnu | gnu*)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+    ;;
+  *)
+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+    ;;
+  esac
+], [
+  runpath_var=
+  _LT_TAGVAR(allow_undefined_flag, $1)=
+  _LT_TAGVAR(always_export_symbols, $1)=no
+  _LT_TAGVAR(archive_cmds, $1)=
+  _LT_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_TAGVAR(compiler_needs_object, $1)=no
+  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(hardcode_automatic, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_TAGVAR(inherit_rpath, $1)=no
+  _LT_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_TAGVAR(module_cmds, $1)=
+  _LT_TAGVAR(module_expsym_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  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++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  linux* | k*bsd*-gnu | gnu*)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+    ;;
+  esac
+
+  _LT_TAGVAR(ld_shlibs, $1)=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test "$with_gnu_ld" = yes; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
+	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test "$lt_use_gnu_ld_interface" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[[3-9]]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    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'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=no
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    haiku*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    interix[[3-9]]*)
+      _LT_TAGVAR(hardcode_direct, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test "$host_os" = linux-dietlibc; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test "$tmp_diet" = no
+      then
+	tmp_addflag=' $pic_flag'
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  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]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+        if test "x$supports_anon_versioning" = xyes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	    echo "local: *; };" >> $output_objdir/$libname.ver~
+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test "x$supports_anon_versioning" = xyes; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	      echo "local: *; };" >> $output_objdir/$libname.ver~
+	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+
+    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
+      runpath_var=
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	_LT_TAGVAR(hardcode_direct, $1)=unsupported
+      fi
+      ;;
+
+    aix[[4-9]]*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	# Also, AIX nm treats weak defined symbols like other global
+	# defined symbols, whereas GNU nm marks them as "W".
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	else
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      _LT_TAGVAR(archive_cmds, $1)=''
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
+	_LT_TAGVAR(link_all_deplibs, $1)=no
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	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
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        _LT_SYS_MODULE_PATH_AIX([$1])
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+	if test "$host_cpu" = ia64; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 _LT_SYS_MODULE_PATH_AIX([$1])
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	  if test "$with_gnu_ld" = yes; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  fi
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[[45]]*)
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      ;;
+
+    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
+      # no search path for DLLs.
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	_LT_TAGVAR(always_export_symbols, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	  else
+	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	  fi~
+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	  linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
+	  case $lt_outputfile in
+	    *.exe|*.EXE) ;;
+	    *)
+	      lt_outputfile="$lt_outputfile.exe"
+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
+	      ;;
+	  esac~
+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	    $RM "$lt_outputfile.manifest";
+	  fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	# FIXME: Should let the user specify the lib program.
+	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      _LT_DARWIN_LINKER_FEATURES($1)
+      ;;
+
+    dgux*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      ;;
+
+    hpux10*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  _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 $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	m4_if($1, [], [
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  _LT_LINKER_OPTION([if $CC understands -b],
+	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
+	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  ;;
+	*)
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+	# This should be the same for all languages, so no per-tag cache variable.
+	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
+	  [lt_cv_irix_exported_symbol],
+	  [save_LDFLAGS="$LDFLAGS"
+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+	   AC_LINK_IFELSE(
+	     [AC_LANG_SOURCE(
+	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+			      [C++], [[int foo (void) { return 0; }]],
+			      [Fortran 77], [[
+      subroutine foo
+      end]],
+			      [Fortran], [[
+      subroutine foo
+      end]])])],
+	      [lt_cv_irix_exported_symbol=yes],
+	      [lt_cv_irix_exported_symbol=no])
+           LDFLAGS="$save_LDFLAGS"])
+	if test "$lt_cv_irix_exported_symbol" = yes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+	fi
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(inherit_rpath, $1)=yes
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	     ;;
+	   *)
+	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+	fi
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='${wl}'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      case $host_os in
+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+        ;;
+	motorola)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4.3*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      _LT_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    esac
+
+    if test x$host_vendor = xsni; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+])
+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+
+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
+_LT_DECL([], [extract_expsyms_cmds], [2],
+    [The commands to extract the exported symbol list from a shared archive])
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $_LT_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # 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.
+      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+	[$RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+	  _LT_TAGVAR(allow_undefined_flag, $1)=
+	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+	  then
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	  else
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  fi
+	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+	])
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
+    [Whether or not to add -lc for building shared libraries])
+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
+    [enable_shared_with_static_runtimes], [0],
+    [Whether or not to disallow shared libs when runtime libs are static])
+_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
+    [Compiler flag to allow reflexive dlopens])
+_LT_TAGDECL([], [whole_archive_flag_spec], [1],
+    [Compiler flag to generate shared objects directly from archives])
+_LT_TAGDECL([], [compiler_needs_object], [1],
+    [Whether the compiler copes with passing no objects directly])
+_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
+    [Create an old-style archive from a shared archive])
+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
+    [Create a temporary old-style archive to link instead of a shared archive])
+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
+_LT_TAGDECL([], [archive_expsym_cmds], [2])
+_LT_TAGDECL([], [module_cmds], [2],
+    [Commands used to build a loadable module if different from building
+    a shared archive.])
+_LT_TAGDECL([], [module_expsym_cmds], [2])
+_LT_TAGDECL([], [with_gnu_ld], [1],
+    [Whether we are building with GNU ld or not])
+_LT_TAGDECL([], [allow_undefined_flag], [1],
+    [Flag that allows shared libraries with undefined symbols to be built])
+_LT_TAGDECL([], [no_undefined_flag], [1],
+    [Flag that enforces no undefined symbols])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
+    [Flag to hardcode $libdir into a binary during linking.
+    This must work even if $libdir does not exist])
+_LT_TAGDECL([], [hardcode_libdir_separator], [1],
+    [Whether we need a single "-rpath" flag with a separated argument])
+_LT_TAGDECL([], [hardcode_direct], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary])
+_LT_TAGDECL([], [hardcode_direct_absolute], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary and the resulting library dependency is
+    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
+    library is relocated])
+_LT_TAGDECL([], [hardcode_minus_L], [0],
+    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
+    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_automatic], [0],
+    [Set to "yes" if building a shared library automatically hardcodes DIR
+    into the library and all subsequent libraries and executables linked
+    against it])
+_LT_TAGDECL([], [inherit_rpath], [0],
+    [Set to yes if linker adds runtime paths of dependent libraries
+    to runtime path list])
+_LT_TAGDECL([], [link_all_deplibs], [0],
+    [Whether libtool must link a program against all its dependency libraries])
+_LT_TAGDECL([], [always_export_symbols], [0],
+    [Set to "yes" if exported symbols are required])
+_LT_TAGDECL([], [export_symbols_cmds], [2],
+    [The commands to list exported symbols])
+_LT_TAGDECL([], [exclude_expsyms], [1],
+    [Symbols that should not be listed in the preloaded symbols])
+_LT_TAGDECL([], [include_expsyms], [1],
+    [Symbols that must always be exported])
+_LT_TAGDECL([], [prelink_cmds], [2],
+    [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [postlink_cmds], [2],
+    [Commands necessary for finishing linking programs])
+_LT_TAGDECL([], [file_list_spec], [1],
+    [Specify filename containing input files])
+dnl FIXME: Not yet implemented
+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
+dnl    [Compiler flag to generate thread safe objects])
+])# _LT_LINKER_SHLIBS
+
+
+# _LT_LANG_C_CONFIG([TAG])
+# ------------------------
+# Ensure that the configuration variables for a C compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_C_CONFIG],
+[m4_require([_LT_DECL_EGREP])dnl
+lt_save_CC="$CC"
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_TAG_COMPILER
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_SYS_DYNAMIC_LINKER($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+  LT_SYS_DLOPEN_SELF
+  _LT_CMD_STRIPLIB
+
+  # Report which library types will actually be built
+  AC_MSG_CHECKING([if libtool supports shared libraries])
+  AC_MSG_RESULT([$can_build_shared])
+
+  AC_MSG_CHECKING([whether to build shared libraries])
+  test "$can_build_shared" = "no" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[[4-9]]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
+    ;;
+  esac
+  AC_MSG_RESULT([$enable_shared])
+
+  AC_MSG_CHECKING([whether to build static libraries])
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  AC_MSG_RESULT([$enable_static])
+
+  _LT_CONFIG($1)
+fi
+AC_LANG_POP
+CC="$lt_save_CC"
+])# _LT_LANG_C_CONFIG
+
+
+# _LT_LANG_CXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a C++ compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_CXX_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  AC_PROG_CXXCPP
+else
+  _lt_caught_CXX_error=yes
+fi
+
+AC_LANG_PUSH(C++)
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(compiler_needs_object, $1)=no
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_caught_CXX_error" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test "$GXX" = yes; then
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+    else
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+    fi
+
+    if test "$GXX" = yes; then
+      # Set up default GNU C++ configuration
+
+      LT_PATH_LD
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test "$with_gnu_ld" = yes; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='${wl}'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+        else
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+    _LT_TAGVAR(ld_shlibs, $1)=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+      aix[[4-9]]*)
+        if test "$host_cpu" = ia64; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=""
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # need to do runtime linking.
+          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	    for ld_flag in $LDFLAGS; do
+	      case $ld_flag in
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      esac
+	    done
+	    ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        _LT_TAGVAR(archive_cmds, $1)=''
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+        if test "$GXX" = yes; then
+          case $host_os in aix4.[[012]]|aix4.[[012]].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag="$shared_flag "'${wl}-G'
+	  fi
+        else
+          # not using gcc
+          if test "$host_cpu" = ia64; then
+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	  # chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+          else
+	    if test "$aix_use_runtimelinking" = yes; then
+	      shared_flag='${wl}-G'
+	    else
+	      shared_flag='${wl}-bM:SRE'
+	    fi
+          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
+        if test "$aix_use_runtimelinking" = yes; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          _LT_SYS_MODULE_PATH_AIX([$1])
+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+          if test "$host_cpu" = ia64; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    _LT_SYS_MODULE_PATH_AIX([$1])
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	    if test "$with_gnu_ld" = yes; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    fi
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	    # This is similar to how AIX traditionally builds its shared
+	    # libraries.
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+          fi
+        fi
+        ;;
+
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	  ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=yes
+	  _LT_TAGVAR(file_list_spec, $1)='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=".dll"
+	  # FIXME: Setting linknames here is a bad hack.
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	    else
+	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	    fi~
+	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	    linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	  # Don't use ranlib
+	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	    lt_tool_outputfile="@TOOL_OUTPUT@"~
+	    case $lt_outputfile in
+	      *.exe|*.EXE) ;;
+	      *)
+		lt_outputfile="$lt_outputfile.exe"
+		lt_tool_outputfile="$lt_tool_outputfile.exe"
+		;;
+	    esac~
+	    func_to_tool_file "$lt_outputfile"~
+	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	      $RM "$lt_outputfile.manifest";
+	    fi'
+	  ;;
+	*)
+	  # g++
+	  # _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'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=no
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file (1st line
+	    # is EXPORTS), use it as is; otherwise, prepend...
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      cp $export_symbols $output_objdir/$soname.def;
+	    else
+	      echo EXPORTS > $output_objdir/$soname.def;
+	      cat $export_symbols >> $output_objdir/$soname.def;
+	    fi~
+	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	  ;;
+	esac
+	;;
+      darwin* | rhapsody*)
+        _LT_DARWIN_LINKER_FEATURES($1)
+	;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      freebsd2.*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      freebsd-elf*)
+        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+        ;;
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+        ;;
+
+      haiku*)
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        ;;
+
+      hpux9*)
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            _LT_TAGVAR(ld_shlibs, $1)=no
+            ;;
+          aCC*)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            ;;
+          *)
+            if test "$GXX" = yes; then
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              _LT_TAGVAR(ld_shlibs, $1)=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test $with_gnu_ld = no; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            _LT_TAGVAR(hardcode_direct, $1)=no
+            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+            ;;
+          *)
+            _LT_TAGVAR(hardcode_direct, $1)=yes
+            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          aCC*)
+	    case $host_cpu in
+	      hppa*64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	    esac
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test $with_gnu_ld = no; then
+	        case $host_cpu in
+	          hppa*64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          ia64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[[3-9]]*)
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test "$with_gnu_ld" = no; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	      else
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+	      fi
+	    fi
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+	    ;;
+        esac
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(inherit_rpath, $1)=yes
+        ;;
+
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
+	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+		$RANLIB $oldlib'
+	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 and above use weak symbols
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+	    runpath_var=LD_RUN_PATH
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	    ;;
+	  xl* | mpixl* | bgxl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    if test "x$supports_anon_versioning" = xyes; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+		echo "local: *; };" >> $output_objdir/$libname.ver~
+		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	      _LT_TAGVAR(compiler_needs_object, $1)=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='func_echo_all'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	esac
+	;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+      *nto* | *qnx*)
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+	;;
+
+      openbsd2*)
+        # C++ shared libraries are fairly broken
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      openbsd*)
+	if test -f /usr/libexec/ld.so; then
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=func_echo_all
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+		;;
+	      *)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	          echo "-hidden">> $lib.exp~
+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
+	          $RM $lib.exp'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+		;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+	  *)
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	      case $host in
+	        osf3*)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	        *)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	    case $host_os in
+	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands `-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+
+	    output_verbose_link_cmd='func_echo_all'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      else
+	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	        # platform.
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      fi
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	      case $host_os in
+		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+		*)
+		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We can NOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly.  If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+	_LT_TAGVAR(link_all_deplibs, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
+	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+	      '"$_LT_TAGVAR(reload_cmds, $1)"
+	    ;;
+	  *)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+    esac
+
+    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+    _LT_TAGVAR(GCC, $1)="$GXX"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test "$_lt_caught_CXX_error" != yes
+
+AC_LANG_POP
+])# _LT_LANG_CXX_CONFIG
+
+
+# _LT_FUNC_STRIPNAME_CNF
+# ----------------------
+# func_stripname_cnf prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+#
+# This function is identical to the (non-XSI) version of func_stripname,
+# except this one can be used by m4 code that may be executed by configure,
+# rather than the libtool script.
+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
+AC_REQUIRE([_LT_DECL_SED])
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
+func_stripname_cnf ()
+{
+  case ${2} in
+  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+  esac
+} # func_stripname_cnf
+])# _LT_FUNC_STRIPNAME_CNF
+
+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
+# ---------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
+# Dependencies to place before and after the object being linked:
+_LT_TAGVAR(predep_objects, $1)=
+_LT_TAGVAR(postdep_objects, $1)=
+_LT_TAGVAR(predeps, $1)=
+_LT_TAGVAR(postdeps, $1)=
+_LT_TAGVAR(compiler_lib_search_path, $1)=
+
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
+int a;
+void foo (void) { a = 0; }
+_LT_EOF
+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+_LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
+])
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case ${prev}${p} in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" ||
+          test $p = "-R"; then
+	 prev=$p
+	 continue
+       fi
+
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
+       if test "$pre_test_object_deps_done" = no; then
+	 case ${prev} in
+	 -L | -R)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+	   else
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
+	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
+	 else
+	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+	 fi
+       fi
+       prev=
+       ;;
+
+    *.lto.$objext) ;; # Ignore GCC LTO objects
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
+	   _LT_TAGVAR(predep_objects, $1)="$p"
+	 else
+	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
+	 fi
+       else
+	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
+	   _LT_TAGVAR(postdep_objects, $1)="$p"
+	 else
+	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
+
+# PORTME: override above test on systems where it is broken
+m4_if([$1], [CXX],
+[case $host_os in
+interix[[3-9]]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_TAGVAR(predep_objects,$1)=
+  _LT_TAGVAR(postdep_objects,$1)=
+  _LT_TAGVAR(postdeps,$1)=
+  ;;
+
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC* | sunCC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+esac
+])
+
+case " $_LT_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
+    [The directories searched by this compiler when creating a shared library])
+_LT_TAGDECL([], [predep_objects], [1],
+    [Dependencies to place before and after the objects being linked to
+    create a shared library])
+_LT_TAGDECL([], [postdep_objects], [1])
+_LT_TAGDECL([], [predeps], [1])
+_LT_TAGDECL([], [postdeps], [1])
+_LT_TAGDECL([], [compiler_lib_search_path], [1],
+    [The library search path used internally by the compiler when linking
+    a shared library])
+])# _LT_SYS_HIDDEN_LIBDEPS
+
+
+# _LT_LANG_F77_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a Fortran 77 compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_F77_CONFIG],
+[AC_LANG_PUSH(Fortran 77)
+if test -z "$F77" || test "X$F77" = "Xno"; then
+  _lt_disable_F77=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the F77 compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_F77" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${F77-"f77"}
+  CFLAGS=$FFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+  GCC=$G77
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+	  test "$enable_shared" = yes && enable_static=no
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$G77"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC="$lt_save_CC"
+  CFLAGS="$lt_save_CFLAGS"
+fi # test "$_lt_disable_F77" != yes
+
+AC_LANG_POP
+])# _LT_LANG_F77_CONFIG
+
+
+# _LT_LANG_FC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for a Fortran compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_FC_CONFIG],
+[AC_LANG_PUSH(Fortran)
+
+if test -z "$FC" || test "X$FC" = "Xno"; then
+  _lt_disable_FC=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for fc test sources.
+ac_ext=${ac_fc_srcext-f}
+
+# Object file extension for compiled fc test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the FC compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_FC" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${FC-"f95"}
+  CFLAGS=$FCFLAGS
+  compiler=$CC
+  GCC=$ac_cv_fc_compiler_gnu
+
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+	  test "$enable_shared" = yes && enable_static=no
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test "$_lt_disable_FC" != yes
+
+AC_LANG_POP
+])# _LT_LANG_FC_CONFIG
+
+
+# _LT_LANG_GCJ_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Java Compiler compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GCJ_CONFIG],
+[AC_REQUIRE([LT_PROG_GCJ])dnl
+AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GCJ-"gcj"}
+CFLAGS=$GCJFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GCJ_CONFIG
+
+
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
+# _LT_LANG_RC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for the Windows resource compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_RC_CONFIG],
+[AC_REQUIRE([LT_PROG_RC])dnl
+AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="$lt_simple_compile_test_code"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=
+CC=${RC-"windres"}
+CFLAGS=
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+if test -n "$compiler"; then
+  :
+  _LT_CONFIG($1)
+fi
+
+GCC=$lt_save_GCC
+AC_LANG_RESTORE
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_RC_CONFIG
+
+
+# LT_PROG_GCJ
+# -----------
+AC_DEFUN([LT_PROG_GCJ],
+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
+    [AC_CHECK_TOOL(GCJ, gcj,)
+      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+      AC_SUBST(GCJFLAGS)])])[]dnl
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+
+
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
+# LT_PROG_RC
+# ----------
+AC_DEFUN([LT_PROG_RC],
+[AC_CHECK_TOOL(RC, windres,)
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_RC], [])
+
+
+# _LT_DECL_EGREP
+# --------------
+# If we don't have a new enough Autoconf to choose the best grep
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_EGREP],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_REQUIRE([AC_PROG_FGREP])dnl
+test -z "$GREP" && GREP=grep
+_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
+_LT_DECL([], [EGREP], [1], [An ERE matcher])
+_LT_DECL([], [FGREP], [1], [A literal string matcher])
+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
+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_DLLTOOL
+# ----------------
+# Ensure DLLTOOL variable is set.
+m4_defun([_LT_DECL_DLLTOOL],
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
+AC_SUBST([DLLTOOL])
+])
+
+# _LT_DECL_SED
+# ------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+m4_defun([_LT_DECL_SED],
+[AC_PROG_SED
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
+    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
+])# _LT_DECL_SED
+
+m4_ifndef([AC_PROG_SED], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+
+m4_defun([AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f $lt_ac_sed && continue
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test $lt_ac_count -gt 10 && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test $lt_ac_count -gt $lt_ac_max; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+])
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])#AC_PROG_SED
+])#m4_ifndef
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_SED], [])
+
+
+# _LT_CHECK_SHELL_FEATURES
+# ------------------------
+# Find out whether the shell is Bourne or XSI compatible,
+# or has some other useful features.
+m4_defun([_LT_CHECK_SHELL_FEATURES],
+[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,b/c, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+AC_MSG_RESULT([$xsi_shell])
+_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
+
+AC_MSG_CHECKING([whether the shell understands "+="])
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+AC_MSG_RESULT([$lt_shell_append])
+_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
+])# _LT_CHECK_SHELL_FEATURES
+
+
+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
+# ------------------------------------------------------
+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
+m4_defun([_LT_PROG_FUNCTION_REPLACE],
+[dnl {
+sed -e '/^$1 ()$/,/^} # $1 /c\
+$1 ()\
+{\
+m4_bpatsubsts([$2], [$], [\\], [^\([	 ]\)], [\\\1])
+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+])
+
+
+# _LT_PROG_REPLACE_SHELLFNS
+# -------------------------
+# Replace existing portable implementations of several shell functions with
+# equivalent extended shell implementations where those features are available..
+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
+[if test x"$xsi_shell" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac])
+
+  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
+    func_basename_result="${1##*/}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac
+    func_basename_result="${1##*/}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
+    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+    # positional parameters, so assign one to ordinary parameter first.
+    func_stripname_result=${3}
+    func_stripname_result=${func_stripname_result#"${1}"}
+    func_stripname_result=${func_stripname_result%"${2}"}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
+    func_split_long_opt_name=${1%%=*}
+    func_split_long_opt_arg=${1#*=}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
+    func_split_short_opt_arg=${1#??}
+    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
+    case ${1} in
+      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+      *)    func_lo2o_result=${1} ;;
+    esac])
+
+  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
+
+  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
+
+  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
+fi
+
+if test x"$lt_shell_append" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
+    func_quote_for_eval "${2}"
+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
+    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
+
+  # Save a `func_append' function call where possible by direct use of '+='
+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+else
+  # Save a `func_append' function call even when '+=' is not available
+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+fi
+
+if test x"$_lt_function_replace_fail" = x":"; then
+  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
+fi
+])
+
+# _LT_PATH_CONVERSION_FUNCTIONS
+# -----------------------------
+# Determine which file name conversion functions should be used by
+# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
+# for certain cross-compile configurations and native mingw.
+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_MSG_CHECKING([how to convert $build file names to $host format])
+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
+[case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+])
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
+         [0], [convert $build file names to $host format])dnl
+
+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
+[#assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+])
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+         [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS
diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4
new file mode 100644
index 0000000..5d9acd8
--- /dev/null
+++ b/m4/ltoptions.m4
@@ -0,0 +1,384 @@
+# Helper functions for option handling.                    -*- Autoconf -*-
+#
+#   Copyright (C) 2004, 2005, 2007, 2008, 2009 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 7 ltoptions.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+
+
+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
+# ------------------------------------------
+m4_define([_LT_MANGLE_OPTION],
+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
+
+
+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
+# ---------------------------------------
+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
+# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
+# saved as a flag.
+m4_define([_LT_SET_OPTION],
+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
+        _LT_MANGLE_DEFUN([$1], [$2]),
+    [m4_warning([Unknown $1 option `$2'])])[]dnl
+])
+
+
+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
+# ------------------------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+m4_define([_LT_IF_OPTION],
+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
+
+
+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
+# -------------------------------------------------------
+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
+# are set.
+m4_define([_LT_UNLESS_OPTIONS],
+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
+		      [m4_define([$0_found])])])[]dnl
+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
+])[]dnl
+])
+
+
+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
+# ----------------------------------------
+# OPTION-LIST is a space-separated list of Libtool options associated
+# with MACRO-NAME.  If any OPTION has a matching handler declared with
+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
+# the unknown option and exit.
+m4_defun([_LT_SET_OPTIONS],
+[# Set options
+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+    [_LT_SET_OPTION([$1], _LT_Option)])
+
+m4_if([$1],[LT_INIT],[
+  dnl
+  dnl Simply set some default values (i.e off) if boolean options were not
+  dnl specified:
+  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
+  ])
+  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
+  ])
+  dnl
+  dnl If no reference was made to various pairs of opposing options, then
+  dnl we run the default mode handler for the pair.  For example, if neither
+  dnl `shared' nor `disable-shared' was passed, we enable building of shared
+  dnl archives by default:
+  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
+  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
+  		   [_LT_ENABLE_FAST_INSTALL])
+  ])
+])# _LT_SET_OPTIONS
+
+
+## --------------------------------- ##
+## Macros to handle LT_INIT options. ##
+## --------------------------------- ##
+
+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
+# -----------------------------------------
+m4_define([_LT_MANGLE_DEFUN],
+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+
+
+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
+# -----------------------------------------------
+m4_define([LT_OPTION_DEFINE],
+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
+])# LT_OPTION_DEFINE
+
+
+# dlopen
+# ------
+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
+])
+
+AU_DEFUN([AC_LIBTOOL_DLOPEN],
+[_LT_SET_OPTION([LT_INIT], [dlopen])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `dlopen' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
+
+
+# win32-dll
+# ---------
+# Declare package support for building win32 dll's.
+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
+[enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+esac
+
+test -z "$AS" && AS=as
+_LT_DECL([], [AS],      [1], [Assembler program])dnl
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
+])# win32-dll
+
+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+_LT_SET_OPTION([LT_INIT], [win32-dll])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `win32-dll' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
+
+
+# _LT_ENABLE_SHARED([DEFAULT])
+# ----------------------------
+# implement the --enable-shared flag, and supports the `shared' and
+# `disable-shared' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_SHARED],
+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([shared],
+    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
+
+    _LT_DECL([build_libtool_libs], [enable_shared], [0],
+	[Whether or not to build shared libraries])
+])# _LT_ENABLE_SHARED
+
+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+])
+
+AC_DEFUN([AC_DISABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], [disable-shared])
+])
+
+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+
+
+
+# _LT_ENABLE_STATIC([DEFAULT])
+# ----------------------------
+# implement the --enable-static flag, and support the `static' and
+# `disable-static' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_STATIC],
+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([static],
+    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
+
+    _LT_DECL([build_old_libs], [enable_static], [0],
+	[Whether or not to build static libraries])
+])# _LT_ENABLE_STATIC
+
+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+])
+
+AC_DEFUN([AC_DISABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], [disable-static])
+])
+
+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+
+
+
+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
+# ----------------------------------
+# implement the --enable-fast-install flag, and support the `fast-install'
+# and `disable-fast-install' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_FAST_INSTALL],
+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([fast-install],
+    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+
+_LT_DECL([fast_install], [enable_fast_install], [0],
+	 [Whether or not to optimize for fast installation])dnl
+])# _LT_ENABLE_FAST_INSTALL
+
+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
+
+# Old names:
+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `fast-install' option into LT_INIT's first parameter.])
+])
+
+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `disable-fast-install' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+
+
+# _LT_WITH_PIC([MODE])
+# --------------------
+# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+# LT_INIT options.
+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+m4_define([_LT_WITH_PIC],
+[AC_ARG_WITH([pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [pic_mode=default])
+
+test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+
+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
+])# _LT_WITH_PIC
+
+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+
+# Old name:
+AU_DEFUN([AC_LIBTOOL_PICMODE],
+[_LT_SET_OPTION([LT_INIT], [pic-only])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `pic-only' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+
+## ----------------- ##
+## LTDL_INIT Options ##
+## ----------------- ##
+
+m4_define([_LTDL_MODE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
+		 [m4_define([_LTDL_MODE], [nonrecursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
+		 [m4_define([_LTDL_MODE], [recursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
+		 [m4_define([_LTDL_MODE], [subproject])])
+
+m4_define([_LTDL_TYPE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [installable],
+		 [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+		 [m4_define([_LTDL_TYPE], [convenience])])
diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4
new file mode 100644
index 0000000..9000a05
--- /dev/null
+++ b/m4/ltsugar.m4
@@ -0,0 +1,123 @@
+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
+#
+# 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 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])])
+
+
+# lt_join(SEP, ARG1, [ARG2...])
+# -----------------------------
+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
+# associated separator.
+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
+# versions in m4sugar had bugs.
+m4_define([lt_join],
+[m4_if([$#], [1], [],
+       [$#], [2], [[$2]],
+       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
+m4_define([_lt_join],
+[m4_if([$#$2], [2], [],
+       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
+
+
+# lt_car(LIST)
+# lt_cdr(LIST)
+# ------------
+# Manipulate m4 lists.
+# These macros are necessary as long as will still need to support
+# Autoconf-2.59 which quotes differently.
+m4_define([lt_car], [[$1]])
+m4_define([lt_cdr],
+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
+       [$#], 1, [],
+       [m4_dquote(m4_shift($@))])])
+m4_define([lt_unquote], $1)
+
+
+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
+# ------------------------------------------
+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Note that neither SEPARATOR nor STRING are expanded; they are appended
+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
+# than defined and empty).
+#
+# This macro is needed until we can rely on Autoconf 2.62, since earlier
+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
+m4_define([lt_append],
+[m4_define([$1],
+	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
+
+
+
+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
+# ----------------------------------------------------------
+# 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(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])
+# -----------------------------------------------------------------------
+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
+m4_define([lt_if_append_uniq],
+[m4_ifdef([$1],
+	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
+		 [lt_append([$1], [$2], [$3])$4],
+		 [$5])],
+	  [lt_append([$1], [$2], [$3])$4])])
+
+
+# lt_dict_add(DICT, KEY, VALUE)
+# -----------------------------
+m4_define([lt_dict_add],
+[m4_define([$1($2)], [$3])])
+
+
+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
+# --------------------------------------------
+m4_define([lt_dict_add_subkey],
+[m4_define([$1($2:$3)], [$4])])
+
+
+# lt_dict_fetch(DICT, KEY, [SUBKEY])
+# ----------------------------------
+m4_define([lt_dict_fetch],
+[m4_ifval([$3],
+	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
+    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
+
+
+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
+# -----------------------------------------------------------------
+m4_define([lt_if_dict_fetch],
+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
+	[$5],
+    [$6])])
+
+
+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
+# --------------------------------------------------------------
+m4_define([lt_dict_filter],
+[m4_if([$5], [], [],
+  [lt_join(m4_quote(m4_default([$4], [[, ]])),
+           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+])
diff --git a/m4/ltversion.m4 b/m4/ltversion.m4
new file mode 100644
index 0000000..07a8602
--- /dev/null
+++ b/m4/ltversion.m4
@@ -0,0 +1,23 @@
+# ltversion.m4 -- version numbers			-*- Autoconf -*-
+#
+#   Copyright (C) 2004 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 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.
+
+# @configure_input@
+
+# serial 3337 ltversion.m4
+# This file is part of GNU Libtool
+
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
+
+AC_DEFUN([LTVERSION_VERSION],
+[macro_version='2.4.2'
+macro_revision='1.3337'
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])
diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4
new file mode 100644
index 0000000..c573da9
--- /dev/null
+++ b/m4/lt~obsolete.m4
@@ -0,0 +1,98 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
+#
+#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 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 lt~obsolete.m4
+
+# These exist entirely to fool aclocal when bootstrapping libtool.
+#
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# which have later been changed to m4_define as they aren't part of the
+# exported API, or moved to Autoconf or Automake where they belong.
+#
+# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
+# using a macro with the same name in our local m4/libtool.m4 it'll
+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
+# and doesn't know about Autoconf macros at all.)
+#
+# So we provide this file, which has a silly filename so it's always
+# included after everything else.  This provides aclocal with the
+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
+# because those macros already exist, or will be overwritten later.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
+#
+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
+# Yes, that means every name once taken will need to remain here until
+# we give up compatibility with versions before 1.7, at which point
+# we need to keep only those names which we still refer to.
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
+
+m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
+m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
+m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
+m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
+m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
+m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
+m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
+m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
+m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
+m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
+m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
+m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
+m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
+m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
+m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
+m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
+m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
+m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
+m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
+m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
+m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
+m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
+m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
+m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
+m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
+m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
+m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
+m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
+m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
+m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
+m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
diff --git a/m4/python.m4 b/m4/python.m4
index c9cdf5d..5bf200c 100644
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -146,7 +146,7 @@ AC_DEFUN([JD_PATH_PYTHON],
   dnl Find a Python interpreter.  Python versions prior to 2.0 are not
   dnl supported
   m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
-                    [python python2 python2.7 python2.6 python3 python3.2 python3.1])
+                    [python3 python3.3 python3.2 python3.1 python2 python2.7 python2.6 python])
 
   m4_if([$1],[],[
     dnl No version check is needed.
diff --git a/pygtkcompat/Makefile.am b/pygtkcompat/Makefile.am
new file mode 100644
index 0000000..6a73cb4
--- /dev/null
+++ b/pygtkcompat/Makefile.am
@@ -0,0 +1,15 @@
+pygtkcompatdir = $(pyexecdir)/pygtkcompat
+
+pygtkcompat_PYTHON = \
+	__init__.py \
+	pygtkcompat.py
+
+# if we build in a separate tree, we need to symlink the *.py files from the
+# source tree; Python does not accept the extensions and modules in different
+# paths
+build_pylinks:
+	for f in $(pygtkcompat_PYTHON); do \
+	    [ -e $(builddir)/$$f ] || $(LN_S) $(srcdir)/$$f $(builddir)/$$f; \
+	done
+
+all-local: build_pylinks
diff --git a/pygtkcompat/Makefile.in b/pygtkcompat/Makefile.in
new file mode 100644
index 0000000..cc97cc7
--- /dev/null
+++ b/pygtkcompat/Makefile.in
@@ -0,0 +1,529 @@
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = pygtkcompat
+DIST_COMMON = $(pygtkcompat_PYTHON) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \
+	$(top_srcdir)/m4/jhflags.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile)
+am__installdirs = "$(DESTDIR)$(pygtkcompatdir)"
+py_compile = $(top_srcdir)/py-compile
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIR = @DATADIR@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FFI_CFLAGS = @FFI_CFLAGS@
+FFI_LIBS = @FFI_LIBS@
+FGREP = @FGREP@
+GENHTML = @GENHTML@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GI_CFLAGS = @GI_CFLAGS@
+GI_DATADIR = @GI_DATADIR@
+GI_LIBS = @GI_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+LCOV = @LCOV@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBFFI_PC = @LIBFFI_PC@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLATFORM = @PLATFORM@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGOBJECT_MAJOR_VERSION = @PYGOBJECT_MAJOR_VERSION@
+PYGOBJECT_MICRO_VERSION = @PYGOBJECT_MICRO_VERSION@
+PYGOBJECT_MINOR_VERSION = @PYGOBJECT_MINOR_VERSION@
+PYTHON = @PYTHON@
+PYTHON_BASENAME = @PYTHON_BASENAME@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_LIBS = @PYTHON_LIBS@
+PYTHON_LIB_LOC = @PYTHON_LIB_LOC@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+THREADING_CFLAGS = @THREADING_CFLAGS@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+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@
+pygtkcompatdir = $(pyexecdir)/pygtkcompat
+pygtkcompat_PYTHON = \
+	__init__.py \
+	pygtkcompat.py
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pygtkcompat/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign pygtkcompat/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pygtkcompatPYTHON: $(pygtkcompat_PYTHON)
+	@$(NORMAL_INSTALL)
+	@list='$(pygtkcompat_PYTHON)'; dlist=; list2=; test -n "$(pygtkcompatdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pygtkcompatdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pygtkcompatdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
+	  if test -f $$b$$p; then \
+	    $(am__strip_dir) \
+	    dlist="$$dlist $$f"; \
+	    list2="$$list2 $$b$$p"; \
+	  else :; fi; \
+	done; \
+	for file in $$list2; do echo $$file; done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pygtkcompatdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pygtkcompatdir)" || exit $$?; \
+	done || exit $$?; \
+	if test -n "$$dlist"; then \
+	  if test -z "$(DESTDIR)"; then \
+	    $(am__py_compile) --basedir "$(pygtkcompatdir)" $$dlist; \
+	  else \
+	    $(am__py_compile) --destdir "$(DESTDIR)" \
+	                      --basedir "$(pygtkcompatdir)" $$dlist; \
+	  fi; \
+	else :; fi
+
+uninstall-pygtkcompatPYTHON:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pygtkcompat_PYTHON)'; test -n "$(pygtkcompatdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	dir='$(DESTDIR)$(pygtkcompatdir)'; \
+	filesc=`echo "$$files" | sed 's|$$|c|'`; \
+	fileso=`echo "$$files" | sed 's|$$|o|'`; \
+	st=0; \
+	for files in "$$files" "$$filesc" "$$fileso"; do \
+	  $(am__uninstall_files_from_dir) || st=$$?; \
+	done; \
+	exit $$st
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@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; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile all-local
+installdirs:
+	for dir in "$(DESTDIR)$(pygtkcompatdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pygtkcompatPYTHON
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pygtkcompatPYTHON
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am all-local 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-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-pygtkcompatPYTHON 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-pygtkcompatPYTHON
+
+
+# if we build in a separate tree, we need to symlink the *.py files from the
+# source tree; Python does not accept the extensions and modules in different
+# paths
+build_pylinks:
+	for f in $(pygtkcompat_PYTHON); do \
+	    [ -e $(builddir)/$$f ] || $(LN_S) $(srcdir)/$$f $(builddir)/$$f; \
+	done
+
+all-local: build_pylinks
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/pygtkcompat/__init__.py b/pygtkcompat/__init__.py
new file mode 100644
index 0000000..8ae0337
--- /dev/null
+++ b/pygtkcompat/__init__.py
@@ -0,0 +1,20 @@
+
+# pyflakes.ignore
+from .pygtkcompat import (enable,
+                          enable_gtk,
+                          enable_vte,
+                          enable_poppler,
+                          enable_webkit,
+                          enable_gudev,
+                          enable_gst,
+                          enable_goocanvas)
+
+
+__all__ = ['enable',
+           'enable_gtk',
+           'enable_vte',
+           'enable_poppler',
+           'enable_webkit',
+           'enable_gudev',
+           'enable_gst',
+           'enable_goocanvas']
diff --git a/pygtkcompat/pygtkcompat.py b/pygtkcompat/pygtkcompat.py
new file mode 100644
index 0000000..7b37599
--- /dev/null
+++ b/pygtkcompat/pygtkcompat.py
@@ -0,0 +1,501 @@
+# -*- Mode: Python; py-indent-offset: 4 -*-
+# vim: tabstop=4 shiftwidth=4 expandtab
+#
+# Copyright (C) 2011-2012 Johan Dahlin <johan@gnome.org>
+#
+# This library 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 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
+# USA
+
+"""
+PyGTK compatibility layer.
+
+This modules goes a little bit longer to maintain PyGTK compatibility than
+the normal overrides system.
+
+It is recommended to not depend on this layer, but only use it as an
+intermediate step when porting your application to PyGI.
+
+Compatibility might never be 100%, but the aim is to make it possible to run
+a well behaved PyGTK application mostly unmodified on top of PyGI.
+
+"""
+
+import sys
+import warnings
+
+try:
+    # Python 3
+    from collections import UserList
+    from imp import reload
+    UserList  # pyflakes
+except ImportError:
+    # Python 2 ships that in a different module
+    from UserList import UserList
+    UserList  # pyflakes
+
+import gi
+from gi.repository import GObject
+
+
+def _install_enums(module, dest=None, strip=''):
+    if dest is None:
+        dest = module
+    modname = dest.__name__.rsplit('.', 1)[1].upper()
+    for attr in dir(module):
+        try:
+            obj = getattr(module, attr, None)
+        except:
+            continue
+        try:
+            if issubclass(obj, GObject.GEnum):
+                for value, enum in obj.__enum_values__.items():
+                    name = enum.value_name
+                    name = name.replace(modname + '_', '')
+                    if strip and name.startswith(strip):
+                        name = name[len(strip):]
+                    setattr(dest, name, enum)
+        except TypeError:
+            continue
+        try:
+            if issubclass(obj, GObject.GFlags):
+                for value, flag in obj.__flags_values__.items():
+                    name = flag.value_names[-1].replace(modname + '_', '')
+                    setattr(dest, name, flag)
+        except TypeError:
+            continue
+
+
+def enable():
+    # gobject
+    from gi.repository import GLib
+    sys.modules['glib'] = GLib
+
+    # gobject
+    from gi.repository import GObject
+    sys.modules['gobject'] = GObject
+    from gi._gobject import propertyhelper
+    sys.modules['gobject.propertyhelper'] = propertyhelper
+
+    # gio
+    from gi.repository import Gio
+    sys.modules['gio'] = Gio
+
+_unset = object()
+
+
+def enable_gtk(version='2.0'):
+    # set the default encoding like PyGTK
+    reload(sys)
+    if sys.version_info < (3, 0):
+        sys.setdefaultencoding('utf-8')
+
+    # atk
+    gi.require_version('Atk', '1.0')
+    from gi.repository import Atk
+    sys.modules['atk'] = Atk
+    _install_enums(Atk)
+
+    # pango
+    gi.require_version('Pango', '1.0')
+    from gi.repository import Pango
+    sys.modules['pango'] = Pango
+    _install_enums(Pango)
+
+    # pangocairo
+    gi.require_version('PangoCairo', '1.0')
+    from gi.repository import PangoCairo
+    sys.modules['pangocairo'] = PangoCairo
+
+    # gdk
+    gi.require_version('Gdk', version)
+    gi.require_version('GdkPixbuf', '2.0')
+    from gi.repository import Gdk
+    from gi.repository import GdkPixbuf
+    sys.modules['gtk.gdk'] = Gdk
+    _install_enums(Gdk)
+    _install_enums(GdkPixbuf, dest=Gdk)
+    Gdk._2BUTTON_PRESS = 5
+    Gdk.BUTTON_PRESS = 4
+
+    Gdk.screen_get_default = Gdk.Screen.get_default
+    Gdk.Pixbuf = GdkPixbuf.Pixbuf
+    Gdk.PixbufLoader = GdkPixbuf.PixbufLoader.new_with_type
+    Gdk.pixbuf_new_from_data = GdkPixbuf.Pixbuf.new_from_data
+    Gdk.pixbuf_new_from_file = GdkPixbuf.Pixbuf.new_from_file
+    Gdk.pixbuf_new_from_file_at_scale = GdkPixbuf.Pixbuf.new_from_file_at_scale
+    Gdk.pixbuf_new_from_file_at_size = GdkPixbuf.Pixbuf.new_from_file_at_size
+    Gdk.pixbuf_new_from_inline = GdkPixbuf.Pixbuf.new_from_inline
+    Gdk.pixbuf_new_from_stream = GdkPixbuf.Pixbuf.new_from_stream
+    Gdk.pixbuf_new_from_stream_at_scale = GdkPixbuf.Pixbuf.new_from_stream_at_scale
+    Gdk.pixbuf_new_from_xpm_data = GdkPixbuf.Pixbuf.new_from_xpm_data
+    Gdk.pixbuf_get_file_info = GdkPixbuf.Pixbuf.get_file_info
+
+    orig_get_formats = GdkPixbuf.Pixbuf.get_formats
+
+    def get_formats():
+        formats = orig_get_formats()
+        result = []
+
+        def make_dict(format_):
+            result = {}
+            result['description'] = format_.get_description()
+            result['name'] = format_.get_name()
+            result['mime_types'] = format_.get_mime_types()
+            result['extensions'] = format_.get_extensions()
+            return result
+
+        for format_ in formats:
+            result.append(make_dict(format_))
+        return result
+
+    Gdk.pixbuf_get_formats = get_formats
+
+    orig_get_frame_extents = Gdk.Window.get_frame_extents
+
+    def get_frame_extents(window):
+        try:
+            try:
+                rect = Gdk.Rectangle(0, 0, 0, 0)
+            except TypeError:
+                rect = Gdk.Rectangle()
+            orig_get_frame_extents(window, rect)
+        except TypeError:
+            rect = orig_get_frame_extents(window)
+        return rect
+    Gdk.Window.get_frame_extents = get_frame_extents
+
+    orig_get_origin = Gdk.Window.get_origin
+
+    def get_origin(self):
+        return orig_get_origin(self)[1:]
+    Gdk.Window.get_origin = get_origin
+
+    Gdk.screen_width = Gdk.Screen.width
+    Gdk.screen_height = Gdk.Screen.height
+
+    # gtk
+    gi.require_version('Gtk', version)
+    from gi.repository import Gtk
+    sys.modules['gtk'] = Gtk
+    Gtk.gdk = Gdk
+
+    Gtk.pygtk_version = (2, 99, 0)
+
+    Gtk.gtk_version = (Gtk.MAJOR_VERSION,
+                       Gtk.MINOR_VERSION,
+                       Gtk.MICRO_VERSION)
+    _install_enums(Gtk)
+
+    # Action
+
+    def set_tool_item_type(menuaction, gtype):
+        warnings.warn('set_tool_item_type() is not supported',
+                      gi.PyGIDeprecationWarning, stacklevel=2)
+    Gtk.Action.set_tool_item_type = classmethod(set_tool_item_type)
+
+    # Alignment
+
+    orig_Alignment = Gtk.Alignment
+
+    class Alignment(orig_Alignment):
+        def __init__(self, xalign=0.0, yalign=0.0, xscale=0.0, yscale=0.0):
+            orig_Alignment.__init__(self)
+            self.props.xalign = xalign
+            self.props.yalign = yalign
+            self.props.xscale = xscale
+            self.props.yscale = yscale
+
+    Gtk.Alignment = Alignment
+
+    # Box
+
+    orig_pack_end = Gtk.Box.pack_end
+
+    def pack_end(self, child, expand=True, fill=True, padding=0):
+        orig_pack_end(self, child, expand, fill, padding)
+    Gtk.Box.pack_end = pack_end
+
+    orig_pack_start = Gtk.Box.pack_start
+
+    def pack_start(self, child, expand=True, fill=True, padding=0):
+        orig_pack_start(self, child, expand, fill, padding)
+    Gtk.Box.pack_start = pack_start
+
+    # TreeViewColumn
+
+    orig_tree_view_column_pack_end = Gtk.TreeViewColumn.pack_end
+
+    def tree_view_column_pack_end(self, cell, expand=True):
+        orig_tree_view_column_pack_end(self, cell, expand)
+    Gtk.TreeViewColumn.pack_end = tree_view_column_pack_end
+
+    orig_tree_view_column_pack_start = Gtk.TreeViewColumn.pack_start
+
+    def tree_view_column_pack_start(self, cell, expand=True):
+        orig_tree_view_column_pack_start(self, cell, expand)
+    Gtk.TreeViewColumn.pack_start = tree_view_column_pack_start
+
+    # CellLayout
+
+    orig_cell_pack_end = Gtk.CellLayout.pack_end
+
+    def cell_pack_end(self, cell, expand=True):
+        orig_cell_pack_end(self, cell, expand)
+    Gtk.CellLayout.pack_end = cell_pack_end
+
+    orig_cell_pack_start = Gtk.CellLayout.pack_start
+
+    def cell_pack_start(self, cell, expand=True):
+        orig_cell_pack_start(self, cell, expand)
+    Gtk.CellLayout.pack_start = cell_pack_start
+
+    orig_set_cell_data_func = Gtk.CellLayout.set_cell_data_func
+
+    def set_cell_data_func(self, cell, func, user_data=_unset):
+        def callback(*args):
+            if args[-1] == _unset:
+                args = args[:-1]
+            return func(*args)
+        orig_set_cell_data_func(self, cell, callback, user_data)
+    Gtk.CellLayout.set_cell_data_func = set_cell_data_func
+
+    # CellRenderer
+
+    class GenericCellRenderer(Gtk.CellRenderer):
+        pass
+    Gtk.GenericCellRenderer = GenericCellRenderer
+
+    # ComboBox
+
+    orig_combo_row_separator_func = Gtk.ComboBox.set_row_separator_func
+
+    def combo_row_separator_func(self, func, user_data=_unset):
+        def callback(*args):
+            if args[-1] == _unset:
+                args = args[:-1]
+            return func(*args)
+        orig_combo_row_separator_func(self, callback, user_data)
+    Gtk.ComboBox.set_row_separator_func = combo_row_separator_func
+
+    # ComboBoxEntry
+
+    class ComboBoxEntry(Gtk.ComboBox):
+        def __init__(self, **kwds):
+            Gtk.ComboBox.__init__(self, has_entry=True, **kwds)
+
+        def set_text_column(self, text_column):
+            self.set_entry_text_column(text_column)
+
+        def get_text_column(self):
+            return self.get_entry_text_column()
+    Gtk.ComboBoxEntry = ComboBoxEntry
+
+    def combo_box_entry_new():
+        return Gtk.ComboBoxEntry()
+    Gtk.combo_box_entry_new = combo_box_entry_new
+
+    def combo_box_entry_new_with_model(model):
+        return Gtk.ComboBoxEntry(model=model)
+    Gtk.combo_box_entry_new_with_model = combo_box_entry_new_with_model
+
+    # Container
+
+    def install_child_property(container, flag, pspec):
+        warnings.warn('install_child_property() is not supported',
+                      gi.PyGIDeprecationWarning, stacklevel=2)
+    Gtk.Container.install_child_property = classmethod(install_child_property)
+
+    def new_text():
+        combo = Gtk.ComboBox()
+        model = Gtk.ListStore(str)
+        combo.set_model(model)
+        combo.set_entry_text_column(0)
+        return combo
+    Gtk.combo_box_new_text = new_text
+
+    def append_text(self, text):
+        model = self.get_model()
+        model.append([text])
+    Gtk.ComboBox.append_text = append_text
+    Gtk.expander_new_with_mnemonic = Gtk.Expander.new_with_mnemonic
+    Gtk.icon_theme_get_default = Gtk.IconTheme.get_default
+    Gtk.image_new_from_pixbuf = Gtk.Image.new_from_pixbuf
+    Gtk.image_new_from_stock = Gtk.Image.new_from_stock
+    Gtk.image_new_from_animation = Gtk.Image.new_from_animation
+    Gtk.image_new_from_icon_set = Gtk.Image.new_from_icon_set
+    Gtk.image_new_from_file = Gtk.Image.new_from_file
+    Gtk.settings_get_default = Gtk.Settings.get_default
+    Gtk.window_set_default_icon = Gtk.Window.set_default_icon
+    Gtk.clipboard_get = Gtk.Clipboard.get
+
+    #AccelGroup
+    Gtk.AccelGroup.connect_group = Gtk.AccelGroup.connect
+
+    #StatusIcon
+    Gtk.status_icon_position_menu = Gtk.StatusIcon.position_menu
+    Gtk.StatusIcon.set_tooltip = Gtk.StatusIcon.set_tooltip_text
+
+    # Scale
+
+    orig_HScale = Gtk.HScale
+    orig_VScale = Gtk.VScale
+
+    class HScale(orig_HScale):
+        def __init__(self, adjustment=None):
+            orig_HScale.__init__(self, adjustment=adjustment)
+    Gtk.HScale = HScale
+
+    class VScale(orig_VScale):
+        def __init__(self, adjustment=None):
+            orig_VScale.__init__(self, adjustment=adjustment)
+    Gtk.VScale = VScale
+
+    Gtk.stock_add = lambda items: None
+
+    # Widget
+
+    Gtk.widget_get_default_direction = Gtk.Widget.get_default_direction
+    orig_size_request = Gtk.Widget.size_request
+
+    def size_request(widget):
+        class SizeRequest(UserList):
+            def __init__(self, req):
+                self.height = req.height
+                self.width = req.width
+                UserList.__init__(self, [self.width, self.height])
+        return SizeRequest(orig_size_request(widget))
+    Gtk.Widget.size_request = size_request
+    Gtk.Widget.hide_all = Gtk.Widget.hide
+
+    class BaseGetter(object):
+        def __init__(self, context):
+            self.context = context
+
+        def __getitem__(self, state):
+            color = self.context.get_background_color(state)
+            return Gdk.Color(red=int(color.red * 65535),
+                             green=int(color.green * 65535),
+                             blue=int(color.blue * 65535))
+
+    class Styles(object):
+        def __init__(self, widget):
+            context = widget.get_style_context()
+            self.base = BaseGetter(context)
+            self.black = Gdk.Color(red=0, green=0, blue=0)
+
+    class StyleDescriptor(object):
+        def __get__(self, instance, class_):
+            return Styles(instance)
+    Gtk.Widget.style = StyleDescriptor()
+
+    # gtk.unixprint
+
+    class UnixPrint(object):
+        pass
+    unixprint = UnixPrint()
+    sys.modules['gtkunixprint'] = unixprint
+
+    # gtk.keysyms
+
+    class Keysyms(object):
+        pass
+    keysyms = Keysyms()
+    sys.modules['gtk.keysyms'] = keysyms
+    Gtk.keysyms = keysyms
+    for name in dir(Gdk):
+        if name.startswith('KEY_'):
+            target = name[4:]
+            if target[0] in '0123456789':
+                target = '_' + target
+            value = getattr(Gdk, name)
+            setattr(keysyms, target, value)
+
+
+def enable_vte():
+    gi.require_version('Vte', '0.0')
+    from gi.repository import Vte
+    sys.modules['vte'] = Vte
+
+
+def enable_poppler():
+    gi.require_version('Poppler', '0.18')
+    from gi.repository import Poppler
+    sys.modules['poppler'] = Poppler
+    Poppler.pypoppler_version = (1, 0, 0)
+
+
+def enable_webkit(version='1.0'):
+    gi.require_version('WebKit', version)
+    from gi.repository import WebKit
+    sys.modules['webkit'] = WebKit
+    WebKit.WebView.get_web_inspector = WebKit.WebView.get_inspector
+
+
+def enable_gudev():
+    gi.require_version('GUdev', '1.0')
+    from gi.repository import GUdev
+    sys.modules['gudev'] = GUdev
+
+
+def enable_gst():
+    gi.require_version('Gst', '0.10')
+    from gi.repository import Gst
+    sys.modules['gst'] = Gst
+    _install_enums(Gst)
+    Gst.registry_get_default = Gst.Registry.get_default
+    Gst.element_register = Gst.Element.register
+    Gst.element_factory_make = Gst.ElementFactory.make
+    Gst.caps_new_any = Gst.Caps.new_any
+    Gst.get_pygst_version = lambda: (0, 10, 19)
+    Gst.get_gst_version = lambda: (0, 10, 40)
+
+    from gi.repository import GstInterfaces
+    sys.modules['gst.interfaces'] = GstInterfaces
+    _install_enums(GstInterfaces)
+
+    from gi.repository import GstAudio
+    sys.modules['gst.audio'] = GstAudio
+    _install_enums(GstAudio)
+
+    from gi.repository import GstVideo
+    sys.modules['gst.video'] = GstVideo
+    _install_enums(GstVideo)
+
+    from gi.repository import GstBase
+    sys.modules['gst.base'] = GstBase
+    _install_enums(GstBase)
+
+    Gst.BaseTransform = GstBase.BaseTransform
+    Gst.BaseSink = GstBase.BaseSink
+
+    from gi.repository import GstController
+    sys.modules['gst.controller'] = GstController
+    _install_enums(GstController, dest=Gst)
+
+    from gi.repository import GstPbutils
+    sys.modules['gst.pbutils'] = GstPbutils
+    _install_enums(GstPbutils)
+
+
+def enable_goocanvas():
+    gi.require_version('GooCanvas', '2.0')
+    from gi.repository import GooCanvas
+    sys.modules['goocanvas'] = GooCanvas
+    _install_enums(GooCanvas, strip='GOO_CANVAS_')
+    GooCanvas.ItemSimple = GooCanvas.CanvasItemSimple
+    GooCanvas.Item = GooCanvas.CanvasItem
+    GooCanvas.Image = GooCanvas.CanvasImage
+    GooCanvas.Group = GooCanvas.CanvasGroup
+    GooCanvas.Rect = GooCanvas.CanvasRect
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7a619bf..a91c814 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -8,7 +8,7 @@ libgimarshallingtests_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
 
 # This is a hack to make sure a shared library is built
 libgimarshallingtests.la: $(libgimarshallingtests_la_OBJECTS) $(libgimarshallingtests_la_DEPENDENCIES)
-	$(LINK) -rpath $(pkgpyexecdir) $(libgimarshallingtests_la_LDFLAGS) $(libgimarshallingtests_la_OBJECTS) $(libgimarhallingtests_la_LIBADD) $(LIBS)
+	$(AM_V_GEN) $(LINK) -rpath $(pkgpyexecdir) $(libgimarshallingtests_la_LDFLAGS) $(libgimarshallingtests_la_OBJECTS) $(libgimarhallingtests_la_LIBADD) $(LIBS)
 
 GIMarshallingTests-1.0.gir: libgimarshallingtests.la Makefile
 	$(AM_V_GEN) g-ir-scanner --include=Gio-2.0 \
@@ -30,7 +30,7 @@ libregress_la_CFLAGS = $(GIO_CFLAGS) $(CAIRO_CFLAGS)
 libregress_la_LDFLAGS = -module -avoid-version $(GIO_LIBS) $(CAIRO_LIBS)
 
 libregress.la: $(libregress_la_OBJECTS) $(libregress_la_DEPENDENCIES)
-	$(LINK) -rpath $(pkgpyexecdir) $(libregress_la_LDFLAGS) $(libregress_la_OBJECTS) $(libregress_la_LIBADD) $(LIBS)
+	$(AM_V_GEN) $(LINK) -rpath $(pkgpyexecdir) $(libregress_la_LDFLAGS) $(libregress_la_OBJECTS) $(libregress_la_LIBADD) $(LIBS)
 
 # g-i doesn't ship these as shared libraries anymore; we build them here
 Regress-1.0.gir: libregress.la Makefile
@@ -65,7 +65,7 @@ testhelper_la_SOURCES = \
 
 # This is a hack to make sure a shared library is built
 testhelper.la: $(testhelper_la_OBJECTS) $(testhelper_la_DEPENDENCIES)
-	$(LINK) -rpath $(pkgpyexecdir) $(testhelper_la_LDFLAGS) $(testhelper_la_OBJECTS) $(testhelper_la_LIBADD) $(LIBS)
+	$(AM_V_GEN) $(LINK) -rpath $(pkgpyexecdir) $(testhelper_la_LDFLAGS) $(testhelper_la_OBJECTS) $(testhelper_la_LIBADD) $(LIBS)
 
 
 .la.so:
@@ -86,7 +86,9 @@ EXTRA_DIST = \
 	org.gnome.test.gschema.xml \
 	test_glib.py \
 	test_gobject.py \
+	test_gtype.py \
 	test_interface.py \
+	test_iochannel.py \
 	test_mainloop.py \
 	test_option.py \
 	test_properties.py \
@@ -94,7 +96,6 @@ EXTRA_DIST = \
 	test_source.py \
 	test_subprocess.py \
 	test_thread.py \
-	test_uris.py \
 	test_everything.py \
 	test_gi.py \
 	test_gdbus.py \
@@ -105,7 +106,7 @@ EXTRA_DIST = \
 	test_overrides_gdk.py \
 	test_overrides_gtk.py \
 	test_atoms.py \
-	test_pygtkcompat.py \
+	compat_test_pygtk.py \
 	gi/__init__.py \
 	gi/overrides/__init__.py \
 	gi/overrides/Regress.py \
@@ -121,15 +122,21 @@ RUN_TESTS_ENV_VARS= \
 	GI_TYPELIB_PATH=$(builddir):$$GI_TYPELIB_PATH \
 	XDG_DATA_DIRS=$$XDG_DATA_DIRS:/usr/share \
 	MALLOC_PERTURB_=85 \
+	MALLOC_CHECK_=3 \
 	TESTS_BUILDDIR=$(builddir)
 
+# pygtkcompat tests need to be run in a separate process as they
+# clobber global name space
 check-local: $(LTLIBRARIES:.la=.so) $(test_typelibs) gschemas.compiled
 	@echo "  CHECK  Pyflakes"
 	@if type pyflakes >/dev/null 2>&1; then pyflakes $(top_srcdir); else echo "skipped, pyflakes not installed"; fi
-	@echo "  CHECK  PEP8"
-	@if type pep8 >/dev/null 2>&1; then pep8 --ignore=E501,E123,E124 --repeat --show-source $(top_srcdir); else echo "skipped, pep8 not installed"; fi
+	@if test -z "$$SKIP_PEP8"; then \
+		echo "  CHECK  PEP8"; \
+		if type pep8 >/dev/null 2>&1; then pep8 --ignore=E501,E123,E124 --repeat --show-source $(top_srcdir); else echo "skipped, pep8 not installed"; fi; \
+	fi
 	export `$(DBUS_LAUNCH)` && \
-	$(RUN_TESTS_ENV_VARS) $(EXEC_NAME) $(PYTHON) -Wd -Werror::PendingDeprecationWarning -Werror::DeprecationWarning $(srcdir)/runtests.py; rc=$$?; \
+	$(RUN_TESTS_ENV_VARS) $(EXEC_NAME) $(PYTHON) -Wd -Werror::PendingDeprecationWarning -Werror::DeprecationWarning -Werror::RuntimeWarning $(srcdir)/runtests.py; rc=$$?; \
+	[ "$$rc" -ne 0 ] || [ -n "$$TEST_NAMES" ] || { TEST_NAMES=compat_test_pygtk $(RUN_TESTS_ENV_VARS) $(EXEC_NAME) $(PYTHON) -Wd -Werror::PendingDeprecationWarning -Werror::DeprecationWarning -Werror::RuntimeWarning $(srcdir)/runtests.py; rc=$$?; }; \
 	kill $$DBUS_SESSION_BUS_PID; \
 	exit $$rc
 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 9993ec7..60fc5cc 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -59,8 +59,10 @@ subdir = tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \
-	$(top_srcdir)/m4/jhflags.m4 $(top_srcdir)/m4/python.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/jhflags.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -149,6 +151,9 @@ CAIRO_LIBS = @CAIRO_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -166,6 +171,7 @@ EXEEXT = @EXEEXT@
 FFI_CFLAGS = @FFI_CFLAGS@
 FFI_LIBS = @FFI_LIBS@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
 GI_CFLAGS = @GI_CFLAGS@
@@ -185,6 +191,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBFFI_PC = @LIBFFI_PC@
@@ -194,7 +201,6 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -326,7 +332,9 @@ EXTRA_DIST = \
 	org.gnome.test.gschema.xml \
 	test_glib.py \
 	test_gobject.py \
+	test_gtype.py \
 	test_interface.py \
+	test_iochannel.py \
 	test_mainloop.py \
 	test_option.py \
 	test_properties.py \
@@ -334,7 +342,6 @@ EXTRA_DIST = \
 	test_source.py \
 	test_subprocess.py \
 	test_thread.py \
-	test_uris.py \
 	test_everything.py \
 	test_gi.py \
 	test_gdbus.py \
@@ -345,7 +352,7 @@ EXTRA_DIST = \
 	test_overrides_gdk.py \
 	test_overrides_gtk.py \
 	test_atoms.py \
-	test_pygtkcompat.py \
+	compat_test_pygtk.py \
 	gi/__init__.py \
 	gi/overrides/__init__.py \
 	gi/overrides/Regress.py \
@@ -358,13 +365,14 @@ RUN_TESTS_ENV_VARS = \
 	GI_TYPELIB_PATH=$(builddir):$$GI_TYPELIB_PATH \
 	XDG_DATA_DIRS=$$XDG_DATA_DIRS:/usr/share \
 	MALLOC_PERTURB_=85 \
+	MALLOC_CHECK_=3 \
 	TESTS_BUILDDIR=$(builddir)
 
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .la .lo .o .obj .so
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -389,9 +397,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
@@ -696,7 +704,7 @@ uninstall-am:
 
 # This is a hack to make sure a shared library is built
 libgimarshallingtests.la: $(libgimarshallingtests_la_OBJECTS) $(libgimarshallingtests_la_DEPENDENCIES)
-	$(LINK) -rpath $(pkgpyexecdir) $(libgimarshallingtests_la_LDFLAGS) $(libgimarshallingtests_la_OBJECTS) $(libgimarhallingtests_la_LIBADD) $(LIBS)
+	$(AM_V_GEN) $(LINK) -rpath $(pkgpyexecdir) $(libgimarshallingtests_la_LDFLAGS) $(libgimarshallingtests_la_OBJECTS) $(libgimarhallingtests_la_LIBADD) $(LIBS)
 
 GIMarshallingTests-1.0.gir: libgimarshallingtests.la Makefile
 	$(AM_V_GEN) g-ir-scanner --include=Gio-2.0 \
@@ -710,7 +718,7 @@ GIMarshallingTests-1.0.typelib: GIMarshallingTests-1.0.gir Makefile
 	$(AM_V_GEN) g-ir-compiler $< -o $@
 
 @ENABLE_CAIRO_TRUE@libregress.la: $(libregress_la_OBJECTS) $(libregress_la_DEPENDENCIES)
-@ENABLE_CAIRO_TRUE@	$(LINK) -rpath $(pkgpyexecdir) $(libregress_la_LDFLAGS) $(libregress_la_OBJECTS) $(libregress_la_LIBADD) $(LIBS)
+@ENABLE_CAIRO_TRUE@	$(AM_V_GEN) $(LINK) -rpath $(pkgpyexecdir) $(libregress_la_LDFLAGS) $(libregress_la_OBJECTS) $(libregress_la_LIBADD) $(LIBS)
 
 # g-i doesn't ship these as shared libraries anymore; we build them here
 @ENABLE_CAIRO_TRUE@Regress-1.0.gir: libregress.la Makefile
@@ -729,7 +737,7 @@ gschemas.compiled: org.gnome.test.gschema.xml
 
 # This is a hack to make sure a shared library is built
 testhelper.la: $(testhelper_la_OBJECTS) $(testhelper_la_DEPENDENCIES)
-	$(LINK) -rpath $(pkgpyexecdir) $(testhelper_la_LDFLAGS) $(testhelper_la_OBJECTS) $(testhelper_la_LIBADD) $(LIBS)
+	$(AM_V_GEN) $(LINK) -rpath $(pkgpyexecdir) $(testhelper_la_LDFLAGS) $(testhelper_la_OBJECTS) $(testhelper_la_LIBADD) $(LIBS)
 
 .la.so:
 	test -L $@ || $(LN_S) .libs/$@ $@
@@ -739,13 +747,18 @@ all: $(LTLIBRARIES:.la=.so)
 clean-local:
 	rm -f $(LTLIBRARIES:.la=.so) file.txt~
 
+# pygtkcompat tests need to be run in a separate process as they
+# clobber global name space
 check-local: $(LTLIBRARIES:.la=.so) $(test_typelibs) gschemas.compiled
 	@echo "  CHECK  Pyflakes"
 	@if type pyflakes >/dev/null 2>&1; then pyflakes $(top_srcdir); else echo "skipped, pyflakes not installed"; fi
-	@echo "  CHECK  PEP8"
-	@if type pep8 >/dev/null 2>&1; then pep8 --ignore=E501,E123,E124 --repeat --show-source $(top_srcdir); else echo "skipped, pep8 not installed"; fi
+	@if test -z "$$SKIP_PEP8"; then \
+		echo "  CHECK  PEP8"; \
+		if type pep8 >/dev/null 2>&1; then pep8 --ignore=E501,E123,E124 --repeat --show-source $(top_srcdir); else echo "skipped, pep8 not installed"; fi; \
+	fi
 	export `$(DBUS_LAUNCH)` && \
-	$(RUN_TESTS_ENV_VARS) $(EXEC_NAME) $(PYTHON) -Wd -Werror::PendingDeprecationWarning -Werror::DeprecationWarning $(srcdir)/runtests.py; rc=$$?; \
+	$(RUN_TESTS_ENV_VARS) $(EXEC_NAME) $(PYTHON) -Wd -Werror::PendingDeprecationWarning -Werror::DeprecationWarning -Werror::RuntimeWarning $(srcdir)/runtests.py; rc=$$?; \
+	[ "$$rc" -ne 0 ] || [ -n "$$TEST_NAMES" ] || { TEST_NAMES=compat_test_pygtk $(RUN_TESTS_ENV_VARS) $(EXEC_NAME) $(PYTHON) -Wd -Werror::PendingDeprecationWarning -Werror::DeprecationWarning -Werror::RuntimeWarning $(srcdir)/runtests.py; rc=$$?; }; \
 	kill $$DBUS_SESSION_BUS_PID; \
 	exit $$rc
 
diff --git a/tests/test_pygtkcompat.py b/tests/compat_test_pygtk.py
index 5fabf2a..10be6a3 100644
--- a/tests/test_pygtkcompat.py
+++ b/tests/compat_test_pygtk.py
@@ -12,10 +12,10 @@ try:
     from gi.repository import Gtk
     (Atk, Gtk, Pango)  # pyflakes
 
-    import gi.pygtkcompat
+    import pygtkcompat
 
-    gi.pygtkcompat.enable()
-    gi.pygtkcompat.enable_gtk(version='3.0')
+    pygtkcompat.enable()
+    pygtkcompat.enable_gtk(version='3.0')
 
     import atk
     import pango
@@ -28,54 +28,54 @@ except ImportError:
 
 @unittest.skipUnless(Gtk, 'Gtk not available')
 class TestATKCompat(unittest.TestCase):
-    def testObject(self):
+    def test_object(self):
         self.assertTrue(hasattr(atk, 'Object'))
 
 
 @unittest.skipUnless(Gtk, 'Gtk not available')
 class TestPangoCompat(unittest.TestCase):
-    def testLayout(self):
+    def test_layout(self):
         self.assertTrue(hasattr(pango, 'Layout'))
 
 
 @unittest.skipUnless(Gtk, 'Gtk not available')
 class TestPangoCairoCompat(unittest.TestCase):
-    def testErrorUnderlinePath(self):
+    def test_error_underline_path(self):
         self.assertTrue(hasattr(pangocairo, 'error_underline_path'))
 
 
 @unittest.skipUnless(Gtk, 'Gtk not available')
 class TestGTKCompat(unittest.TestCase):
-    def testButtons(self):
+    def test_buttons(self):
         self.assertEqual(Gdk._2BUTTON_PRESS, 5)
         self.assertEqual(Gdk.BUTTON_PRESS, 4)
 
-    def testEnums(self):
+    def test_enums(self):
         self.assertEqual(gtk.WINDOW_TOPLEVEL, Gtk.WindowType.TOPLEVEL)
         self.assertEqual(gtk.PACK_START, Gtk.PackType.START)
 
-    def testFlags(self):
+    def test_flags(self):
         self.assertEqual(gtk.EXPAND, Gtk.AttachOptions.EXPAND)
         self.assertEqual(gtk.gdk.SHIFT_MASK, Gdk.ModifierType.SHIFT_MASK)
 
-    def testKeysyms(self):
+    def test_keysyms(self):
         import gtk.keysyms
         self.assertEqual(gtk.keysyms.Escape, Gdk.KEY_Escape)
         self.assertTrue(gtk.keysyms._0, Gdk.KEY_0)
 
-    def testStyle(self):
+    def test_style(self):
         widget = gtk.Button()
         self.assertTrue(isinstance(widget.style.base[gtk.STATE_NORMAL],
                                    gtk.gdk.Color))
 
-    def testAlignment(self):
+    def test_alignment(self):
         a = gtk.Alignment()
         self.assertEqual(a.props.xalign, 0.0)
         self.assertEqual(a.props.yalign, 0.0)
         self.assertEqual(a.props.xscale, 0.0)
         self.assertEqual(a.props.yscale, 0.0)
 
-    def testBox(self):
+    def test_box(self):
         box = gtk.Box()
         child = gtk.Button()
 
@@ -94,7 +94,7 @@ class TestGTKCompat(unittest.TestCase):
         self.assertEqual(padding, 0)
         self.assertEqual(pack_type, gtk.PACK_END)
 
-    def testComboBoxEntry(self):
+    def test_combobox_entry(self):
         liststore = gtk.ListStore(int, str)
         liststore.append((1, 'One'))
         liststore.append((2, 'Two'))
@@ -102,8 +102,10 @@ class TestGTKCompat(unittest.TestCase):
         # might cause a Pango warning, do not break on this
         old_mask = GLib.log_set_always_fatal(
             GLib.LogLevelFlags.LEVEL_CRITICAL | GLib.LogLevelFlags.LEVEL_ERROR)
-        combo = gtk.ComboBoxEntry(model=liststore)
-        GLib.log_set_always_fatal(old_mask)
+        try:
+            combo = gtk.ComboBoxEntry(model=liststore)
+        finally:
+            GLib.log_set_always_fatal(old_mask)
         combo.set_text_column(1)
         combo.set_active(0)
         self.assertEqual(combo.get_text_column(), 1)
@@ -120,18 +122,18 @@ class TestGTKCompat(unittest.TestCase):
         self.assertEqual(combo.get_text_column(), 1)
         self.assertEqual(combo.get_child().get_text(), 'One')
 
-    def testSizeRequest(self):
+    def test_size_request(self):
         box = gtk.Box()
         self.assertEqual(box.size_request(), [0, 0])
 
-    def testPixbuf(self):
+    def test_pixbuf(self):
         gtk.gdk.Pixbuf()
 
-    def testPixbufLoader(self):
+    def test_pixbuf_loader(self):
         loader = gtk.gdk.PixbufLoader('png')
         loader.close()
 
-    def testPixbufFormats(self):
+    def test_pixbuf_formats(self):
         formats = gtk.gdk.pixbuf_get_formats()
         self.assertEqual(type(formats[0]), dict)
         self.assertTrue('name' in formats[0])
@@ -139,7 +141,7 @@ class TestGTKCompat(unittest.TestCase):
         self.assertTrue('mime_types' in formats[0])
         self.assertEqual(type(formats[0]['extensions']), list)
 
-    def testGdkWindow(self):
+    def test_gdk_window(self):
         w = gtk.Window()
         w.realize()
         self.assertEqual(w.get_window().get_origin(), (0, 0))
diff --git a/tests/runtests.py b/tests/runtests.py
index c518fcc..9f3a7ec 100755
--- a/tests/runtests.py
+++ b/tests/runtests.py
@@ -34,6 +34,9 @@ if sys.version_info[:2] == (2, 6):
     unittest.TestCase.assertGreater = assertGreater
     unittest.TestCase.assertIsInstance = assertIsInstance
 
+if sys.version_info[:2] == (2, 7):
+    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
+
 if '--help' in sys.argv:
     print("Usage: ./runtests.py <testfiles>")
     sys.exit(0)
diff --git a/tests/test_atoms.py b/tests/test_atoms.py
index a59d15a..1561dbd 100644
--- a/tests/test_atoms.py
+++ b/tests/test_atoms.py
@@ -13,6 +13,18 @@ class TestGdkAtom(unittest.TestCase):
         atom = Gdk.Atom.intern('my_string', False)
         self.assertEqual(atom.name(), 'my_string')
 
+    def test_str(self):
+        atom = Gdk.Atom.intern('my_string', False)
+        self.assertEqual(str(atom), 'my_string')
+
+        self.assertEqual(str(Gdk.SELECTION_CLIPBOARD), 'CLIPBOARD')
+
+    def test_repr(self):
+        atom = Gdk.Atom.intern('my_string', False)
+        self.assertEqual(repr(atom), 'Gdk.Atom<my_string>')
+
+        self.assertEqual(repr(Gdk.SELECTION_CLIPBOARD), 'Gdk.Atom<CLIPBOARD>')
+
     def test_in_single(self):
         a_selection = Gdk.Atom.intern('test_clipboard', False)
         clipboard = Gtk.Clipboard.get(a_selection)
@@ -36,6 +48,25 @@ class TestGdkAtom(unittest.TestCase):
         self.assertTrue(Gtk.targets_include_image([a_jpeg], False))
         self.assertTrue(Gtk.targets_include_image([a_jpeg, a_plain], False))
 
+    def test_out_array(self):
+        a_selection = Gdk.Atom.intern('my_clipboard', False)
+        clipboard = Gtk.Clipboard.get(a_selection)
+
+        # empty
+        (res, targets) = clipboard.wait_for_targets()
+        self.assertEqual(res, False)
+        self.assertEqual(targets, [])
+
+        # text
+        clipboard.set_text('hello', 5)
+        (res, targets) = clipboard.wait_for_targets()
+        self.assertEqual(res, True)
+        self.assertNotEqual(targets, [])
+        self.assertEqual(type(targets[0]), Gdk.Atom)
+        names = [t.name() for t in targets]
+        self.assertFalse(None in names, names)
+        self.assertTrue('TEXT' in names, names)
+
     def test_out_glist(self):
         display = Gdk.Display.get_default()
         dm = display.get_device_manager()
diff --git a/tests/test_everything.py b/tests/test_everything.py
index 4c4535f..f1f14b7 100644
--- a/tests/test_everything.py
+++ b/tests/test_everything.py
@@ -4,14 +4,10 @@
 
 import unittest
 import traceback
+import ctypes
 import warnings
-import gc
-gc
-
 import sys
-from sys import getrefcount
 
-import copy
 try:
     import cairo
     has_cairo = True
@@ -37,6 +33,17 @@ else:
     UNICHAR = "♥"
 
 
+class RawGList(ctypes.Structure):
+    _fields_ = [('data', ctypes.c_void_p),
+                ('next', ctypes.c_void_p),
+                ('prev', ctypes.c_void_p)]
+
+    @classmethod
+    def from_wrapped(cls, obj):
+        offset = sys.getsizeof(object())  # size of PyObject_HEAD
+        return ctypes.POINTER(cls).from_address(id(obj) + offset)
+
+
 @unittest.skipUnless(has_cairo, 'built without cairo support')
 class TestEverything(unittest.TestCase):
 
@@ -73,6 +80,123 @@ class TestEverything(unittest.TestCase):
         self.assertEqual(surface.get_width(), 10)
         self.assertEqual(surface.get_height(), 10)
 
+    def test_bool(self):
+        self.assertEqual(Everything.test_boolean(False), False)
+        self.assertEqual(Everything.test_boolean(True), True)
+        self.assertEqual(Everything.test_boolean('hello'), True)
+        self.assertEqual(Everything.test_boolean(''), False)
+
+        self.assertEqual(Everything.test_boolean_true(True), True)
+        self.assertEqual(Everything.test_boolean_false(False), False)
+
+    def test_int8(self):
+        self.assertEqual(Everything.test_int8(GObject.G_MAXINT8),
+                         GObject.G_MAXINT8)
+        self.assertEqual(Everything.test_int8(GObject.G_MININT8),
+                         GObject.G_MININT8)
+        self.assertRaises(ValueError, Everything.test_int8, GObject.G_MAXINT8 + 1)
+
+        self.assertEqual(Everything.test_uint8(GObject.G_MAXUINT8),
+                         GObject.G_MAXUINT8)
+        self.assertEqual(Everything.test_uint8(0), 0)
+        self.assertRaises(ValueError, Everything.test_uint8, -1)
+        self.assertRaises(ValueError, Everything.test_uint8, GObject.G_MAXUINT8 + 1)
+
+    def test_int16(self):
+        self.assertEqual(Everything.test_int16(GObject.G_MAXINT16),
+                         GObject.G_MAXINT16)
+        self.assertEqual(Everything.test_int16(GObject.G_MININT16),
+                         GObject.G_MININT16)
+        self.assertRaises(ValueError, Everything.test_int16, GObject.G_MAXINT16 + 1)
+
+        self.assertEqual(Everything.test_uint16(GObject.G_MAXUINT16),
+                         GObject.G_MAXUINT16)
+        self.assertEqual(Everything.test_uint16(0), 0)
+        self.assertRaises(ValueError, Everything.test_uint16, -1)
+        self.assertRaises(ValueError, Everything.test_uint16, GObject.G_MAXUINT16 + 1)
+
+    def test_int32(self):
+        self.assertEqual(Everything.test_int32(GObject.G_MAXINT32),
+                         GObject.G_MAXINT32)
+        self.assertEqual(Everything.test_int32(GObject.G_MININT32),
+                         GObject.G_MININT32)
+        self.assertRaises(ValueError, Everything.test_int32, GObject.G_MAXINT32 + 1)
+
+        self.assertEqual(Everything.test_uint32(GObject.G_MAXUINT32),
+                         GObject.G_MAXUINT32)
+        self.assertEqual(Everything.test_uint32(0), 0)
+        self.assertRaises(ValueError, Everything.test_uint32, -1)
+        self.assertRaises(ValueError, Everything.test_uint32, GObject.G_MAXUINT32 + 1)
+
+    def test_int64(self):
+        self.assertEqual(Everything.test_int64(GObject.G_MAXINT64),
+                         GObject.G_MAXINT64)
+        self.assertEqual(Everything.test_int64(GObject.G_MININT64),
+                         GObject.G_MININT64)
+        self.assertRaises(ValueError, Everything.test_int64, GObject.G_MAXINT64 + 1)
+
+        self.assertEqual(Everything.test_uint64(GObject.G_MAXUINT64),
+                         GObject.G_MAXUINT64)
+        self.assertEqual(Everything.test_uint64(0), 0)
+        self.assertRaises(ValueError, Everything.test_uint64, -1)
+        self.assertRaises(ValueError, Everything.test_uint64, GObject.G_MAXUINT64 + 1)
+
+    def test_int(self):
+        self.assertEqual(Everything.test_int(GObject.G_MAXINT),
+                         GObject.G_MAXINT)
+        self.assertEqual(Everything.test_int(GObject.G_MININT),
+                         GObject.G_MININT)
+        self.assertRaises(ValueError, Everything.test_int, GObject.G_MAXINT + 1)
+
+        self.assertEqual(Everything.test_uint(GObject.G_MAXUINT),
+                         GObject.G_MAXUINT)
+        self.assertEqual(Everything.test_uint(0), 0)
+        self.assertRaises(ValueError, Everything.test_uint, -1)
+        self.assertRaises(ValueError, Everything.test_uint, GObject.G_MAXUINT + 1)
+
+    def test_short(self):
+        self.assertEqual(Everything.test_short(GObject.G_MAXSHORT),
+                         GObject.G_MAXSHORT)
+        self.assertEqual(Everything.test_short(GObject.G_MINSHORT),
+                         GObject.G_MINSHORT)
+        self.assertRaises(ValueError, Everything.test_short, GObject.G_MAXSHORT + 1)
+
+        self.assertEqual(Everything.test_ushort(GObject.G_MAXUSHORT),
+                         GObject.G_MAXUSHORT)
+        self.assertEqual(Everything.test_ushort(0), 0)
+        self.assertRaises(ValueError, Everything.test_ushort, -1)
+        self.assertRaises(ValueError, Everything.test_ushort, GObject.G_MAXUSHORT + 1)
+
+    def test_long(self):
+        self.assertEqual(Everything.test_long(GObject.G_MAXLONG),
+                         GObject.G_MAXLONG)
+        self.assertEqual(Everything.test_long(GObject.G_MINLONG),
+                         GObject.G_MINLONG)
+        self.assertRaises(ValueError, Everything.test_long, GObject.G_MAXLONG + 1)
+
+        self.assertEqual(Everything.test_ulong(GObject.G_MAXULONG),
+                         GObject.G_MAXULONG)
+        self.assertEqual(Everything.test_ulong(0), 0)
+        self.assertRaises(ValueError, Everything.test_ulong, -1)
+        self.assertRaises(ValueError, Everything.test_ulong, GObject.G_MAXULONG + 1)
+
+    def test_size(self):
+        self.assertEqual(Everything.test_ssize(GObject.G_MAXSSIZE),
+                         GObject.G_MAXSSIZE)
+        self.assertEqual(Everything.test_ssize(GObject.G_MINSSIZE),
+                         GObject.G_MINSSIZE)
+        self.assertRaises(ValueError, Everything.test_ssize, GObject.G_MAXSSIZE + 1)
+
+        self.assertEqual(Everything.test_size(GObject.G_MAXSIZE),
+                         GObject.G_MAXSIZE)
+        self.assertEqual(Everything.test_size(0), 0)
+        self.assertRaises(ValueError, Everything.test_size, -1)
+        self.assertRaises(ValueError, Everything.test_size, GObject.G_MAXSIZE + 1)
+
+    def test_timet(self):
+        self.assertEqual(Everything.test_timet(42), 42)
+        self.assertRaises(ValueError, Everything.test_timet, GObject.G_MAXUINT64 + 1)
+
     def test_unichar(self):
         self.assertEqual("c", Everything.test_unichar("c"))
 
@@ -82,6 +206,96 @@ class TestEverything(unittest.TestCase):
         self.assertRaises(TypeError, Everything.test_unichar, "")
         self.assertRaises(TypeError, Everything.test_unichar, "morethanonechar")
 
+    def test_float(self):
+        self.assertEqual(Everything.test_float(GObject.G_MAXFLOAT),
+                         GObject.G_MAXFLOAT)
+        self.assertEqual(Everything.test_float(GObject.G_MINFLOAT),
+                         GObject.G_MINFLOAT)
+        self.assertRaises(ValueError, Everything.test_float, GObject.G_MAXFLOAT * 2)
+
+    def test_double(self):
+        self.assertEqual(Everything.test_double(GObject.G_MAXDOUBLE),
+                         GObject.G_MAXDOUBLE)
+        self.assertEqual(Everything.test_double(GObject.G_MINDOUBLE),
+                         GObject.G_MINDOUBLE)
+        self.assertRaises(ValueError, Everything.test_double, GObject.G_MAXDOUBLE * 2)
+
+        (two, three) = Everything.test_multi_double_args(2.5)
+        self.assertAlmostEqual(two, 5.0)
+        self.assertAlmostEqual(three, 7.5)
+
+    def test_value(self):
+        self.assertEqual(Everything.test_int_value_arg(GObject.G_MAXINT), GObject.G_MAXINT)
+        self.assertEqual(Everything.test_value_return(GObject.G_MAXINT), GObject.G_MAXINT)
+
+    def test_variant(self):
+        v = Everything.test_gvariant_i()
+        self.assertEqual(v.get_type_string(), 'i')
+        self.assertEqual(v.get_int32(), 1)
+
+        v = Everything.test_gvariant_s()
+        self.assertEqual(v.get_type_string(), 's')
+        self.assertEqual(v.get_string(), 'one')
+
+        v = Everything.test_gvariant_v()
+        self.assertEqual(v.get_type_string(), 'v')
+        vi = v.get_variant()
+        self.assertEqual(vi.get_type_string(), 's')
+        self.assertEqual(vi.get_string(), 'contents')
+
+        v = Everything.test_gvariant_as()
+        self.assertEqual(v.get_type_string(), 'as')
+        self.assertEqual(v.get_strv(), ['one', 'two', 'three'])
+
+        v = Everything.test_gvariant_asv()
+        self.assertEqual(v.get_type_string(), 'a{sv}')
+        self.assertEqual(v.lookup_value('nosuchkey', None), None)
+        name = v.lookup_value('name', None)
+        self.assertEqual(name.get_string(), 'foo')
+        timeout = v.lookup_value('timeout', None)
+        self.assertEqual(timeout.get_int32(), 10)
+
+    def test_string(self):
+        const_str = b'const \xe2\x99\xa5 utf8'
+        if sys.version_info >= (3, 0):
+            const_str = const_str.decode('UTF-8')
+        noconst_str = 'non' + const_str
+
+        self.assertEqual(Everything.test_utf8_const_return(), const_str)
+        self.assertEqual(Everything.test_utf8_nonconst_return(), noconst_str)
+        self.assertEqual(Everything.test_utf8_out(), noconst_str)
+
+        Everything.test_utf8_const_in(const_str)
+        self.assertEqual(Everything.test_utf8_inout(const_str), noconst_str)
+
+        self.assertEqual(Everything.test_filename_return(), ['åäö', '/etc/fstab'])
+
+        # returns g_utf8_strlen() in out argument
+        self.assertEqual(Everything.test_int_out_utf8(''), 0)
+        self.assertEqual(Everything.test_int_out_utf8('hello world'), 11)
+        self.assertEqual(Everything.test_int_out_utf8('åäö'), 3)
+
+        self.assertEqual(Everything.test_utf8_out_out(), ('first', 'second'))
+        self.assertEqual(Everything.test_utf8_out_nonconst_return(), ('first', 'second'))
+
+    def test_enum(self):
+        self.assertEqual(Everything.test_enum_param(Everything.TestEnum.VALUE1), 'value1')
+        self.assertEqual(Everything.test_enum_param(Everything.TestEnum.VALUE3), 'value3')
+        self.assertRaises(TypeError, Everything.test_enum_param, 'hello')
+
+    # FIXME: ValueError: invalid enum value: 2147483648
+    @unittest.expectedFailure
+    def test_enum_unsigned(self):
+        self.assertEqual(Everything.test_unsigned_enum_param(Everything.TestEnumUnsigned.VALUE1), 'value1')
+        self.assertEqual(Everything.test_unsigned_enum_param(Everything.TestEnumUnsigned.VALUE3), 'value3')
+        self.assertRaises(TypeError, Everything.test_unsigned_enum_param, 'hello')
+
+    def test_flags(self):
+        result = Everything.global_get_flags_out()
+        # assert that it's not an int
+        self.assertEqual(type(result), Everything.TestFlags)
+        self.assertEqual(result, Everything.TestFlags.FLAG1 | Everything.TestFlags.FLAG3)
+
     def test_floating(self):
         e = Everything.TestFloating()
         self.assertEqual(e.__grefcount__, 1)
@@ -121,6 +335,9 @@ class TestEverything(unittest.TestCase):
         self.assertEqual(struct_b.nested_a.some_double, struct_b_clone.nested_a.some_double)
         self.assertEqual(struct_b.nested_a.some_enum, struct_b_clone.nested_a.some_enum)
 
+        struct_a = Everything.test_struct_a_parse('ignored')
+        self.assertEqual(struct_a.some_int, 23)
+
     def test_wrong_type_of_arguments(self):
         try:
             Everything.test_int8()
@@ -173,6 +390,34 @@ class TestEverything(unittest.TestCase):
         # test that there are no duplicates returned
         self.assertEqual(len(attr_list), len(set(attr_list)))
 
+    def test_array(self):
+        self.assertEqual(Everything.test_array_int_in([]), 0)
+        self.assertEqual(Everything.test_array_int_in([1, 5, -2]), 4)
+        self.assertEqual(Everything.test_array_int_out(), [0, 1, 2, 3, 4])
+        self.assertEqual(Everything.test_array_int_full_out(), [0, 1, 2, 3, 4])
+        self.assertEqual(Everything.test_array_int_none_out(), [1, 2, 3, 4, 5])
+        self.assertEqual(Everything.test_array_int_inout([1, 5, 42, -8]), [6, 43, -7])
+
+        if sys.version_info >= (3, 0):
+            self.assertEqual(Everything.test_array_gint8_in(b'\x01\x03\x05'), 9)
+        self.assertEqual(Everything.test_array_gint8_in([1, 3, 5, -50]), -41)
+        self.assertEqual(Everything.test_array_gint16_in([256, 257, -1000, 10000]), 9513)
+        self.assertEqual(Everything.test_array_gint32_in([30000, 1, -2]), 29999)
+        self.assertEqual(Everything.test_array_gint64_in([2 ** 33, 2 ** 34]), 2 ** 33 + 2 ** 34)
+
+        self.assertEqual(Everything.test_array_gtype_in(
+            [GObject.TYPE_STRING, GObject.TYPE_UINT64, GObject.TYPE_VARIANT]),
+            '[gchararray,guint64,GVariant,]')
+
+    def test_array_fixed_size(self):
+        # fixed length of 5
+        self.assertEqual(Everything.test_array_fixed_size_int_in([1, 2, -10, 5, 3]), 1)
+        self.assertRaises(ValueError, Everything.test_array_fixed_size_int_in, [1, 2, 3, 4])
+        self.assertRaises(ValueError, Everything.test_array_fixed_size_int_in, [1, 2, 3, 4, 5, 6])
+
+        self.assertEqual(Everything.test_array_fixed_size_int_out(), [0, 1, 2, 3, 4])
+        self.assertEqual(Everything.test_array_fixed_size_int_return(), [0, 1, 2, 3, 4])
+
     def test_ptrarray(self):
         # transfer container
         result = Everything.test_garray_container_return()
@@ -184,7 +429,43 @@ class TestEverything(unittest.TestCase):
         self.assertEqual(result, ['regress'])
         result = None
 
+    def test_strv(self):
+        self.assertEqual(Everything.test_strv_out(), ['thanks', 'for', 'all', 'the', 'fish'])
+        self.assertEqual(Everything.test_strv_out_c(), ['thanks', 'for', 'all', 'the', 'fish'])
+        self.assertEqual(Everything.test_strv_out_container(), ['1', '2', '3'])
+        self.assertEqual(Everything.test_strv_outarg(), ['1', '2', '3'])
+
+        self.assertEqual(Everything.test_strv_in_gvalue(), ['one', 'two', 'three'])
+
+        Everything.test_strv_in(['1', '2', '3'])
+
+    def test_glist(self):
+        self.assertEqual(Everything.test_glist_nothing_return(), ['1', '2', '3'])
+        self.assertEqual(Everything.test_glist_nothing_return2(), ['1', '2', '3'])
+        self.assertEqual(Everything.test_glist_container_return(), ['1', '2', '3'])
+        self.assertEqual(Everything.test_glist_everything_return(), ['1', '2', '3'])
+
+        Everything.test_glist_nothing_in(['1', '2', '3'])
+        Everything.test_glist_nothing_in2(['1', '2', '3'])
+
+    def test_gslist(self):
+        self.assertEqual(Everything.test_gslist_nothing_return(), ['1', '2', '3'])
+        self.assertEqual(Everything.test_gslist_nothing_return2(), ['1', '2', '3'])
+        self.assertEqual(Everything.test_gslist_container_return(), ['1', '2', '3'])
+        self.assertEqual(Everything.test_gslist_everything_return(), ['1', '2', '3'])
+
+        Everything.test_gslist_nothing_in(['1', '2', '3'])
+        Everything.test_gslist_nothing_in2(['1', '2', '3'])
+
     def test_hash_return(self):
+        expected = {'foo': 'bar', 'baz': 'bat', 'qux': 'quux'}
+
+        self.assertEqual(Everything.test_ghash_null_return(), None)
+        self.assertEqual(Everything.test_ghash_nothing_return(), expected)
+        self.assertEqual(Everything.test_ghash_nothing_return(), expected)
+        self.assertEqual(Everything.test_ghash_container_return(), expected)
+        self.assertEqual(Everything.test_ghash_everything_return(), expected)
+
         result = Everything.test_ghash_gvalue_return()
         self.assertEqual(result['integer'], 12)
         self.assertEqual(result['boolean'], True)
@@ -194,6 +475,11 @@ class TestEverything(unittest.TestCase):
         self.assertEqual(result['enum'], Everything.TestEnum.VALUE2)
         result = None
 
+    # FIXME: CRITICAL **: Unsupported type ghash
+    def disabled_test_hash_return_nested(self):
+        self.assertEqual(Everything.test_ghash_nested_everything_return(), {})
+        self.assertEqual(Everything.test_ghash_nested_everything_return2(), {})
+
     def test_hash_in(self):
         # specifying a simple string array for "strings" does not work due to
         # https://bugzilla.gnome.org/show_bug.cgi?id=666636
@@ -201,6 +487,11 @@ class TestEverything(unittest.TestCase):
         class GStrv(list):
             __gtype__ = GObject.TYPE_STRV
 
+        expected = {'foo': 'bar', 'baz': 'bat', 'qux': 'quux'}
+
+        Everything.test_ghash_nothing_in(expected)
+        Everything.test_ghash_nothing_in2(expected)
+
         data = {'integer': 12,
                 'boolean': True,
                 'string': 'some text',
@@ -212,24 +503,24 @@ class TestEverything(unittest.TestCase):
         data = None
 
     def test_struct_gpointer(self):
-        l1 = GLib.List()
-        self.assertEqual(l1.data, None)
-        init_refcount = getrefcount(l1)
+        glist = GLib.List()
+        raw = RawGList.from_wrapped(glist)
+
+        self.assertEqual(glist.data, None)
+        self.assertEqual(raw.contents.data, None)
 
-        l1.data = 'foo'
-        self.assertEqual(l1.data, 'foo')
+        glist.data = 123
+        self.assertEqual(glist.data, 123)
+        self.assertEqual(raw.contents.data, 123)
 
-        l2 = l1
-        self.assertEqual(l1.data, l2.data)
-        self.assertEqual(getrefcount(l1), init_refcount + 1)
+        glist.data = None
+        self.assertEqual(glist.data, None)
+        self.assertEqual(raw.contents.data, None)
 
-        l3 = copy.copy(l1)
-        l3.data = 'bar'
-        self.assertEqual(l1.data, 'foo')
-        self.assertEqual(l2.data, 'foo')
-        self.assertEqual(l3.data, 'bar')
-        self.assertEqual(getrefcount(l1), init_refcount + 1)
-        self.assertEqual(getrefcount(l3), init_refcount)
+        # Setting to anything other than an int should raise
+        self.assertRaises(TypeError, setattr, glist.data, 'nan')
+        self.assertRaises(TypeError, setattr, glist.data, object())
+        self.assertRaises(TypeError, setattr, glist.data, 123.321)
 
     def test_struct_opaque(self):
         # we should get a sensible error message
@@ -375,13 +666,37 @@ class TestCallbacks(unittest.TestCase):
 
         def callback():
             TestCallbacks.called += 1
-            return 0
+            return TestCallbacks.called
 
         refcount = sys.getrefcount(callback)
-        Everything.test_multi_callback(callback)
+        result = Everything.test_multi_callback(callback)
+        # first callback should give 1, second 2, and the function sums them up
+        self.assertEqual(result, 3)
         self.assertEqual(TestCallbacks.called, 2)
         self.assertEqual(sys.getrefcount(callback), refcount)
 
+    # FIXME: TypeError: callback() takes 2 positional arguments but 4 were given
+    # does not remove the array length arguments
+    @unittest.expectedFailure
+    def test_callback_scope_call_array(self):
+        # This tests a callback that gets called multiple times from a
+        # single scope call in python with array arguments
+        TestCallbacks.callargs = []
+
+        # works with:
+        #def callback(one, one_length, two, two_length):
+        def callback(one, two):
+            TestCallbacks.callargs.append((one, two))
+            return len(TestCallbacks.callargs)
+
+        refcount = sys.getrefcount(callback)
+        result = Everything.test_array_callback(callback)
+        # first callback should give 1, second 2, and the function sums them up
+        self.assertEqual(result, 3)
+        self.assertEqual(TestCallbacks.callargs,
+                         [([-1, 0, 1, 2], ['one', 'two', 'three'])] * 2)
+        self.assertEqual(sys.getrefcount(callback), refcount)
+
     def test_callback_userdata(self):
         TestCallbacks.called = 0
 
@@ -556,6 +871,16 @@ class TestCallbacks(unittest.TestCase):
 
 @unittest.skipUnless(has_cairo, 'built without cairo support')
 class TestClosures(unittest.TestCase):
+    def test_no_arg(self):
+        def callback():
+            self.called = True
+            return 42
+
+        self.called = False
+        result = Everything.test_closure(callback)
+        self.assertTrue(self.called)
+        self.assertEqual(result, 42)
+
     def test_int_arg(self):
         def callback(num):
             self.called = True
@@ -589,6 +914,22 @@ class TestClosures(unittest.TestCase):
         self.assertRaises(TypeError, Everything.test_closure_variant, callback, 'foo')
         self.assertFalse(self.called)
 
+    def test_variant_wrong_return_type(self):
+        def callback(variant):
+            return 'no_variant'
+
+        # reset last error
+        sys.last_type = None
+
+        # this does not directly raise an exception (see
+        # https://bugzilla.gnome.org/show_bug.cgi?id=616279)
+        result = Everything.test_closure_variant(callback, GLib.Variant('i', 42))
+        # ... but the result shouldn't be a string
+        self.assertEqual(result, None)
+        # and the error should be shown
+        self.assertEqual(sys.last_type, TypeError)
+        self.assertTrue('return value' in str(sys.last_value), sys.last_value)
+
 
 @unittest.skipUnless(has_cairo, 'built without cairo support')
 class TestProperties(unittest.TestCase):
@@ -647,7 +988,27 @@ class TestProperties(unittest.TestCase):
         self.assertTrue(isinstance(object_.props.boxed, Everything.TestBoxed))
         self.assertEqual(object_.props.boxed.some_int8, 42)
 
+    def test_boxed_alternative_constructor(self):
+        boxed = Everything.TestBoxed.new_alternative_constructor1(5)
+        self.assertEqual(boxed.some_int8, 5)
+
+        boxed = Everything.TestBoxed.new_alternative_constructor2(5, 3)
+        self.assertEqual(boxed.some_int8, 8)
+
+        boxed = Everything.TestBoxed.new_alternative_constructor3("-3")
+        self.assertEqual(boxed.some_int8, -3)
+
     def test_boxed_equality(self):
+        boxed42 = Everything.TestBoxed.new_alternative_constructor1(42)
+        boxed5 = Everything.TestBoxed.new_alternative_constructor1(5)
+        boxed42_2 = Everything.TestBoxed.new_alternative_constructor2(41, 1)
+
+        self.assertFalse(boxed42.equals(boxed5))
+        self.assertTrue(boxed42.equals(boxed42_2))
+        self.assertTrue(boxed42_2.equals(boxed42))
+        self.assertTrue(boxed42.equals(boxed42))
+
+    def test_boxed_c_equality(self):
         boxed = Everything.TestBoxedC()
         # TestBoxedC uses refcounting, so we know that
         # the pointer is the same when copied
diff --git a/tests/test_gi.py b/tests/test_gi.py
index 51cb6f9..4837204 100644
--- a/tests/test_gi.py
+++ b/tests/test_gi.py
@@ -11,6 +11,7 @@ import os
 import locale
 import subprocess
 import gc
+import weakref
 from io import StringIO, BytesIO
 
 import gi
@@ -18,7 +19,7 @@ from gi.repository import GObject, GLib, Gio
 
 from gi.repository import GIMarshallingTests
 
-from compathelper import _bytes
+from compathelper import _bytes, _unicode
 
 if sys.version_info < (3, 0):
     CONSTANT_UTF8 = "const \xe2\x99\xa5 utf8"
@@ -64,6 +65,15 @@ class TestConstant(unittest.TestCase):
     def test_constant_number(self):
         self.assertEqual(CONSTANT_NUMBER, GIMarshallingTests.CONSTANT_NUMBER)
 
+    def test_min_max_int(self):
+        self.assertEqual(GLib.MAXINT32, 2 ** 31 - 1)
+        self.assertEqual(GLib.MININT32, -2 ** 31)
+        self.assertEqual(GLib.MAXUINT32, 2 ** 32 - 1)
+
+        self.assertEqual(GLib.MAXINT64, 2 ** 63 - 1)
+        self.assertEqual(GLib.MININT64, -2 ** 63)
+        self.assertEqual(GLib.MAXUINT64, 2 ** 64 - 1)
+
 
 class TestBoolean(unittest.TestCase):
 
@@ -325,8 +335,8 @@ class TestUInt64(unittest.TestCase):
 
 class TestShort(unittest.TestCase):
 
-    MAX = GObject.constants.G_MAXSHORT
-    MIN = GObject.constants.G_MINSHORT
+    MAX = GObject.G_MAXSHORT
+    MIN = GObject.G_MINSHORT
 
     def test_short_return(self):
         self.assertEqual(self.MAX, GIMarshallingTests.short_return_max())
@@ -358,7 +368,7 @@ class TestShort(unittest.TestCase):
 
 class TestUShort(unittest.TestCase):
 
-    MAX = GObject.constants.G_MAXUSHORT
+    MAX = GObject.G_MAXUSHORT
 
     def test_ushort_return(self):
         self.assertEqual(self.MAX, GIMarshallingTests.ushort_return())
@@ -384,8 +394,8 @@ class TestUShort(unittest.TestCase):
 
 class TestInt(unittest.TestCase):
 
-    MAX = GObject.constants.G_MAXINT
-    MIN = GObject.constants.G_MININT
+    MAX = GObject.G_MAXINT
+    MIN = GObject.G_MININT
 
     def test_int_return(self):
         self.assertEqual(self.MAX, GIMarshallingTests.int_return_max())
@@ -418,7 +428,7 @@ class TestInt(unittest.TestCase):
 
 class TestUInt(unittest.TestCase):
 
-    MAX = GObject.constants.G_MAXUINT
+    MAX = GObject.G_MAXUINT
 
     def test_uint_return(self):
         self.assertEqual(self.MAX, GIMarshallingTests.uint_return())
@@ -444,8 +454,8 @@ class TestUInt(unittest.TestCase):
 
 class TestLong(unittest.TestCase):
 
-    MAX = GObject.constants.G_MAXLONG
-    MIN = GObject.constants.G_MINLONG
+    MAX = GObject.G_MAXLONG
+    MIN = GObject.G_MINLONG
 
     def test_long_return(self):
         self.assertEqual(self.MAX, GIMarshallingTests.long_return_max())
@@ -477,7 +487,7 @@ class TestLong(unittest.TestCase):
 
 class TestULong(unittest.TestCase):
 
-    MAX = GObject.constants.G_MAXULONG
+    MAX = GObject.G_MAXULONG
 
     def test_ulong_return(self):
         self.assertEqual(self.MAX, GIMarshallingTests.ulong_return())
@@ -503,8 +513,8 @@ class TestULong(unittest.TestCase):
 
 class TestSSize(unittest.TestCase):
 
-    MAX = GObject.constants.G_MAXLONG
-    MIN = GObject.constants.G_MINLONG
+    MAX = GObject.G_MAXLONG
+    MIN = GObject.G_MINLONG
 
     def test_ssize_return(self):
         self.assertEqual(self.MAX, GIMarshallingTests.ssize_return_max())
@@ -536,7 +546,7 @@ class TestSSize(unittest.TestCase):
 
 class TestSize(unittest.TestCase):
 
-    MAX = GObject.constants.G_MAXULONG
+    MAX = GObject.G_MAXULONG
 
     def test_size_return(self):
         self.assertEqual(self.MAX, GIMarshallingTests.size_return())
@@ -560,10 +570,26 @@ class TestSize(unittest.TestCase):
         self.assertEqual(0, GIMarshallingTests.size_inout(Number(self.MAX)))
 
 
+class TestTimet(unittest.TestCase):
+
+    def test_time_t_return(self):
+        self.assertEqual(1234567890, GIMarshallingTests.time_t_return())
+
+    def test_time_t_in(self):
+        GIMarshallingTests.time_t_in(1234567890)
+        self.assertRaises(TypeError, GIMarshallingTests.time_t_in, "hello")
+
+    def test_time_t_out(self):
+        self.assertEqual(1234567890, GIMarshallingTests.time_t_out())
+
+    def test_time_t_inout(self):
+        self.assertEqual(0, GIMarshallingTests.time_t_inout(1234567890))
+
+
 class TestFloat(unittest.TestCase):
 
-    MAX = GObject.constants.G_MAXFLOAT
-    MIN = GObject.constants.G_MINFLOAT
+    MAX = GObject.G_MAXFLOAT
+    MIN = GObject.G_MINFLOAT
 
     def test_float_return(self):
         self.assertAlmostEqual(self.MAX, GIMarshallingTests.float_return())
@@ -582,8 +608,8 @@ class TestFloat(unittest.TestCase):
 
 class TestDouble(unittest.TestCase):
 
-    MAX = GObject.constants.G_MAXDOUBLE
-    MIN = GObject.constants.G_MINDOUBLE
+    MAX = GObject.G_MAXDOUBLE
+    MIN = GObject.G_MINDOUBLE
 
     def test_double_return(self):
         self.assertAlmostEqual(self.MAX, GIMarshallingTests.double_return())
@@ -662,6 +688,36 @@ class TestUtf8(unittest.TestCase):
         self.assertEqual("", GIMarshallingTests.utf8_full_inout(CONSTANT_UTF8))
 
 
+class TestFilename(unittest.TestCase):
+    def setUp(self):
+        self.workdir = tempfile.mkdtemp()
+
+    def tearDown(self):
+        shutil.rmtree(self.workdir)
+
+    def test_filename_in(self):
+        fname = os.path.join(self.workdir, _unicode('testäø.txt'))
+        self.assertRaises(GLib.GError, GLib.file_get_contents, fname)
+
+        with open(fname.encode('UTF-8'), 'wb') as f:
+            f.write(b'hello world!\n\x01\x02')
+
+        (result, contents) = GLib.file_get_contents(fname)
+        self.assertEqual(result, True)
+        self.assertEqual(contents, b'hello world!\n\x01\x02')
+
+    def test_filename_out(self):
+        self.assertRaises(GLib.GError, GLib.Dir.make_tmp, 'test')
+
+        dirname = GLib.Dir.make_tmp('testäø.XXXXXX')
+        self.assertTrue('/testäø.' in dirname, dirname)
+        self.assertTrue(os.path.isdir(dirname))
+        os.rmdir(dirname)
+
+    def test_filename_type_error(self):
+        self.assertRaises(TypeError, GLib.file_get_contents, 23)
+
+
 class TestArray(unittest.TestCase):
 
     def test_array_fixed_int_return(self):
@@ -690,8 +746,16 @@ class TestArray(unittest.TestCase):
     def test_array_return(self):
         self.assertEqual([-1, 0, 1, 2], GIMarshallingTests.array_return())
 
+    def test_array_return_etc(self):
+        self.assertEqual(([5, 0, 1, 9], 14), GIMarshallingTests.array_return_etc(5, 9))
+
     def test_array_in(self):
         GIMarshallingTests.array_in(Sequence([-1, 0, 1, 2]))
+        GIMarshallingTests.array_in_guint64_len(Sequence([-1, 0, 1, 2]))
+        GIMarshallingTests.array_in_guint8_len(Sequence([-1, 0, 1, 2]))
+
+    def test_array_in_len_before(self):
+        GIMarshallingTests.array_in_len_before(Sequence([-1, 0, 1, 2]))
 
     def test_array_in_len_zero_terminated(self):
         GIMarshallingTests.array_in_len_zero_terminated(Sequence([-1, 0, 1, 2]))
@@ -700,12 +764,22 @@ class TestArray(unittest.TestCase):
         GIMarshallingTests.array_uint8_in(Sequence([97, 98, 99, 100]))
         GIMarshallingTests.array_uint8_in(_bytes("abcd"))
 
+    def test_array_string_in(self):
+        GIMarshallingTests.array_string_in(['foo', 'bar'])
+
     def test_array_out(self):
         self.assertEqual([-1, 0, 1, 2], GIMarshallingTests.array_out())
 
+    def test_array_out_etc(self):
+        self.assertEqual(([-5, 0, 1, 9], 4), GIMarshallingTests.array_out_etc(-5, 9))
+
     def test_array_inout(self):
         self.assertEqual([-2, -1, 0, 1, 2], GIMarshallingTests.array_inout(Sequence([-1, 0, 1, 2])))
 
+    def test_array_inout_etc(self):
+        self.assertEqual(([-5, -1, 0, 1, 9], 4),
+                         GIMarshallingTests.array_inout_etc(-5, Sequence([-1, 0, 1, 2]), 9))
+
     def test_method_array_in(self):
         object_ = GIMarshallingTests.Object()
         object_.method_array_in(Sequence([-1, 0, 1, 2]))
@@ -737,6 +811,29 @@ class TestArray(unittest.TestCase):
 
         GIMarshallingTests.array_struct_in([struct1, struct2, struct3])
 
+    def test_array_boxed_struct_take_in(self):
+        struct1 = GIMarshallingTests.BoxedStruct()
+        struct1.long_ = 1
+        struct2 = GIMarshallingTests.BoxedStruct()
+        struct2.long_ = 2
+        struct3 = GIMarshallingTests.BoxedStruct()
+        struct3.long_ = 3
+
+        GIMarshallingTests.array_struct_take_in([struct1, struct2, struct3])
+
+        self.assertEqual(1, struct1.long_)
+
+    @unittest.expectedFailure
+    def test_array_boxed_struct_return(self):
+        (struct1, struct2, struct3) = GIMarshallingTests.array_zero_terminated_return_struct()
+        self.assertEqual(GIMarshallingTests.BoxedStruct, type(struct1))
+        self.assertEqual(GIMarshallingTests.BoxedStruct, type(struct2))
+        self.assertEqual(GIMarshallingTests.BoxedStruct, type(struct3))
+        # FIXME: gets bogus values
+        self.assertEqual(42, struct1.long_)
+        self.assertEqual(43, struct2.long_)
+        self.assertEqual(44, struct3.long_)
+
     def test_array_simple_struct_in(self):
         struct1 = GIMarshallingTests.SimpleStruct()
         struct1.long_ = 1
@@ -777,6 +874,12 @@ class TestArray(unittest.TestCase):
     def test_array_zero_terminated_inout(self):
         self.assertEqual(['-1', '0', '1', '2'], GIMarshallingTests.array_zero_terminated_inout(['0', '1', '2']))
 
+    def test_init_function(self):
+        self.assertEqual((True, []), GIMarshallingTests.init_function([]))
+        self.assertEqual((True, []), GIMarshallingTests.init_function(['hello']))
+        self.assertEqual((True, ['hello']),
+                         GIMarshallingTests.init_function(['hello', 'world']))
+
 
 class TestGStrv(unittest.TestCase):
 
@@ -898,6 +1001,60 @@ class TestGPtrArray(unittest.TestCase):
         self.assertEqual(['-2', '-1', '0', '1'], GIMarshallingTests.gptrarray_utf8_full_inout(['0', '1', '2']))
 
 
+class TestGBytes(unittest.TestCase):
+    def test_gbytes_create(self):
+        b = GLib.Bytes.new(b'\x00\x01\xFF')
+        self.assertEqual(3, b.get_size())
+        self.assertEqual(b'\x00\x01\xFF', b.get_data())
+
+    def test_gbytes_create_take(self):
+        b = GLib.Bytes.new_take(b'\x00\x01\xFF')
+        self.assertEqual(3, b.get_size())
+        self.assertEqual(b'\x00\x01\xFF', b.get_data())
+
+    @unittest.skipUnless(hasattr(GIMarshallingTests, 'gbytes_full_return'),
+                         'too old gobject-introspection')
+    def test_gbytes_full_return(self):
+        b = GIMarshallingTests.gbytes_full_return()
+        self.assertEqual(4, b.get_size())
+        self.assertEqual(b'\x00\x31\xFF\x33', b.get_data())
+
+    @unittest.skipUnless(hasattr(GIMarshallingTests, 'gbytes_full_return'),
+                         'too old gobject-introspection')
+    def test_gbytes_none_in(self):
+        b = GIMarshallingTests.gbytes_full_return()
+        GIMarshallingTests.gbytes_none_in(b)
+
+    def test_compare(self):
+        a1 = GLib.Bytes.new(b'\x00\x01\xFF')
+        a2 = GLib.Bytes.new(b'\x00\x01\xFF')
+        b = GLib.Bytes.new(b'\x00\x01\xFE')
+
+        self.assertTrue(a1.equal(a2))
+        self.assertTrue(a2.equal(a1))
+        self.assertFalse(a1.equal(b))
+        self.assertFalse(b.equal(a2))
+
+        self.assertEqual(0, a1.compare(a2))
+        self.assertEqual(1, a1.compare(b))
+        self.assertEqual(-1, b.compare(a1))
+
+
+class TestGByteArray(unittest.TestCase):
+    def test_new(self):
+        ba = GLib.ByteArray.new()
+        self.assertEqual(b'', ba)
+
+        ba = GLib.ByteArray.new_take(b'\x01\x02\xFF')
+        self.assertEqual(b'\x01\x02\xFF', ba)
+
+    def test_bytearray_full_return(self):
+        self.assertEqual(b'\x001\xFF3', GIMarshallingTests.bytearray_full_return())
+
+    def test_bytearray_none_in(self):
+        GIMarshallingTests.bytearray_none_in(b'\x00\x31\xFF\x33')
+
+
 class TestGList(unittest.TestCase):
 
     def test_glist_int_none_return(self):
@@ -1061,6 +1218,23 @@ class TestGValue(unittest.TestCase):
         value.set_int64(GObject.G_MAXINT64)
         GIMarshallingTests.gvalue_int64_in(value)
 
+    def test_gvalue_in_with_type(self):
+        value = GObject.Value()
+        value.init(GObject.TYPE_STRING)
+        value.set_string('foo')
+        GIMarshallingTests.gvalue_in_with_type(value, GObject.TYPE_STRING)
+
+        value = GObject.Value()
+        value.init(GIMarshallingTests.Flags.__gtype__)
+        value.set_flags(GIMarshallingTests.Flags.VALUE1)
+        GIMarshallingTests.gvalue_in_with_type(value, GObject.TYPE_FLAGS)
+
+    def test_gvalue_in_enum(self):
+        value = GObject.Value()
+        value.init(GIMarshallingTests.Enum.__gtype__)
+        value.set_enum(GIMarshallingTests.Enum.VALUE3)
+        GIMarshallingTests.gvalue_in_enum(value)
+
     def test_gvalue_out(self):
         self.assertEqual(42, GIMarshallingTests.gvalue_out())
 
@@ -1085,6 +1259,88 @@ class TestGValue(unittest.TestCase):
         values = GIMarshallingTests.return_gvalue_flat_array()
         self.assertEqual(values, [42, '42', True])
 
+    def test_gvalue_gobject_ref_counts(self):
+        # Tests a GObject held by a GValue
+        obj = GObject.Object()
+        ref = weakref.ref(obj)
+        grefcount = obj.__grefcount__
+
+        value = GObject.Value()
+        value.init(GObject.TYPE_OBJECT)
+
+        # TYPE_OBJECT will inc ref count as it should
+        value.set_object(obj)
+        self.assertEqual(obj.__grefcount__, grefcount + 1)
+
+        # multiple set_object should not inc ref count
+        value.set_object(obj)
+        self.assertEqual(obj.__grefcount__, grefcount + 1)
+
+        # get_object will re-use the same wrapper as obj
+        res = value.get_object()
+        self.assertEqual(obj, res)
+        self.assertEqual(obj.__grefcount__, grefcount + 1)
+
+        # multiple get_object should not inc ref count
+        res = value.get_object()
+        self.assertEqual(obj.__grefcount__, grefcount + 1)
+
+        # deletion of the result and value holder should bring the
+        # refcount back to where we started
+        del res
+        del value
+        gc.collect()
+        self.assertEqual(obj.__grefcount__, grefcount)
+
+        del obj
+        gc.collect()
+        self.assertEqual(ref(), None)
+
+    def test_gvalue_boxed_ref_counts(self):
+        # Tests a boxed type wrapping a python object pointer (TYPE_PYOBJECT)
+        # held by a GValue
+        class Obj(object):
+            pass
+
+        obj = Obj()
+        ref = weakref.ref(obj)
+        refcount = sys.getrefcount(obj)
+
+        value = GObject.Value()
+        value.init(GObject.TYPE_PYOBJECT)
+
+        # boxed TYPE_PYOBJECT will inc ref count as it should
+        value.set_boxed(obj)
+        self.assertEqual(sys.getrefcount(obj), refcount + 1)
+
+        # multiple set_boxed should not inc ref count
+        value.set_boxed(obj)
+        self.assertEqual(sys.getrefcount(obj), refcount + 1)
+
+        res = value.get_boxed()
+        self.assertEqual(obj, res)
+        self.assertEqual(sys.getrefcount(obj), refcount + 2)
+
+        # multiple get_boxed should not inc ref count
+        res = value.get_boxed()
+        self.assertEqual(sys.getrefcount(obj), refcount + 2)
+
+        # deletion of the result and value holder should bring the
+        # refcount back to where we started
+        del res
+        del value
+        gc.collect()
+        self.assertEqual(sys.getrefcount(obj), refcount)
+
+        del obj
+        gc.collect()
+        self.assertEqual(ref(), None)
+
+    # FIXME: crashes
+    def disabled_test_gvalue_flat_array_round_trip(self):
+        self.assertEqual([42, '42', True],
+                         GIMarshallingTests.gvalue_flat_array_round_trip(42, '42', True))
+
 
 class TestGClosure(unittest.TestCase):
 
@@ -1154,6 +1410,11 @@ class TestEnum(unittest.TestCase):
         self.assertRaises(TypeError, GIMarshallingTests.enum_in, 43)
         self.assertRaises(TypeError, GIMarshallingTests.enum_in, 'GIMarshallingTests.Enum.VALUE3')
 
+    def test_enum_return(self):
+        enum = GIMarshallingTests.enum_returnv()
+        self.assertTrue(isinstance(enum, GIMarshallingTests.Enum))
+        self.assertEqual(enum, GIMarshallingTests.Enum.VALUE3)
+
     def test_enum_out(self):
         enum = GIMarshallingTests.enum_out()
         self.assertTrue(isinstance(enum, GIMarshallingTests.Enum))
@@ -1200,6 +1461,11 @@ class TestGEnum(unittest.TestCase):
         self.assertRaises(TypeError, GIMarshallingTests.genum_in, 43)
         self.assertRaises(TypeError, GIMarshallingTests.genum_in, 'GIMarshallingTests.GEnum.VALUE3')
 
+    def test_genum_return(self):
+        genum = GIMarshallingTests.genum_returnv()
+        self.assertTrue(isinstance(genum, GIMarshallingTests.GEnum))
+        self.assertEqual(genum, GIMarshallingTests.GEnum.VALUE3)
+
     def test_genum_out(self):
         genum = GIMarshallingTests.genum_out()
         self.assertTrue(isinstance(genum, GIMarshallingTests.GEnum))
@@ -1241,6 +1507,11 @@ class TestGFlags(unittest.TestCase):
         self.assertRaises(TypeError, GIMarshallingTests.flags_in, 1 << 1)
         self.assertRaises(TypeError, GIMarshallingTests.flags_in, 'GIMarshallingTests.Flags.VALUE2')
 
+    def test_flags_return(self):
+        flags = GIMarshallingTests.flags_returnv()
+        self.assertTrue(isinstance(flags, GIMarshallingTests.Flags))
+        self.assertEqual(flags, GIMarshallingTests.Flags.VALUE2)
+
     def test_flags_out(self):
         flags = GIMarshallingTests.flags_out()
         self.assertTrue(isinstance(flags, GIMarshallingTests.Flags))
@@ -1281,6 +1552,11 @@ class TestNoTypeFlags(unittest.TestCase):
         self.assertRaises(TypeError, GIMarshallingTests.no_type_flags_in, 1 << 1)
         self.assertRaises(TypeError, GIMarshallingTests.no_type_flags_in, 'GIMarshallingTests.NoTypeFlags.VALUE2')
 
+    def test_flags_return(self):
+        flags = GIMarshallingTests.no_type_flags_returnv()
+        self.assertTrue(isinstance(flags, GIMarshallingTests.NoTypeFlags))
+        self.assertEqual(flags, GIMarshallingTests.NoTypeFlags.VALUE2)
+
     def test_flags_out(self):
         flags = GIMarshallingTests.no_type_flags_out()
         self.assertTrue(isinstance(flags, GIMarshallingTests.NoTypeFlags))
@@ -1738,13 +2014,8 @@ class TestPythonGObject(unittest.TestCase):
         self.assertEqual(object_.val, 87)
 
     def test_dynamic_module(self):
-        from gi.module import DynamicGObjectModule
-        self.assertTrue(isinstance(GObject, DynamicGObjectModule))
-        # compare the same enum from both the pygobject attrs and gi GObject attrs
-        self.assertEqual(GObject.SIGNAL_ACTION, GObject.SignalFlags.ACTION)
-        # compare a static gobject attr with a dynamic GObject attr
-        import gi._gobject
-        self.assertEqual(GObject.GObject, gi._gobject.GObject)
+        from gi.module import DynamicModule
+        self.assertTrue(isinstance(GObject, DynamicModule))
 
     def test_subobject_non_vfunc_do_method(self):
         class PythonObjectWithNonVFuncDoMethod:
@@ -2198,11 +2469,12 @@ class TestPropertiesObject(unittest.TestCase):
         # wrong; this will raise an assertion critical which we need to ignore
         old_mask = GLib.log_set_always_fatal(
             GLib.LogLevelFlags.LEVEL_WARNING | GLib.LogLevelFlags.LEVEL_ERROR)
-        self.assertEqual(self.obj.props.some_char, 0)
-        self.obj.props.some_char = GObject.G_MAXINT8
-        self.assertEqual(self.obj.props.some_char, GObject.G_MAXINT8)
-
-        GLib.log_set_always_fatal(old_mask)
+        try:
+            self.assertEqual(self.obj.props.some_char, 0)
+            self.obj.props.some_char = GObject.G_MAXINT8
+            self.assertEqual(self.obj.props.some_char, GObject.G_MAXINT8)
+        finally:
+            GLib.log_set_always_fatal(old_mask)
 
         obj = GIMarshallingTests.PropertiesObject(some_char=-42)
         self.assertEqual(obj.props.some_char, -42)
@@ -2349,6 +2621,28 @@ class TestPropertiesObject(unittest.TestCase):
         obj = GIMarshallingTests.PropertiesObject(some_boxed_struct=struct1)
         self.assertEqual(obj.props.some_boxed_struct.long_, 1)
 
+    @unittest.skipUnless(hasattr(GIMarshallingTests.PropertiesObject, 'some_variant'),
+                         'too old gobject-introspection')
+    def test_variant(self):
+        self.assertEqual(self.obj.props.some_variant, None)
+
+        self.obj.props.some_variant = GLib.Variant('o', '/myobj')
+        self.assertEqual(self.obj.props.some_variant.get_type_string(), 'o')
+        self.assertEqual(self.obj.props.some_variant.print_(False), "'/myobj'")
+
+        self.obj.props.some_variant = None
+        self.assertEqual(self.obj.props.some_variant, None)
+
+        obj = GIMarshallingTests.PropertiesObject(some_variant=GLib.Variant('b', True))
+        self.assertEqual(obj.props.some_variant.get_type_string(), 'b')
+        self.assertEqual(obj.props.some_variant.get_boolean(), True)
+
+        self.assertRaises(TypeError, setattr, self.obj.props, 'some_variant', 'foo')
+        self.assertRaises(TypeError, setattr, self.obj.props, 'some_variant', 23)
+
+        self.assertEqual(obj.props.some_variant.get_type_string(), 'b')
+        self.assertEqual(obj.props.some_variant.get_boolean(), True)
+
 
 class TestKeywords(unittest.TestCase):
     def test_method(self):
@@ -2435,3 +2729,33 @@ class TestObjectInfo(unittest.TestCase):
         repo = gi.gi.Repository.get_default()
         info = repo.find_by_name('GObject', 'Object')
         self.assertFalse(info.get_abstract())
+
+
+class TestSignatureArgs(unittest.TestCase):
+    def test_split_args_multi_out(self):
+        in_args, out_args = gi.types.split_function_info_args(GIMarshallingTests.int_out_out.__info__)
+        self.assertEqual(len(in_args), 0)
+        self.assertEqual(len(out_args), 2)
+        self.assertEqual(out_args[0].get_pytype_hint(), 'int')
+        self.assertEqual(out_args[1].get_pytype_hint(), 'int')
+
+    def test_split_args_inout(self):
+        in_args, out_args = gi.types.split_function_info_args(GIMarshallingTests.long_inout_max_min.__info__)
+        self.assertEqual(len(in_args), 1)
+        self.assertEqual(len(out_args), 1)
+        self.assertEqual(in_args[0].get_name(), out_args[0].get_name())
+        self.assertEqual(in_args[0].get_pytype_hint(), out_args[0].get_pytype_hint())
+
+    def test_split_args_none(self):
+        obj = GIMarshallingTests.Object(int=33)
+        in_args, out_args = gi.types.split_function_info_args(obj.none_inout.__info__)
+        self.assertEqual(len(in_args), 1)
+        self.assertEqual(len(out_args), 1)
+
+    def test_final_signature_with_full_inout(self):
+        self.assertEqual(GIMarshallingTests.Object.full_inout.__doc__,
+                         'full_inout(object:GIMarshallingTests.Object) -> object:GIMarshallingTests.Object')
+
+    def test_overridden_doc_is_not_clobbered(self):
+        self.assertEqual(GIMarshallingTests.OverridesObject.method.__doc__,
+                         'Overridden doc string.')
diff --git a/tests/test_glib.py b/tests/test_glib.py
index a36eca6..1a45fd8 100644
--- a/tests/test_glib.py
+++ b/tests/test_glib.py
@@ -1,9 +1,15 @@
 # -*- Mode: Python -*-
+# encoding: UTF-8
 
 import unittest
 import os.path
+import warnings
+import subprocess
 
 from gi.repository import GLib
+from gi import PyGIDeprecationWarning
+
+from compathelper import _unicode, _bytes
 
 
 class TestGLib(unittest.TestCase):
@@ -13,3 +19,183 @@ class TestGLib(unittest.TestCase):
         self.assertTrue(os.path.exists(bash_path))
 
         self.assertEqual(GLib.find_program_in_path('non existing'), None)
+
+    def test_markup_escape_text(self):
+        self.assertEqual(GLib.markup_escape_text(_unicode('a&bä')), 'a&amp;bä')
+        self.assertEqual(GLib.markup_escape_text(_bytes('a&b\x05')), 'a&amp;b&#x5;')
+
+        # with explicit length argument
+        self.assertEqual(GLib.markup_escape_text(_bytes('a\x05\x01\x02'), 2), 'a&#x5;')
+
+    def test_progname(self):
+        GLib.set_prgname('moo')
+        self.assertEqual(GLib.get_prgname(), 'moo')
+
+    def test_appname(self):
+        GLib.set_application_name('moo')
+        self.assertEqual(GLib.get_application_name(), 'moo')
+
+    def test_xdg_dirs(self):
+        self.assertTrue(os.path.isdir(GLib.get_user_data_dir()))
+        self.assertTrue(os.path.isdir(GLib.get_user_special_dir(GLib.USER_DIRECTORY_DESKTOP)))
+        # also works with backwards compatible enum names
+        self.assertEqual(GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_MUSIC),
+                         GLib.get_user_special_dir(GLib.USER_DIRECTORY_MUSIC))
+
+        for d in GLib.get_system_config_dirs():
+            self.assertTrue('/' in d, d)
+        for d in GLib.get_system_data_dirs():
+            self.assertTrue('/' in d, d)
+
+    def test_main_depth(self):
+        self.assertEqual(GLib.main_depth(), 0)
+
+    def test_filenames(self):
+        self.assertEqual(GLib.filename_display_name('foo'), 'foo')
+        self.assertEqual(GLib.filename_display_basename('bar/foo'), 'foo')
+
+        # this is locale dependent, so we cannot completely verify the result
+        res = GLib.filename_from_utf8(_unicode('aäb'))
+        self.assertTrue(isinstance(res, bytes))
+        self.assertGreaterEqual(len(res), 3)
+
+        # with explicit length argument
+        self.assertEqual(GLib.filename_from_utf8(_unicode('aäb'), 1), b'a')
+
+    def test_uri_extract(self):
+        res = GLib.uri_list_extract_uris('''# some comment
+http://example.com
+https://my.org/q?x=1&y=2
+            http://gnome.org/new''')
+        self.assertEqual(res, ['http://example.com',
+                               'https://my.org/q?x=1&y=2',
+                               'http://gnome.org/new'])
+
+    def test_current_time(self):
+        with warnings.catch_warnings(record=True) as warn:
+            warnings.simplefilter('always')
+            tm = GLib.get_current_time()
+            self.assertTrue(issubclass(warn[0].category, PyGIDeprecationWarning))
+
+        self.assertTrue(isinstance(tm, float))
+        self.assertGreater(tm, 1350000000.0)
+
+    def test_main_loop(self):
+        # note we do not test run() here, as we use this in countless other
+        # tests
+        ml = GLib.MainLoop()
+        self.assertFalse(ml.is_running())
+
+        context = ml.get_context()
+        self.assertEqual(context, GLib.MainContext.default())
+        self.assertTrue(context.is_owner() in [True, False])
+        self.assertTrue(context.pending() in [True, False])
+        self.assertFalse(context.iteration(False))
+
+    def test_main_loop_with_context(self):
+        context = GLib.MainContext()
+        ml = GLib.MainLoop(context)
+        self.assertFalse(ml.is_running())
+        self.assertEqual(ml.get_context(), context)
+
+    def test_main_context(self):
+        # constructor
+        context = GLib.MainContext()
+        self.assertTrue(context.is_owner() in [True, False])
+        self.assertFalse(context.pending())
+        self.assertFalse(context.iteration(False))
+
+        # GLib API
+        context = GLib.MainContext.default()
+        self.assertTrue(context.is_owner() in [True, False])
+        self.assertTrue(context.pending() in [True, False])
+        self.assertTrue(context.iteration(False) in [True, False])
+
+        # backwards compatible API
+        context = GLib.main_context_default()
+        self.assertTrue(context.is_owner() in [True, False])
+        self.assertTrue(context.pending() in [True, False])
+        self.assertTrue(context.iteration(False) in [True, False])
+
+    def test_io_add_watch_no_data(self):
+        (r, w) = os.pipe()
+        call_data = []
+
+        def cb(fd, condition):
+            call_data.append((fd, condition, os.read(fd, 1)))
+            return True
+
+        # io_add_watch() takes an IOChannel, calling with an fd is deprecated
+        with warnings.catch_warnings(record=True) as warn:
+            warnings.simplefilter('always')
+            GLib.io_add_watch(r, GLib.IOCondition.IN, cb)
+            self.assertTrue(issubclass(warn[0].category, PyGIDeprecationWarning))
+
+        ml = GLib.MainLoop()
+        GLib.timeout_add(10, lambda: os.write(w, b'a') and False)
+        GLib.timeout_add(100, lambda: os.write(w, b'b') and False)
+        GLib.timeout_add(200, ml.quit)
+        ml.run()
+
+        self.assertEqual(call_data, [(r, GLib.IOCondition.IN, b'a'),
+                                     (r, GLib.IOCondition.IN, b'b')])
+
+    def test_io_add_watch_with_data(self):
+        (r, w) = os.pipe()
+        call_data = []
+
+        def cb(fd, condition, data):
+            call_data.append((fd, condition, os.read(fd, 1), data))
+            return True
+
+        # io_add_watch() takes an IOChannel, calling with an fd is deprecated
+        with warnings.catch_warnings(record=True) as warn:
+            warnings.simplefilter('always')
+            GLib.io_add_watch(r, GLib.IOCondition.IN, cb, 'moo')
+            self.assertTrue(issubclass(warn[0].category, PyGIDeprecationWarning))
+
+        ml = GLib.MainLoop()
+        GLib.timeout_add(10, lambda: os.write(w, b'a') and False)
+        GLib.timeout_add(100, lambda: os.write(w, b'b') and False)
+        GLib.timeout_add(200, ml.quit)
+        ml.run()
+
+        self.assertEqual(call_data, [(r, GLib.IOCondition.IN, b'a', 'moo'),
+                                     (r, GLib.IOCondition.IN, b'b', 'moo')])
+
+    def test_io_add_watch_pyfile(self):
+        call_data = []
+
+        cmd = subprocess.Popen('sleep 0.1; echo hello; sleep 0.2; echo world',
+                               shell=True, stdout=subprocess.PIPE)
+
+        def cb(file, condition):
+            call_data.append((file, condition, file.readline()))
+            return True
+
+        # io_add_watch() takes an IOChannel, calling with a Python file is deprecated
+        with warnings.catch_warnings(record=True) as warn:
+            warnings.simplefilter('always')
+            GLib.io_add_watch(cmd.stdout, GLib.IOCondition.IN, cb)
+            self.assertTrue(issubclass(warn[0].category, PyGIDeprecationWarning))
+
+        ml = GLib.MainLoop()
+        GLib.timeout_add(400, ml.quit)
+        ml.run()
+
+        cmd.wait()
+
+        self.assertEqual(call_data, [(cmd.stdout, GLib.IOCondition.IN, b'hello\n'),
+                                     (cmd.stdout, GLib.IOCondition.IN, b'world\n')])
+
+    def test_glib_version(self):
+        (major, minor, micro) = GLib.glib_version
+        self.assertGreaterEqual(major, 2)
+        self.assertGreaterEqual(minor, 0)
+        self.assertGreaterEqual(micro, 0)
+
+    def test_pyglib_version(self):
+        (major, minor, micro) = GLib.pyglib_version
+        self.assertGreaterEqual(major, 3)
+        self.assertGreaterEqual(minor, 7)
+        self.assertGreaterEqual(micro, 2)
diff --git a/tests/test_gobject.py b/tests/test_gobject.py
index a28a145..99f471b 100644
--- a/tests/test_gobject.py
+++ b/tests/test_gobject.py
@@ -1,37 +1,93 @@
 # -*- Mode: Python -*-
 
+import sys
 import gc
 import unittest
+import warnings
 
 from gi.repository import GObject
-import sys
+from gi import PyGIDeprecationWarning
+from gi.module import get_introspection_module
+from gi._gobject import _gobject
+
 import testhelper
 
 
 class TestGObjectAPI(unittest.TestCase):
-    def testGObjectModule(self):
-        obj = GObject.GObject()
+    def test_gobject_inheritance(self):
+        # GObject.Object is a class hierarchy as follows:
+        # overrides.Object -> introspection.Object -> static.GObject
+        GIObjectModule = get_introspection_module('GObject')
+        self.assertTrue(issubclass(GObject.Object, GIObjectModule.Object))
+        self.assertTrue(issubclass(GIObjectModule.Object, _gobject.GObject))
+
+        self.assertEqual(_gobject.GObject.__gtype__, GObject.TYPE_OBJECT)
+        self.assertEqual(GIObjectModule.Object.__gtype__, GObject.TYPE_OBJECT)
+        self.assertEqual(GObject.Object.__gtype__, GObject.TYPE_OBJECT)
+
+        # The pytype wrapper should hold the outer most Object class from overrides.
+        self.assertEqual(GObject.TYPE_OBJECT.pytype, GObject.Object)
+
+    @unittest.skipIf(sys.version_info[:2] < (2, 7), 'Python 2.7 is required')
+    def test_gobject_unsupported_overrides(self):
+        obj = GObject.Object()
+
+        with self.assertRaisesRegex(RuntimeError, 'Data access methods are unsupported.*'):
+            obj.get_data()
+
+        with self.assertRaisesRegex(RuntimeError, 'This method is currently unsupported.*'):
+            obj.force_floating()
+
+    def test_compat_api(self):
+        with warnings.catch_warnings(record=True) as w:
+            warnings.simplefilter('always')
+            # GObject formerly exposed a lot of GLib's functions
+            self.assertEqual(GObject.markup_escape_text('foo'), 'foo')
+
+            ml = GObject.MainLoop()
+            self.assertFalse(ml.is_running())
 
-        self.assertEqual(obj.__module__,
-                         'gi._gobject._gobject')
+            context = GObject.main_context_default()
+            self.assertTrue(context.pending() in [False, True])
+
+            context = GObject.MainContext()
+            self.assertFalse(context.pending())
+
+            self.assertTrue(issubclass(w[0].category, PyGIDeprecationWarning))
+            self.assertTrue('GLib.markup_escape_text' in str(w[0]), str(w[0]))
+
+            self.assertLess(GObject.PRIORITY_HIGH, GObject.PRIORITY_DEFAULT)
+
+    def test_min_max_int(self):
+        self.assertEqual(GObject.G_MAXINT16, 2 ** 15 - 1)
+        self.assertEqual(GObject.G_MININT16, -2 ** 15)
+        self.assertEqual(GObject.G_MAXUINT16, 2 ** 16 - 1)
+
+        self.assertEqual(GObject.G_MAXINT32, 2 ** 31 - 1)
+        self.assertEqual(GObject.G_MININT32, -2 ** 31)
+        self.assertEqual(GObject.G_MAXUINT32, 2 ** 32 - 1)
+
+        self.assertEqual(GObject.G_MAXINT64, 2 ** 63 - 1)
+        self.assertEqual(GObject.G_MININT64, -2 ** 63)
+        self.assertEqual(GObject.G_MAXUINT64, 2 ** 64 - 1)
 
 
 class TestReferenceCounting(unittest.TestCase):
-    def testRegularObject(self):
+    def test_regular_object(self):
         obj = GObject.GObject()
         self.assertEqual(obj.__grefcount__, 1)
 
         obj = GObject.new(GObject.GObject)
         self.assertEqual(obj.__grefcount__, 1)
 
-    def testFloating(self):
+    def test_floating(self):
         obj = testhelper.Floating()
         self.assertEqual(obj.__grefcount__, 1)
 
         obj = GObject.new(testhelper.Floating)
         self.assertEqual(obj.__grefcount__, 1)
 
-    def testOwnedByLibrary(self):
+    def test_owned_by_library(self):
         # Upon creation, the refcount of the object should be 2:
         # - someone already has a reference on the new object.
         # - the python wrapper should hold its own reference.
@@ -44,7 +100,7 @@ class TestReferenceCounting(unittest.TestCase):
         obj.release()
         self.assertEqual(obj.__grefcount__, 1)
 
-    def testOwnedByLibraryOutOfScope(self):
+    def test_owned_by_library_out_of_scope(self):
         obj = testhelper.OwnedByLibrary()
         self.assertEqual(obj.__grefcount__, 2)
 
@@ -62,7 +118,7 @@ class TestReferenceCounting(unittest.TestCase):
         obj.release()
         self.assertEqual(obj.__grefcount__, 1)
 
-    def testOwnedByLibraryUsingGObjectNew(self):
+    def test_owned_by_library_using_gobject_new(self):
         # Upon creation, the refcount of the object should be 2:
         # - someone already has a reference on the new object.
         # - the python wrapper should hold its own reference.
@@ -75,7 +131,7 @@ class TestReferenceCounting(unittest.TestCase):
         obj.release()
         self.assertEqual(obj.__grefcount__, 1)
 
-    def testOwnedByLibraryOutOfScopeUsingGobjectNew(self):
+    def test_owned_by_library_out_of_scope_using_gobject_new(self):
         obj = GObject.new(testhelper.OwnedByLibrary)
         self.assertEqual(obj.__grefcount__, 2)
 
@@ -93,7 +149,7 @@ class TestReferenceCounting(unittest.TestCase):
         obj.release()
         self.assertEqual(obj.__grefcount__, 1)
 
-    def testFloatingAndSunk(self):
+    def test_floating_and_sunk(self):
         # Upon creation, the refcount of the object should be 2:
         # - someone already has a reference on the new object.
         # - the python wrapper should hold its own reference.
@@ -106,7 +162,7 @@ class TestReferenceCounting(unittest.TestCase):
         obj.release()
         self.assertEqual(obj.__grefcount__, 1)
 
-    def testFloatingAndSunkOutOfScope(self):
+    def test_floating_and_sunk_out_of_scope(self):
         obj = testhelper.FloatingAndSunk()
         self.assertEqual(obj.__grefcount__, 2)
 
@@ -124,7 +180,7 @@ class TestReferenceCounting(unittest.TestCase):
         obj.release()
         self.assertEqual(obj.__grefcount__, 1)
 
-    def testFloatingAndSunkUsingGObjectNew(self):
+    def test_floating_and_sunk_using_gobject_new(self):
         # Upon creation, the refcount of the object should be 2:
         # - someone already has a reference on the new object.
         # - the python wrapper should hold its own reference.
@@ -137,7 +193,7 @@ class TestReferenceCounting(unittest.TestCase):
         obj.release()
         self.assertEqual(obj.__grefcount__, 1)
 
-    def testFloatingAndSunkOutOfScopeUsingGObjectNew(self):
+    def test_floating_and_sunk_out_of_scope_using_gobject_new(self):
         obj = GObject.new(testhelper.FloatingAndSunk)
         self.assertEqual(obj.__grefcount__, 2)
 
@@ -155,7 +211,7 @@ class TestReferenceCounting(unittest.TestCase):
         obj.release()
         self.assertEqual(obj.__grefcount__, 1)
 
-    def testUninitializedObject(self):
+    def test_uninitialized_object(self):
         class Obj(GObject.GObject):
             def __init__(self):
                 x = self.__grefcount__
@@ -176,19 +232,19 @@ class TestPythonReferenceCounting(unittest.TestCase):
     # Newly created instances should alwayshave two references: one for
     # the GC, and one for the bound variable in the local scope.
 
-    def testNewInstanceHasTwoRefs(self):
+    def test_new_instance_has_two_refs(self):
         obj = GObject.GObject()
         self.assertEqual(sys.getrefcount(obj), 2)
 
-    def testNewInstanceHasTwoRefsUsingGObjectNew(self):
+    def test_new_instance_has_two_refs_using_gobject_new(self):
         obj = GObject.new(GObject.GObject)
         self.assertEqual(sys.getrefcount(obj), 2)
 
-    def testNewSubclassInstanceHasTwoRefs(self):
+    def test_new_subclass_instance_has_two_refs(self):
         obj = A()
         self.assertEqual(sys.getrefcount(obj), 2)
 
-    def testNewSubclassInstanceHasTwoRefsUsingGObjectNew(self):
+    def test_new_subclass_instance_has_two_refs_using_gobject_new(self):
         obj = GObject.new(A)
         self.assertEqual(sys.getrefcount(obj), 2)
 
@@ -206,7 +262,7 @@ class TestContextManagers(unittest.TestCase):
         self.obj = self.ContextTestObject()
         self.handler = self.obj.connect('notify::prop', self.on_prop_set)
 
-    def testFreezeNotifyContext(self):
+    def test_freeze_notify_context(self):
         # Verify prop tracking list
         self.assertEqual(self.tracking, [])
         self.obj.props.prop = 1
@@ -215,22 +271,28 @@ class TestContextManagers(unittest.TestCase):
         self.assertEqual(self.tracking, [1, 2])
         self.assertEqual(self.obj.__grefcount__, 1)
 
-        # Using the context manager the tracking list should not be affected
-        # and the GObject reference count should go up.
+        pyref_count = sys.getrefcount(self.obj)
+
+        # Using the context manager the tracking list should not be affected.
+        # The GObject reference count should stay the same and the python
+        # object ref-count should go up.
         with self.obj.freeze_notify():
-            self.assertEqual(self.obj.__grefcount__, 2)
+            self.assertEqual(self.obj.__grefcount__, 1)
+            self.assertEqual(sys.getrefcount(self.obj), pyref_count + 1)
             self.obj.props.prop = 3
             self.assertEqual(self.obj.props.prop, 3)
             self.assertEqual(self.tracking, [1, 2])
 
         # After the context manager, the prop should have been modified,
-        # the tracking list will be modified, and the GObject ref
+        # the tracking list will be modified, and the python object ref
         # count goes back down.
+        gc.collect()
         self.assertEqual(self.obj.props.prop, 3)
         self.assertEqual(self.tracking, [1, 2, 3])
         self.assertEqual(self.obj.__grefcount__, 1)
+        self.assertEqual(sys.getrefcount(self.obj), pyref_count)
 
-    def testHandlerBlockContext(self):
+    def test_handler_block_context(self):
         # Verify prop tracking list
         self.assertEqual(self.tracking, [])
         self.obj.props.prop = 1
@@ -239,10 +301,14 @@ class TestContextManagers(unittest.TestCase):
         self.assertEqual(self.tracking, [1, 2])
         self.assertEqual(self.obj.__grefcount__, 1)
 
-        # Using the context manager the tracking list should not be affected
-        # and the GObject reference count should go up.
+        pyref_count = sys.getrefcount(self.obj)
+
+        # Using the context manager the tracking list should not be affected.
+        # The GObject reference count should stay the same and the python
+        # object ref-count should go up.
         with self.obj.handler_block(self.handler):
-            self.assertEqual(self.obj.__grefcount__, 2)
+            self.assertEqual(self.obj.__grefcount__, 1)
+            self.assertEqual(sys.getrefcount(self.obj), pyref_count + 1)
             self.obj.props.prop = 3
             self.assertEqual(self.obj.props.prop, 3)
             self.assertEqual(self.tracking, [1, 2])
@@ -250,11 +316,13 @@ class TestContextManagers(unittest.TestCase):
         # After the context manager, the prop should have been modified
         # the tracking list should have stayed the same and the GObject ref
         # count goes back down.
+        gc.collect()
         self.assertEqual(self.obj.props.prop, 3)
         self.assertEqual(self.tracking, [1, 2])
         self.assertEqual(self.obj.__grefcount__, 1)
+        self.assertEqual(sys.getrefcount(self.obj), pyref_count)
 
-    def testFreezeNotifyContextNested(self):
+    def test_freeze_notify_context_nested(self):
         self.assertEqual(self.tracking, [])
         with self.obj.freeze_notify():
             self.obj.props.prop = 1
@@ -274,7 +342,7 @@ class TestContextManagers(unittest.TestCase):
         # and the last one sent.
         self.assertEqual(self.tracking, [3])
 
-    def testHandlerBlockContextNested(self):
+    def test_handler_block_context_nested(self):
         self.assertEqual(self.tracking, [])
         with self.obj.handler_block(self.handler):
             self.obj.props.prop = 1
@@ -295,7 +363,7 @@ class TestContextManagers(unittest.TestCase):
         self.assertEqual(self.obj.props.prop, 3)
         self.assertEqual(self.tracking, [])
 
-    def testFreezeNotifyNormalUsageRefCounts(self):
+    def test_freeze_notify_normal_usage_ref_counts(self):
         # Ensure ref counts without using methods as context managers
         # maintain the same count.
         self.assertEqual(self.obj.__grefcount__, 1)
@@ -304,14 +372,14 @@ class TestContextManagers(unittest.TestCase):
         self.obj.thaw_notify()
         self.assertEqual(self.obj.__grefcount__, 1)
 
-    def testHandlerBlockNormalUsageRefCounts(self):
+    def test_handler_block_normal_usage_ref_counts(self):
         self.assertEqual(self.obj.__grefcount__, 1)
         self.obj.handler_block(self.handler)
         self.assertEqual(self.obj.__grefcount__, 1)
         self.obj.handler_unblock(self.handler)
         self.assertEqual(self.obj.__grefcount__, 1)
 
-    def testFreezeNotifyContextError(self):
+    def test_freeze_notify_context_error(self):
         # Test an exception occurring within a freeze context exits the context
         try:
             with self.obj.freeze_notify():
@@ -329,7 +397,7 @@ class TestContextManagers(unittest.TestCase):
         self.obj.props.prop = 2
         self.assertEqual(self.tracking, [1, 2])
 
-    def testHandlerBlockContextError(self):
+    def test_handler_block_context_error(self):
         # Test an exception occurring within a handler block exits the context
         try:
             with self.obj.handler_block(self.handler):
@@ -356,7 +424,7 @@ class TestPropertyBindings(unittest.TestCase):
         self.source = self.TestObject()
         self.target = self.TestObject()
 
-    def testDefaultBinding(self):
+    def test_default_binding(self):
         binding = self.source.bind_property('int_prop', self.target, 'int_prop',
                                             GObject.BindingFlags.DEFAULT)
         binding = binding  # PyFlakes
@@ -371,7 +439,7 @@ class TestPropertyBindings(unittest.TestCase):
         self.assertEqual(self.source.int_prop, 1)
         self.assertEqual(self.target.int_prop, 2)
 
-    def testBiDirectionalBinding(self):
+    def test_bidirectional_binding(self):
         binding = self.source.bind_property('int_prop', self.target, 'int_prop',
                                             GObject.BindingFlags.BIDIRECTIONAL)
         binding = binding  # PyFlakes
@@ -386,7 +454,7 @@ class TestPropertyBindings(unittest.TestCase):
         self.assertEqual(self.source.int_prop, 2)
         self.assertEqual(self.target.int_prop, 2)
 
-    def testTransformToOnly(self):
+    def test_transform_to_only(self):
         def transform_to(binding, value, user_data=None):
             self.assertEqual(user_data, 'test-data')
             return value * 2
@@ -404,7 +472,7 @@ class TestPropertyBindings(unittest.TestCase):
         self.assertEqual(self.source.int_prop, 1)
         self.assertEqual(self.target.int_prop, 1)
 
-    def testTransformFromOnly(self):
+    def test_transform_from_only(self):
         def transform_from(binding, value, user_data=None):
             self.assertEqual(user_data, None)
             return value * 2
@@ -422,7 +490,7 @@ class TestPropertyBindings(unittest.TestCase):
         self.assertEqual(self.source.int_prop, 2)
         self.assertEqual(self.target.int_prop, 1)
 
-    def testTransformBidrectional(self):
+    def test_transform_bidirectional(self):
         def transform_to(binding, value, user_data=None):
             self.assertEqual(user_data, 'test-data')
             return value * 2
@@ -445,7 +513,7 @@ class TestPropertyBindings(unittest.TestCase):
         self.assertEqual(self.source.int_prop, 2)
         self.assertEqual(self.target.int_prop, 4)
 
-    def testExplicitUnbindClearsConnection(self):
+    def test_explicit_unbind_clears_connection(self):
         self.assertEqual(self.source.int_prop, 0)
         self.assertEqual(self.target.int_prop, 0)
 
@@ -465,7 +533,7 @@ class TestPropertyBindings(unittest.TestCase):
         # An already unbound BindingWeakRef will raise if unbind is attempted a second time.
         self.assertRaises(ValueError, binding.unbind)
 
-    def testReferenceCounts(self):
+    def test_reference_counts(self):
         self.assertEqual(self.source.__grefcount__, 1)
         self.assertEqual(self.target.__grefcount__, 1)
 
diff --git a/tests/test_gtype.py b/tests/test_gtype.py
new file mode 100644
index 0000000..dec716e
--- /dev/null
+++ b/tests/test_gtype.py
@@ -0,0 +1,53 @@
+import unittest
+
+from gi.repository import GObject
+from gi.repository import GIMarshallingTests
+
+
+class CustomBase(GObject.GObject):
+    pass
+
+
+class CustomChild(CustomBase, GIMarshallingTests.Interface):
+    pass
+
+
+class TestTypeModuleLevelFunctions(unittest.TestCase):
+    def test_type_name(self):
+        self.assertEqual(GObject.type_name(GObject.TYPE_NONE), 'void')
+        self.assertEqual(GObject.type_name(GObject.TYPE_OBJECT), 'GObject')
+        self.assertEqual(GObject.type_name(GObject.TYPE_PYOBJECT), 'PyObject')
+
+    def test_type_from_name(self):
+        # A complete test is not needed here since the TYPE_* defines are created
+        # using this method.
+        self.assertRaises(RuntimeError, GObject.type_from_name, '!NOT_A_REAL_TYPE!')
+        self.assertEqual(GObject.type_from_name('GObject'), GObject.TYPE_OBJECT)
+        self.assertEqual(GObject.type_from_name('GObject'), GObject.GObject.__gtype__)
+
+    def test_type_is_a(self):
+        self.assertTrue(GObject.type_is_a(CustomBase, GObject.TYPE_OBJECT))
+        self.assertTrue(GObject.type_is_a(CustomChild, CustomBase))
+        self.assertTrue(GObject.type_is_a(CustomBase, GObject.GObject))
+        self.assertTrue(GObject.type_is_a(CustomBase.__gtype__, GObject.TYPE_OBJECT))
+        self.assertFalse(GObject.type_is_a(GObject.TYPE_OBJECT, CustomBase))
+        self.assertFalse(GObject.type_is_a(CustomBase, int))  # invalid type
+        self.assertRaises(TypeError, GObject.type_is_a, CustomBase, 1)
+        self.assertRaises(TypeError, GObject.type_is_a, 2, GObject.TYPE_OBJECT)
+        self.assertRaises(TypeError, GObject.type_is_a, 1, 2)
+
+    def test_type_children(self):
+        self.assertSequenceEqual(GObject.type_children(CustomBase),
+                                 [CustomChild.__gtype__])
+        self.assertEqual(len(GObject.type_children(CustomChild)), 0)
+
+    def test_type_interfaces(self):
+        self.assertEqual(len(GObject.type_interfaces(CustomBase)), 0)
+        self.assertEqual(len(GObject.type_interfaces(CustomChild)), 1)
+        self.assertSequenceEqual(GObject.type_interfaces(CustomChild),
+                                 [GIMarshallingTests.Interface.__gtype__])
+
+    def test_type_parent(self):
+        self.assertEqual(GObject.type_parent(CustomChild), CustomBase.__gtype__)
+        self.assertEqual(GObject.type_parent(CustomBase), GObject.TYPE_OBJECT)
+        self.assertRaises(RuntimeError, GObject.type_parent, GObject.GObject)
diff --git a/tests/test_interface.py b/tests/test_interface.py
index 2df61b1..dd01af8 100644
--- a/tests/test_interface.py
+++ b/tests/test_interface.py
@@ -37,12 +37,12 @@ GObject.type_register(MyObject)
 
 class TestIfaceImpl(unittest.TestCase):
 
-    def testReImplementInterface(self):
+    def test_reimplement_interface(self):
         m = MyUnknown()
         m.iface_method()
         self.assertEqual(m.called, True)
 
-    def testImplementInterface(self):
+    def test_implement_interface(self):
         m = MyObject()
         m.iface_method()
         self.assertEqual(m.called, True)
diff --git a/tests/test_iochannel.py b/tests/test_iochannel.py
new file mode 100644
index 0000000..0cc1b4b
--- /dev/null
+++ b/tests/test_iochannel.py
@@ -0,0 +1,424 @@
+# -*- Mode: Python -*-
+# encoding: UTF-8
+from __future__ import unicode_literals
+
+import unittest
+import tempfile
+import os.path
+import fcntl
+import shutil
+import warnings
+
+from gi.repository import GLib
+from gi import PyGIDeprecationWarning
+
+from compathelper import _unicode
+
+
+class IOChannel(unittest.TestCase):
+    def setUp(self):
+        self.workdir = tempfile.mkdtemp()
+
+        self.testutf8 = os.path.join(self.workdir, 'testutf8.txt')
+        with open(self.testutf8, 'wb') as f:
+            f.write('''hello ♥ world
+second line
+
+À demain!'''.encode('UTF-8'))
+
+        self.testlatin1 = os.path.join(self.workdir, 'testlatin1.txt')
+        with open(self.testlatin1, 'wb') as f:
+            f.write(b'''hell\xf8 world
+second line
+
+\xc0 demain!''')
+
+        self.testout = os.path.join(self.workdir, 'testout.txt')
+
+    def tearDown(self):
+        shutil.rmtree(self.workdir)
+
+    def test_file_readline_utf8(self):
+        ch = GLib.IOChannel(filename=self.testutf8)
+        self.assertEqual(ch.get_encoding(), 'UTF-8')
+        self.assertTrue(ch.get_close_on_unref())
+        self.assertEqual(_unicode(ch.readline()), 'hello ♥ world\n')
+        self.assertEqual(ch.get_buffer_condition(), GLib.IOCondition.IN)
+        self.assertEqual(ch.readline(), 'second line\n')
+        self.assertEqual(ch.readline(), '\n')
+        self.assertEqual(_unicode(ch.readline()), 'À demain!')
+        self.assertEqual(ch.get_buffer_condition(), 0)
+        self.assertEqual(ch.readline(), '')
+        ch.close()
+
+    def test_file_readline_latin1(self):
+        ch = GLib.IOChannel(filename=self.testlatin1, mode='r')
+        ch.set_encoding('latin1')
+        self.assertEqual(ch.get_encoding(), 'latin1')
+        self.assertEqual(_unicode(ch.readline()), 'hellø world\n')
+        self.assertEqual(ch.readline(), 'second line\n')
+        self.assertEqual(ch.readline(), '\n')
+        self.assertEqual(_unicode(ch.readline()), 'À demain!')
+        ch.close()
+
+    def test_file_iter(self):
+        items = []
+        ch = GLib.IOChannel(filename=self.testutf8)
+        for item in ch:
+            items.append(item)
+        self.assertEqual(len(items), 4)
+        self.assertEqual(_unicode(items[0]), 'hello ♥ world\n')
+        ch.close()
+
+    def test_file_readlines(self):
+        ch = GLib.IOChannel(filename=self.testutf8)
+        lines = ch.readlines()
+        # Note, this really ought to be 4, but the static bindings add an extra
+        # empty one
+        self.assertGreaterEqual(len(lines), 4)
+        self.assertLessEqual(len(lines), 5)
+        self.assertEqual(_unicode(lines[0]), 'hello ♥ world\n')
+        self.assertEqual(_unicode(lines[3]), 'À demain!')
+        if len(lines) == 4:
+            self.assertEqual(lines[4], '')
+
+    def test_file_read(self):
+        ch = GLib.IOChannel(filename=self.testutf8)
+        with open(self.testutf8, 'rb') as f:
+            self.assertEqual(ch.read(), f.read())
+
+        ch = GLib.IOChannel(filename=self.testutf8)
+        with open(self.testutf8, 'rb') as f:
+            self.assertEqual(ch.read(10), f.read(10))
+
+        ch = GLib.IOChannel(filename=self.testutf8)
+        with open(self.testutf8, 'rb') as f:
+            self.assertEqual(ch.read(max_count=15), f.read(15))
+
+    def test_seek(self):
+        ch = GLib.IOChannel(filename=self.testutf8)
+        ch.seek(2)
+        self.assertEqual(ch.read(3), b'llo')
+
+        ch.seek(2, 0)  # SEEK_SET
+        self.assertEqual(ch.read(3), b'llo')
+
+        ch.seek(1, 1)  # SEEK_CUR, skip the space
+        self.assertEqual(ch.read(3), b'\xe2\x99\xa5')
+
+        ch.seek(2, 2)  # SEEK_END
+        # FIXME: does not work currently
+        #self.assertEqual(ch.read(2), b'n!')
+
+        # invalid whence value
+        self.assertRaises(ValueError, ch.seek, 0, 3)
+
+    def test_file_write(self):
+        ch = GLib.IOChannel(filename=self.testout, mode='w')
+        ch.set_encoding('latin1')
+        ch.write('hellø world\n')
+        ch.close()
+        ch = GLib.IOChannel(filename=self.testout, mode='a')
+        ch.set_encoding('latin1')
+        ch.write('À demain!')
+        ch.close()
+
+        with open(self.testout, 'rb') as f:
+            self.assertEqual(f.read().decode('latin1'), 'hellø world\nÀ demain!')
+
+    def test_file_writelines(self):
+        ch = GLib.IOChannel(filename=self.testout, mode='w')
+        ch.writelines(['foo', 'bar\n', 'baz\n', 'end'])
+        ch.close()
+
+        with open(self.testout, 'r') as f:
+            self.assertEqual(f.read(), 'foobar\nbaz\nend')
+
+    def test_buffering(self):
+        writer = GLib.IOChannel(filename=self.testout, mode='w')
+        writer.set_encoding(None)
+        self.assertTrue(writer.get_buffered())
+        self.assertGreater(writer.get_buffer_size(), 10)
+
+        reader = GLib.IOChannel(filename=self.testout, mode='r')
+
+        # does not get written immediately on buffering
+        writer.write('abc')
+        self.assertEqual(reader.read(), b'')
+        writer.flush()
+        self.assertEqual(reader.read(), b'abc')
+
+        # does get written immediately without buffering
+        writer.set_buffered(False)
+        writer.write('def')
+        self.assertEqual(reader.read(), b'def')
+
+        # writes after buffer overflow
+        writer.set_buffer_size(10)
+        writer.write('0123456789012')
+        self.assertTrue(reader.read().startswith(b'012'))
+        writer.flush()
+        reader.read()  # ignore bits written after flushing
+
+        # closing flushes
+        writer.set_buffered(True)
+        writer.write('ghi')
+        writer.close()
+        self.assertEqual(reader.read(), b'ghi')
+        reader.close()
+
+    def test_fd_read(self):
+        (r, w) = os.pipe()
+
+        ch = GLib.IOChannel(filedes=r)
+        ch.set_encoding(None)
+        ch.set_flags(ch.get_flags() | GLib.IOFlags.NONBLOCK)
+        self.assertNotEqual(ch.get_flags() | GLib.IOFlags.NONBLOCK, 0)
+        self.assertEqual(ch.read(), b'')
+        os.write(w, b'\x01\x02')
+        self.assertEqual(ch.read(), b'\x01\x02')
+
+        # now test blocking case, after closing the write end
+        ch.set_flags(GLib.IOFlags(ch.get_flags() & ~GLib.IOFlags.NONBLOCK))
+        os.write(w, b'\x03\x04')
+        os.close(w)
+        self.assertEqual(ch.read(), b'\x03\x04')
+
+        ch.close()
+
+    def test_fd_write(self):
+        (r, w) = os.pipe()
+        fcntl.fcntl(r, fcntl.F_SETFL, fcntl.fcntl(r, fcntl.F_GETFL) | os.O_NONBLOCK)
+
+        ch = GLib.IOChannel(filedes=w, mode='w')
+        ch.set_encoding(None)
+        ch.set_buffered(False)
+        ch.write(b'\x01\x02')
+        self.assertEqual(os.read(r, 10), b'\x01\x02')
+
+        # now test blocking case, after closing the write end
+        fcntl.fcntl(r, fcntl.F_SETFL, fcntl.fcntl(r, fcntl.F_GETFL) & ~os.O_NONBLOCK)
+        ch.write(b'\x03\x04')
+        ch.close()
+        self.assertEqual(os.read(r, 10), b'\x03\x04')
+        os.close(r)
+
+    def test_deprecated_method_add_watch_no_data(self):
+        (r, w) = os.pipe()
+
+        ch = GLib.IOChannel(filedes=r)
+        ch.set_encoding(None)
+        ch.set_flags(ch.get_flags() | GLib.IOFlags.NONBLOCK)
+
+        cb_reads = []
+
+        def cb(channel, condition):
+            self.assertEqual(channel, ch)
+            self.assertEqual(condition, GLib.IOCondition.IN)
+            cb_reads.append(channel.read())
+            return True
+
+        # io_add_watch() method is deprecated, use GLib.io_add_watch
+        with warnings.catch_warnings(record=True) as warn:
+            warnings.simplefilter('always')
+            ch.add_watch(GLib.IOCondition.IN, cb)
+            self.assertTrue(issubclass(warn[0].category, PyGIDeprecationWarning))
+
+        ml = GLib.MainLoop()
+
+        GLib.timeout_add(10, lambda: os.write(w, b'a') and False)
+        GLib.timeout_add(100, lambda: os.write(w, b'b') and False)
+        GLib.timeout_add(200, ml.quit)
+        ml.run()
+
+        self.assertEqual(cb_reads, [b'a', b'b'])
+
+    def test_deprecated_method_add_watch_data_priority(self):
+        (r, w) = os.pipe()
+
+        ch = GLib.IOChannel(filedes=r)
+        ch.set_encoding(None)
+        ch.set_flags(ch.get_flags() | GLib.IOFlags.NONBLOCK)
+
+        cb_reads = []
+
+        def cb(channel, condition, data):
+            self.assertEqual(channel, ch)
+            self.assertEqual(condition, GLib.IOCondition.IN)
+            self.assertEqual(data, 'hello')
+            cb_reads.append(channel.read())
+            return True
+
+        ml = GLib.MainLoop()
+        # io_add_watch() method is deprecated, use GLib.io_add_watch
+        with warnings.catch_warnings(record=True) as warn:
+            warnings.simplefilter('always')
+            id = ch.add_watch(GLib.IOCondition.IN, cb, 'hello', priority=GLib.PRIORITY_HIGH)
+            self.assertTrue(issubclass(warn[0].category, PyGIDeprecationWarning))
+
+        self.assertEqual(ml.get_context().find_source_by_id(id).priority,
+                         GLib.PRIORITY_HIGH)
+
+        GLib.timeout_add(10, lambda: os.write(w, b'a') and False)
+        GLib.timeout_add(100, lambda: os.write(w, b'b') and False)
+        GLib.timeout_add(200, ml.quit)
+        ml.run()
+
+        self.assertEqual(cb_reads, [b'a', b'b'])
+
+    def test_add_watch_no_data(self):
+        (r, w) = os.pipe()
+
+        ch = GLib.IOChannel(filedes=r)
+        ch.set_encoding(None)
+        ch.set_flags(ch.get_flags() | GLib.IOFlags.NONBLOCK)
+
+        cb_reads = []
+
+        def cb(channel, condition):
+            self.assertEqual(channel, ch)
+            self.assertEqual(condition, GLib.IOCondition.IN)
+            cb_reads.append(channel.read())
+            return True
+
+        id = GLib.io_add_watch(ch, GLib.PRIORITY_HIGH, GLib.IOCondition.IN, cb)
+
+        ml = GLib.MainLoop()
+        self.assertEqual(ml.get_context().find_source_by_id(id).priority,
+                         GLib.PRIORITY_HIGH)
+        GLib.timeout_add(10, lambda: os.write(w, b'a') and False)
+        GLib.timeout_add(100, lambda: os.write(w, b'b') and False)
+        GLib.timeout_add(200, ml.quit)
+        ml.run()
+
+        self.assertEqual(cb_reads, [b'a', b'b'])
+
+    def test_add_watch_with_data(self):
+        (r, w) = os.pipe()
+
+        ch = GLib.IOChannel(filedes=r)
+        ch.set_encoding(None)
+        ch.set_flags(ch.get_flags() | GLib.IOFlags.NONBLOCK)
+
+        cb_reads = []
+
+        def cb(channel, condition, data):
+            self.assertEqual(channel, ch)
+            self.assertEqual(condition, GLib.IOCondition.IN)
+            self.assertEqual(data, 'hello')
+            cb_reads.append(channel.read())
+            return True
+
+        id = GLib.io_add_watch(ch, GLib.PRIORITY_HIGH, GLib.IOCondition.IN, cb, 'hello')
+
+        ml = GLib.MainLoop()
+        self.assertEqual(ml.get_context().find_source_by_id(id).priority,
+                         GLib.PRIORITY_HIGH)
+        GLib.timeout_add(10, lambda: os.write(w, b'a') and False)
+        GLib.timeout_add(100, lambda: os.write(w, b'b') and False)
+        GLib.timeout_add(200, ml.quit)
+        ml.run()
+
+        self.assertEqual(cb_reads, [b'a', b'b'])
+
+    def test_add_watch_with_multi_data(self):
+        (r, w) = os.pipe()
+
+        ch = GLib.IOChannel(filedes=r)
+        ch.set_encoding(None)
+        ch.set_flags(ch.get_flags() | GLib.IOFlags.NONBLOCK)
+
+        cb_reads = []
+
+        def cb(channel, condition, data1, data2, data3):
+            self.assertEqual(channel, ch)
+            self.assertEqual(condition, GLib.IOCondition.IN)
+            self.assertEqual(data1, 'a')
+            self.assertEqual(data2, 'b')
+            self.assertEqual(data3, 'c')
+            cb_reads.append(channel.read())
+            return True
+
+        id = GLib.io_add_watch(ch, GLib.PRIORITY_HIGH, GLib.IOCondition.IN, cb,
+                               'a', 'b', 'c')
+
+        ml = GLib.MainLoop()
+        self.assertEqual(ml.get_context().find_source_by_id(id).priority,
+                         GLib.PRIORITY_HIGH)
+        GLib.timeout_add(10, lambda: os.write(w, b'a') and False)
+        GLib.timeout_add(100, lambda: os.write(w, b'b') and False)
+        GLib.timeout_add(200, ml.quit)
+        ml.run()
+
+        self.assertEqual(cb_reads, [b'a', b'b'])
+
+    def test_deprecated_add_watch_no_data(self):
+        (r, w) = os.pipe()
+
+        ch = GLib.IOChannel(filedes=r)
+        ch.set_encoding(None)
+        ch.set_flags(ch.get_flags() | GLib.IOFlags.NONBLOCK)
+
+        cb_reads = []
+
+        def cb(channel, condition):
+            self.assertEqual(channel, ch)
+            self.assertEqual(condition, GLib.IOCondition.IN)
+            cb_reads.append(channel.read())
+            return True
+
+        with warnings.catch_warnings(record=True) as warn:
+            warnings.simplefilter('always')
+            id = GLib.io_add_watch(ch, GLib.IOCondition.IN, cb, priority=GLib.PRIORITY_HIGH)
+            self.assertTrue(issubclass(warn[0].category, PyGIDeprecationWarning))
+
+        ml = GLib.MainLoop()
+        self.assertEqual(ml.get_context().find_source_by_id(id).priority,
+                         GLib.PRIORITY_HIGH)
+        GLib.timeout_add(10, lambda: os.write(w, b'a') and False)
+        GLib.timeout_add(100, lambda: os.write(w, b'b') and False)
+        GLib.timeout_add(200, ml.quit)
+        ml.run()
+
+        self.assertEqual(cb_reads, [b'a', b'b'])
+
+    def test_deprecated_add_watch_with_data(self):
+        (r, w) = os.pipe()
+
+        ch = GLib.IOChannel(filedes=r)
+        ch.set_encoding(None)
+        ch.set_flags(ch.get_flags() | GLib.IOFlags.NONBLOCK)
+
+        cb_reads = []
+
+        def cb(channel, condition, data):
+            self.assertEqual(channel, ch)
+            self.assertEqual(condition, GLib.IOCondition.IN)
+            self.assertEqual(data, 'hello')
+            cb_reads.append(channel.read())
+            return True
+
+        with warnings.catch_warnings(record=True) as warn:
+            warnings.simplefilter('always')
+            id = GLib.io_add_watch(ch, GLib.IOCondition.IN, cb, 'hello',
+                                   priority=GLib.PRIORITY_HIGH)
+            self.assertTrue(issubclass(warn[0].category, PyGIDeprecationWarning))
+
+        ml = GLib.MainLoop()
+        self.assertEqual(ml.get_context().find_source_by_id(id).priority,
+                         GLib.PRIORITY_HIGH)
+        GLib.timeout_add(10, lambda: os.write(w, b'a') and False)
+        GLib.timeout_add(100, lambda: os.write(w, b'b') and False)
+        GLib.timeout_add(200, ml.quit)
+        ml.run()
+
+        self.assertEqual(cb_reads, [b'a', b'b'])
+
+    def test_backwards_compat_flags(self):
+        self.assertEqual(GLib.IOCondition.IN, GLib.IO_IN)
+        self.assertEqual(GLib.IOFlags.NONBLOCK, GLib.IO_FLAG_NONBLOCK)
+        self.assertEqual(GLib.IOFlags.IS_SEEKABLE, GLib.IO_FLAG_IS_SEEKABLE)
+        self.assertEqual(GLib.IOStatus.NORMAL, GLib.IO_STATUS_NORMAL)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/test_mainloop.py b/tests/test_mainloop.py
index 408a123..44197b3 100644
--- a/tests/test_mainloop.py
+++ b/tests/test_mainloop.py
@@ -34,7 +34,7 @@ class TestMainLoop(unittest.TestCase):
             raise Exception("deadbabe")
 
         loop = GLib.MainLoop()
-        GLib.child_watch_add(pid, child_died, loop)
+        GLib.child_watch_add(GLib.PRIORITY_DEFAULT, pid, child_died, loop)
 
         os.close(pipe_r)
         os.write(pipe_w, _bytes("Y"))
@@ -79,3 +79,19 @@ class TestMainLoop(unittest.TestCase):
             loop2.quit()
         finally:
             signal.signal(signal.SIGUSR1, orig_handler)
+
+    def test_sigint(self):
+        pid = os.fork()
+        if pid == 0:
+            time.sleep(0.5)
+            os.kill(os.getppid(), signal.SIGINT)
+            os._exit(0)
+
+        loop = GLib.MainLoop()
+        try:
+            loop.run()
+            self.fail('expected KeyboardInterrupt exception')
+        except KeyboardInterrupt:
+            pass
+        self.assertFalse(loop.is_running())
+        os.waitpid(pid, 0)
diff --git a/tests/test_option.py b/tests/test_option.py
index 345d0ad..2900edd 100644
--- a/tests/test_option.py
+++ b/tests/test_option.py
@@ -10,17 +10,15 @@ try:
 except ImportError:
     from io import StringIO
 
-# FIXME: we need a way to import the options module from a public module
-from gi._glib.option import OptionParser, OptionGroup, OptionValueError, \
-    make_option, BadOptionError
+from gi.repository import GLib
 
 
 class TestOption(unittest.TestCase):
     EXCEPTION_MESSAGE = "This callback fails"
 
     def setUp(self):
-        self.parser = OptionParser("NAMES...",
-                                   description="Option unit test")
+        self.parser = GLib.option.OptionParser("NAMES...",
+                                               description="Option unit test")
         self.parser.add_option("-t", "--test", help="Unit test option",
                                action="store_false", dest="test", default=True)
         self.parser.add_option("--g-fatal-warnings",
@@ -32,22 +30,22 @@ class TestOption(unittest.TestCase):
         def option_callback(option, opt, value, parser):
             raise Exception(self.EXCEPTION_MESSAGE)
 
-        group = OptionGroup(
+        group = GLib.option.OptionGroup(
             "unittest", "Unit test options", "Show all unittest options",
             option_list=[
-                make_option("-f", "-u", "--file", "--unit-file",
-                            type="filename",
-                            dest="unit_file",
-                            help="Unit test option"),
-                make_option("--test-integer",
-                            type="int",
-                            dest="test_integer",
-                            help="Unit integer option"),
-                make_option("--callback-failure-test",
-                            action="callback",
-                            callback=option_callback,
-                            dest="test_integer",
-                            help="Unit integer option"),
+                GLib.option.make_option("-f", "-u", "--file", "--unit-file",
+                                        type="filename",
+                                        dest="unit_file",
+                                        help="Unit test option"),
+                GLib.option.make_option("--test-integer",
+                                        type="int",
+                                        dest="test_integer",
+                                        help="Unit integer option"),
+                GLib.option.make_option("--callback-failure-test",
+                                        action="callback",
+                                        callback=option_callback,
+                                        dest="test_integer",
+                                        help="Unit integer option"),
             ])
         group.add_option("-t", "--test",
                          action="store_false",
@@ -57,7 +55,7 @@ class TestOption(unittest.TestCase):
         self.parser.add_option_group(group)
         return group
 
-    def testParseArgs(self):
+    def test_parse_args(self):
         options, args = self.parser.parse_args(
             ["test_option.py"])
         self.assertFalse(args)
@@ -70,12 +68,12 @@ class TestOption(unittest.TestCase):
             ["test_option.py", "foo", "bar"])
         self.assertEqual(args, [])
 
-    def testParseArgsDoubleDash(self):
+    def test_parse_args_double_dash(self):
         options, args = self.parser.parse_args(
             ["test_option.py", "--", "-xxx"])
         #self.assertEqual(args, ["-xxx"])
 
-    def testParseArgsGroup(self):
+    def test_parse_args_group(self):
         group = self._create_group()
 
         options, args = self.parser.parse_args(
@@ -89,20 +87,20 @@ class TestOption(unittest.TestCase):
         self.assertEqual(group.values.unit_file, "test")
         self.assertFalse(args)
 
-    def testOptionValueError(self):
+    def test_option_value_error(self):
         self._create_group()
-        self.assertRaises(OptionValueError, self.parser.parse_args,
+        self.assertRaises(GLib.option.OptionValueError, self.parser.parse_args,
                           ["test_option.py", "--test-integer=text"])
 
-    def testBadOptionError(self):
-        self.assertRaises(BadOptionError,
+    def test_bad_option_error(self):
+        self.assertRaises(GLib.option.BadOptionError,
                           self.parser.parse_args,
                           ["test_option.py", "--unknwon-option"])
 
-    def testOptionGroupConstructor(self):
-        self.assertRaises(TypeError, OptionGroup)
+    def test_option_group_constructor(self):
+        self.assertRaises(TypeError, GLib.option.OptionGroup)
 
-    def testStandardError(self):
+    def test_standard_error(self):
         self._create_group()
         sio = StringIO()
         old_stderr = sys.stderr
diff --git a/tests/test_overrides.py b/tests/test_overrides.py
index dd2aa6a..e1af1f1 100644
--- a/tests/test_overrides.py
+++ b/tests/test_overrides.py
@@ -4,6 +4,8 @@
 import unittest
 
 import gi.overrides
+import gi.module
+
 try:
     from gi.repository import Regress
     Regress  # pyflakes
@@ -27,3 +29,30 @@ class TestRegistry(unittest.TestCase):
         # Regress override is in tests/gi/overrides, separate from gi/overrides
         # https://bugzilla.gnome.org/show_bug.cgi?id=680913
         self.assertEqual(Regress.REGRESS_OVERRIDE, 42)
+
+
+class TestModule(unittest.TestCase):
+    # Tests for gi.module
+
+    def test_get_introspection_module_caching(self):
+        # This test attempts to minimize side effects by
+        # using a DynamicModule directly instead of going though:
+        # from gi.repository import Foo
+
+        # Clear out introspection module cache before running this test.
+        old_modules = gi.module._introspection_modules
+        gi.module._introspection_modules = {}
+
+        mod_name = 'GIMarshallingTests'
+        mod1 = gi.module.get_introspection_module(mod_name)
+        mod2 = gi.module.get_introspection_module(mod_name)
+        self.assertTrue(mod1 is mod2)
+
+        # Using a DynamicModule will use get_introspection_module internally
+        # in its _load method.
+        mod_overridden = gi.module.DynamicModule(mod_name)
+        mod_overridden._load()
+        self.assertTrue(mod1 is mod_overridden._introspection_module)
+
+        # Restore the previous cache
+        gi.module._introspection_modules = old_modules
diff --git a/tests/test_overrides_gtk.py b/tests/test_overrides_gtk.py
index ee41457..6148479 100644
--- a/tests/test_overrides_gtk.py
+++ b/tests/test_overrides_gtk.py
@@ -2,8 +2,6 @@
 # vim: tabstop=4 shiftwidth=4 expandtab
 
 import unittest
-import ctypes
-import sys
 
 from compathelper import _unicode, _bytes
 
@@ -18,19 +16,6 @@ except ImportError:
     Gtk = None
 
 
-class RawTreeIter(ctypes.Structure):
-    """Class used for testing Gtk.TreeIter raw data."""
-    _fields_ = [('stamp', ctypes.c_int),
-                ('user_data', ctypes.c_void_p),
-                ('user_data2', ctypes.c_void_p),
-                ('user_data3', ctypes.c_void_p)]
-
-    @classmethod
-    def from_iter(cls, iter):
-        offset = sys.getsizeof(object())  # size of PyObject_HEAD
-        return ctypes.POINTER(cls).from_address(id(iter) + offset)
-
-
 @unittest.skipUnless(Gtk, 'Gtk not available')
 class TestGtk(unittest.TestCase):
     def test_container(self):
@@ -1324,13 +1309,14 @@ class TestTreeView(unittest.TestCase):
         # will raise a Gtk-CRITICAL which we ignore for now
         old_mask = GLib.log_set_always_fatal(
             GLib.LogLevelFlags.LEVEL_WARNING | GLib.LogLevelFlags.LEVEL_ERROR)
-        view.set_cursor(store[1].path)
-        view.set_cursor(str(store[1].path))
+        try:
+            view.set_cursor(store[1].path)
+            view.set_cursor(str(store[1].path))
 
-        view.get_cell_area(store[1].path)
-        view.get_cell_area(str(store[1].path))
-
-        GLib.log_set_always_fatal(old_mask)
+            view.get_cell_area(store[1].path)
+            view.get_cell_area(str(store[1].path))
+        finally:
+            GLib.log_set_always_fatal(old_mask)
 
     def test_tree_view_column(self):
         cell = Gtk.CellRendererText()
@@ -1361,10 +1347,12 @@ class TestTreeView(unittest.TestCase):
         # might cause a Pango warning, do not break on this
         old_mask = GLib.log_set_always_fatal(
             GLib.LogLevelFlags.LEVEL_CRITICAL | GLib.LogLevelFlags.LEVEL_ERROR)
-        # causes the widget to get realized and cellN.props.text receive a
-        # value, otherwise it will be None.
-        tree.get_preferred_size()
-        GLib.log_set_always_fatal(old_mask)
+        try:
+            # causes the widget to get realized and cellN.props.text receive a
+            # value, otherwise it will be None.
+            tree.get_preferred_size()
+        finally:
+            GLib.log_set_always_fatal(old_mask)
 
         self.assertEqual(tree.get_column(0).get_title(), 'Head1')
         self.assertEqual(tree.get_column(1).get_title(), 'Head2')
@@ -1396,10 +1384,12 @@ class TestTreeView(unittest.TestCase):
         # might cause a Pango warning, do not break on this
         old_mask = GLib.log_set_always_fatal(
             GLib.LogLevelFlags.LEVEL_CRITICAL | GLib.LogLevelFlags.LEVEL_ERROR)
-        # This will make cell.props.text receive a value, otherwise it
-        # will be None.
-        treeview.get_preferred_size()
-        GLib.log_set_always_fatal(old_mask)
+        try:
+            # This will make cell.props.text receive a value, otherwise it
+            # will be None.
+            treeview.get_preferred_size()
+        finally:
+            GLib.log_set_always_fatal(old_mask)
 
         self.assertTrue(cell.props.text in directors)
 
@@ -1432,32 +1422,6 @@ class TestTreeView(unittest.TestCase):
         self.assertEqual(m, store)
         self.assertEqual(store.get_path(s), firstpath)
 
-    def test_tree_iter_user_data_int(self):
-        pyiter = Gtk.TreeIter()
-        rawiter = RawTreeIter.from_iter(pyiter)
-
-        initial_ref_count = sys.getrefcount(1)
-        pyiter.user_data = 1
-
-        # verify setting int value increases refcount of the "1" object
-        self.assertEqual(sys.getrefcount(1), initial_ref_count + 1)
-        # verify the address of the '1' object is what user_data is actually set to.
-        self.assertEqual(id(1), rawiter.contents.user_data)
-
-    def test_tree_iter_user_data_null(self):
-        pyiter = Gtk.TreeIter()
-        rawiter = RawTreeIter.from_iter(pyiter)
-
-        self.assertEqual(pyiter.user_data, None)
-        self.assertEqual(rawiter.contents.user_data, None)
-
-        # Setting user_data to None should not increase None's ref count.
-        # and the raw iters user_data should also come back as None/NULL.
-        initial_ref_count = sys.getrefcount(None)
-        pyiter.user_data = None
-        self.assertEqual(sys.getrefcount(None), initial_ref_count)
-        self.assertEqual(rawiter.contents.user_data, None)
-
 
 @unittest.skipUnless(Gtk, 'Gtk not available')
 class TestTextBuffer(unittest.TestCase):
diff --git a/tests/test_properties.py b/tests/test_properties.py
index 490b1ae..ccb80a6 100644
--- a/tests/test_properties.py
+++ b/tests/test_properties.py
@@ -13,13 +13,14 @@ from gi.repository.GObject import \
     TYPE_UINT64, TYPE_GTYPE, TYPE_INVALID, TYPE_NONE, TYPE_STRV, \
     TYPE_INTERFACE, TYPE_CHAR, TYPE_UCHAR, TYPE_BOOLEAN, TYPE_FLOAT, \
     TYPE_DOUBLE, TYPE_POINTER, TYPE_BOXED, TYPE_PARAM, TYPE_OBJECT, \
-    TYPE_STRING, TYPE_PYOBJECT
+    TYPE_STRING, TYPE_PYOBJECT, TYPE_VARIANT
 
 from gi.repository.GObject import \
     G_MININT, G_MAXINT, G_MAXUINT, G_MINLONG, G_MAXLONG, G_MAXULONG
 
 from gi.repository import Gio
 from gi.repository import GLib
+from gi.repository import Regress
 from gi.repository import GIMarshallingTests
 from gi._gobject import propertyhelper
 
@@ -60,6 +61,42 @@ class PropertyObject(GObject.GObject):
     strings = GObject.Property(
         type=TYPE_STRV, flags=PARAM_READWRITE | PARAM_CONSTRUCT)
 
+    variant = GObject.Property(
+        type=TYPE_VARIANT, flags=PARAM_READWRITE | PARAM_CONSTRUCT)
+
+    variant_def = GObject.Property(
+        type=TYPE_VARIANT, flags=PARAM_READWRITE | PARAM_CONSTRUCT,
+        default=GLib.Variant('i', 42))
+
+
+class PropertyInheritanceObject(Regress.TestObj):
+    # override property from the base class, with a different type
+    string = GObject.Property(type=int)
+
+    # a property entirely defined at the Python level
+    python_prop = GObject.Property(type=str)
+
+
+class PropertySubClassObject(PropertyInheritanceObject):
+    # override property from the base class, with a different type
+    python_prop = GObject.Property(type=int)
+
+
+class TestPropertyInheritanceObject(unittest.TestCase):
+    def test_override_gi_property(self):
+        self.assertNotEqual(Regress.TestObj.props.string.value_type,
+                            PropertyInheritanceObject.props.string.value_type)
+        obj = PropertyInheritanceObject()
+        self.assertEqual(type(obj.props.string), int)
+        obj.props.string = 4
+        self.assertEqual(obj.props.string, 4)
+
+    def test_override_python_property(self):
+        obj = PropertySubClassObject()
+        self.assertEqual(type(obj.props.python_prop), int)
+        obj.props.python_prop = 5
+        self.assertEqual(obj.props.python_prop, 5)
+
 
 class TestPropertyObject(unittest.TestCase):
     def test_get_set(self):
@@ -82,19 +119,24 @@ class TestPropertyObject(unittest.TestCase):
 
     def test_iteration(self):
         for obj in (PropertyObject.props, PropertyObject().props):
+            names = []
             for pspec in obj:
                 gtype = GType(pspec)
                 self.assertEqual(gtype.parent.name, 'GParam')
-                self.assertTrue(pspec.name in ['normal',
-                                               'construct',
-                                               'construct-only',
-                                               'uint64',
-                                               'enum',
-                                               'flags',
-                                               'gtype',
-                                               'strings',
-                                               'boxed'])
-            self.assertEqual(len(obj), 9)
+                names.append(pspec.name)
+
+            names.sort()
+            self.assertEqual(names, ['boxed',
+                                     'construct',
+                                     'construct-only',
+                                     'enum',
+                                     'flags',
+                                     'gtype',
+                                     'normal',
+                                     'strings',
+                                     'uint64',
+                                     'variant',
+                                     'variant-def'])
 
     def test_normal(self):
         obj = new(PropertyObject, normal="123")
@@ -300,6 +342,52 @@ class TestPropertyObject(unittest.TestCase):
         self.assertRaises(TypeError, GObject.Property, type=TYPE_STRV,
                           default=['hello', 1])
 
+    def test_variant(self):
+        obj = new(PropertyObject)
+
+        self.assertEqual(obj.props.variant, None)
+        self.assertEqual(obj.variant, None)
+
+        obj.variant = GLib.Variant('s', 'hello')
+        self.assertEqual(obj.variant.print_(True), "'hello'")
+
+        obj.variant = GLib.Variant('b', True)
+        self.assertEqual(obj.variant.print_(True), "true")
+
+        obj.props.variant = GLib.Variant('y', 2)
+        self.assertEqual(obj.variant.print_(True), "byte 0x02")
+
+        obj.variant = None
+        self.assertEqual(obj.variant, None)
+
+        # set in constructor
+        obj = new(PropertyObject, variant=GLib.Variant('u', 5))
+        self.assertEqual(obj.props.variant.print_(True), 'uint32 5')
+
+        GObject.Property(type=TYPE_VARIANT, default=GLib.Variant('i', 1))
+
+        # incompatible types
+        self.assertRaises(TypeError, setattr, obj, 'variant', 'foo')
+        self.assertRaises(TypeError, setattr, obj, 'variant', 42)
+
+        self.assertRaises(TypeError, GObject.Property, type=TYPE_VARIANT,
+                          default='foo')
+        self.assertRaises(TypeError, GObject.Property, type=TYPE_VARIANT,
+                          default=object())
+
+    def test_variant_default(self):
+        obj = new(PropertyObject)
+
+        self.assertEqual(obj.props.variant_def.print_(True), '42')
+        self.assertEqual(obj.variant_def.print_(True), '42')
+
+        obj.props.variant_def = GLib.Variant('y', 2)
+        self.assertEqual(obj.variant_def.print_(True), "byte 0x02")
+
+        # set in constructor
+        obj = new(PropertyObject, variant_def=GLib.Variant('u', 5))
+        self.assertEqual(obj.props.variant_def.print_(True), 'uint32 5')
+
     def test_range(self):
         # kiwi code
         def max(c):
@@ -689,14 +777,20 @@ class TestProperty(unittest.TestCase):
         del t
         self.assertEqual(sys.getrefcount(o), rc)
 
-    def test_doc_string_as_blurb(self):
+    def test_doc_strings(self):
         class C(GObject.GObject):
+            foo_blurbed = GObject.Property(type=int, blurb='foo_blurbed doc string')
+
             @GObject.Property
-            def blurbed(self):
-                """blurbed doc string"""
+            def foo_getter(self):
+                """foo_getter doc string"""
                 return 0
 
-        self.assertEqual(C.blurbed.blurb, 'blurbed doc string')
+        self.assertEqual(C.foo_blurbed.blurb, 'foo_blurbed doc string')
+        self.assertEqual(C.foo_blurbed.__doc__, 'foo_blurbed doc string')
+
+        self.assertEqual(C.foo_getter.blurb, 'foo_getter doc string')
+        self.assertEqual(C.foo_getter.__doc__, 'foo_getter doc string')
 
     def test_python_to_glib_type_mapping(self):
         tester = GObject.Property()
diff --git a/tests/test_signal.py b/tests/test_signal.py
index 8b9d8ce..fc8c835 100644
--- a/tests/test_signal.py
+++ b/tests/test_signal.py
@@ -4,7 +4,7 @@ import gc
 import unittest
 import sys
 
-from gi.repository import GObject
+from gi.repository import GObject, GLib
 from gi._gobject import signalhelper
 import testhelper
 from compathelper import _long
@@ -49,11 +49,11 @@ class TestChaining(unittest.TestCase):
 
         assert args[2:] == (1, 2, 3)
 
-    def testChaining(self):
+    def test_chaining(self):
         self.inst.emit("my_signal", 42)
         assert self.inst.arg == 42
 
-    def testChaining2(self):
+    def test_chaining2(self):
         inst2 = D()
         inst2.emit("my_signal", 44)
         assert inst2.arg == 44
@@ -63,18 +63,24 @@ class TestChaining(unittest.TestCase):
 
 
 class TestGSignalsError(unittest.TestCase):
-    def testInvalidType(self, *args):
+    def test_invalid_type(self, *args):
         def foo():
             class Foo(GObject.GObject):
                 __gsignals__ = None
         self.assertRaises(TypeError, foo)
         gc.collect()
 
-    def testInvalidName(self, *args):
+    def test_invalid_name(self, *args):
         def foo():
             class Foo(GObject.GObject):
                 __gsignals__ = {'not-exists': 'override'}
-        self.assertRaises(TypeError, foo)
+        # do not stumble over the warning thrown by GLib
+        old_mask = GLib.log_set_always_fatal(GLib.LogLevelFlags.LEVEL_CRITICAL |
+                                             GLib.LogLevelFlags.LEVEL_ERROR)
+        try:
+            self.assertRaises(TypeError, foo)
+        finally:
+            GLib.log_set_always_fatal(old_mask)
         gc.collect()
 
 
@@ -294,7 +300,7 @@ class TestClosures(unittest.TestCase):
         self.assertEqual(inst.a, 1)
         gc.collect()
 
-    def testGString(self):
+    def test_gstring(self):
         class C(GObject.GObject):
             __gsignals__ = {'my_signal': (GObject.SignalFlags.RUN_LAST, GObject.TYPE_GSTRING,
                                           (GObject.TYPE_GSTRING,))}
@@ -592,7 +598,8 @@ class TestSignalDecorator(unittest.TestCase):
 
 class TestSignalConnectors(unittest.TestCase):
     class CustomButton(GObject.GObject):
-        value = 0
+        on_notify_called = False
+        value = GObject.Property(type=int)
 
         @GObject.Signal(arg_types=(int,))
         def clicked(self, value):
@@ -606,6 +613,16 @@ class TestSignalConnectors(unittest.TestCase):
         self.obj = obj
         self.value = value
 
+    def test_signal_notify(self):
+        def on_notify(obj, param):
+            obj.on_notify_called = True
+
+        obj = self.CustomButton()
+        obj.connect('notify', on_notify)
+        self.assertFalse(obj.on_notify_called)
+        obj.notify('value')
+        self.assertTrue(obj.on_notify_called)
+
     def test_signal_emit(self):
         # standard callback connection with different forms of emit.
         obj = self.CustomButton()
@@ -734,5 +751,59 @@ class TestPython3Signals(unittest.TestCase):
                              str)
 
 
+class TestSignalModuleLevelFunctions(unittest.TestCase):
+    @unittest.skipIf(sys.version_info < (2, 7), 'Requires Python >= 2.7')
+    def test_signal_list_ids_with_invalid_type(self):
+        with self.assertRaisesRegex(TypeError, 'type must be instantiable or an interface.*'):
+            GObject.signal_list_ids(GObject.TYPE_INVALID)
+
+    @unittest.skipIf(sys.version_info < (2, 7), 'Requires Python >= 2.7')
+    def test_signal_list_ids(self):
+        with self.assertRaisesRegex(TypeError, 'type must be instantiable or an interface.*'):
+            GObject.signal_list_ids(GObject.TYPE_INT)
+
+        ids = GObject.signal_list_ids(C)
+        self.assertEqual(len(ids), 1)
+        # Note canonicalized names
+        self.assertEqual(GObject.signal_name(ids[0]), 'my-signal')
+        # There is no signal 0 in gobject
+        self.assertEqual(GObject.signal_name(0), None)
+
+    @unittest.skipIf(sys.version_info < (2, 7), 'Requires Python >= 2.7')
+    def test_signal_lookup_with_invalid_type(self):
+        with self.assertRaisesRegex(TypeError, 'type must be instantiable or an interface.*'):
+            GObject.signal_lookup('NOT_A_SIGNAL_NAME', GObject.TYPE_INVALID)
+
+    @unittest.skipIf(sys.version_info < (2, 7), 'Requires Python >= 2.7')
+    def test_signal_lookup(self):
+        ids = GObject.signal_list_ids(C)
+        self.assertEqual(ids[0], GObject.signal_lookup('my_signal', C))
+        self.assertEqual(ids[0], GObject.signal_lookup('my-signal', C))
+
+        with self.assertRaisesRegex(TypeError, 'type must be instantiable or an interface.*'):
+            GObject.signal_lookup('NOT_A_SIGNAL_NAME', GObject.TYPE_INT)
+
+        # Invalid signal names return 0 instead of raising
+        self.assertEqual(GObject.signal_lookup('NOT_A_SIGNAL_NAME', C),
+                         0)
+
+    def test_signal_query(self):
+        my_signal_id, = GObject.signal_list_ids(C)
+
+        # Form is: (id, name, gtype, arg_count, return_type, (arg_type1, ...))
+        my_signal_expected_query_result = [my_signal_id, 'my-signal', C.__gtype__,
+                                           1, GObject.TYPE_NONE, (GObject.TYPE_INT,)]
+        # signal_query(name, type)
+        self.assertSequenceEqual(GObject.signal_query('my-signal', C),
+                                 my_signal_expected_query_result)
+        # signal_query(signal_id)
+        self.assertSequenceEqual(GObject.signal_query(my_signal_id),
+                                 my_signal_expected_query_result)
+        # invalid query returns None instead of raising
+        self.assertEqual(GObject.signal_query(0), None)
+        self.assertEqual(GObject.signal_query('NOT_A_SIGNAL', C),
+                         None)
+
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/test_source.py b/tests/test_source.py
index fe674cd..dda492a 100644
--- a/tests/test_source.py
+++ b/tests/test_source.py
@@ -1,8 +1,10 @@
 # -*- Mode: Python -*-
 
 import unittest
+import warnings
 
-from gi.repository import GLib
+from gi.repository import GLib, GObject
+from gi import PyGIDeprecationWarning
 
 
 class Idle(GLib.Idle):
@@ -43,25 +45,35 @@ class TestSource(unittest.TestCase):
         timeout.set_callback(self.timeout_callback, loop)
         timeout.attach()
 
-    def testSources(self):
+    def test_sources(self):
         loop = GLib.MainLoop()
 
         self.setup_timeout(loop)
 
         idle = Idle(loop)
+        self.assertEqual(idle.get_context(), None)
         idle.attach()
+        self.assertEqual(idle.get_context(), GLib.main_context_default())
 
         self.pos = 0
 
         m = MySource()
+        self.assertEqual(m.get_context(), None)
         m.set_callback(self.my_callback, loop)
         m.attach()
+        self.assertEqual(m.get_context(), GLib.main_context_default())
 
         loop.run()
 
-        assert self.pos >= 0 and idle.count >= 0
+        m.destroy()
+        idle.destroy()
 
-    def testSourcePrepare(self):
+        self.assertGreater(self.pos, 0)
+        self.assertGreaterEqual(idle.count, 0)
+        self.assertTrue(m.is_destroyed())
+        self.assertTrue(idle.is_destroyed())
+
+    def test_source_prepare(self):
         # this test may not terminate if prepare() is wrapped incorrectly
         dispatched = [False]
         loop = GLib.MainLoop()
@@ -89,7 +101,7 @@ class TestSource(unittest.TestCase):
 
         assert dispatched[0]
 
-    def testIsDestroyedSimple(self):
+    def test_is_destroyed_simple(self):
         s = GLib.Source()
 
         self.assertFalse(s.is_destroyed())
@@ -103,7 +115,7 @@ class TestSource(unittest.TestCase):
         s.destroy()
         self.assertTrue(s.is_destroyed())
 
-    def testIsDestroyedContext(self):
+    def test_is_destroyed_context(self):
         def f():
             c = GLib.MainContext()
             s = GLib.Source()
@@ -113,12 +125,207 @@ class TestSource(unittest.TestCase):
         s = f()
         self.assertTrue(s.is_destroyed())
 
+    def test_remove(self):
+        s = GLib.idle_add(dir)
+        self.assertEqual(GLib.source_remove(s), True)
+        # s is now removed, should fail now
+        self.assertEqual(GLib.source_remove(s), False)
+
+        # accepts large source IDs (they are unsigned)
+        self.assertEqual(GLib.source_remove(GObject.G_MAXINT32), False)
+        self.assertEqual(GLib.source_remove(GObject.G_MAXINT32 + 1), False)
+        self.assertEqual(GLib.source_remove(GObject.G_MAXUINT32), False)
+
+    def test_recurse_property(self):
+        s = GLib.Idle()
+        self.assertTrue(s.can_recurse in [False, True])
+        s.can_recurse = False
+        self.assertFalse(s.can_recurse)
+
+    def test_priority(self):
+        s = GLib.Idle()
+        self.assertEqual(s.priority, GLib.PRIORITY_DEFAULT_IDLE)
+        s.priority = GLib.PRIORITY_HIGH
+        self.assertEqual(s.priority, GLib.PRIORITY_HIGH)
+
+        s = GLib.Idle(GLib.PRIORITY_LOW)
+        self.assertEqual(s.priority, GLib.PRIORITY_LOW)
 
-class TestTimeout(unittest.TestCase):
-    def test504337(self):
+        s = GLib.Timeout(1, GLib.PRIORITY_LOW)
+        self.assertEqual(s.priority, GLib.PRIORITY_LOW)
+
+        s = GLib.Source()
+        self.assertEqual(s.priority, GLib.PRIORITY_DEFAULT)
+
+    def test_get_current_time(self):
+        # Note, deprecated API
+        s = GLib.Idle()
+        with warnings.catch_warnings(record=True) as w:
+            warnings.simplefilter('always')
+            time = s.get_current_time()
+            self.assertTrue(issubclass(w[0].category, PyGIDeprecationWarning))
+
+        self.assertTrue(isinstance(time, float))
+        # plausibility check, and check magnitude of result
+        self.assertGreater(time, 1300000000.0)
+        self.assertLess(time, 2000000000.0)
+
+    def test_add_remove_poll(self):
+        # FIXME: very shallow test, only verifies the API signature
+        pollfd = GLib.PollFD(99, GLib.IOCondition.IN | GLib.IOCondition.HUP)
+        self.assertEqual(pollfd.fd, 99)
+        source = GLib.Source()
+        source.add_poll(pollfd)
+        source.remove_poll(pollfd)
+
+    def test_out_of_scope_before_dispatch(self):
+        # https://bugzilla.gnome.org/show_bug.cgi?id=504337
         GLib.Timeout(20)
         GLib.Idle()
 
 
+class TestUserData(unittest.TestCase):
+    def test_idle_no_data(self):
+        ml = GLib.MainLoop()
+
+        def cb():
+            ml.quit()
+        id = GLib.idle_add(cb)
+        self.assertEqual(ml.get_context().find_source_by_id(id).priority,
+                         GLib.PRIORITY_DEFAULT_IDLE)
+        ml.run()
+
+    def test_timeout_no_data(self):
+        ml = GLib.MainLoop()
+
+        def cb():
+            ml.quit()
+        id = GLib.timeout_add(50, cb)
+        self.assertEqual(ml.get_context().find_source_by_id(id).priority,
+                         GLib.PRIORITY_DEFAULT)
+        ml.run()
+
+    def test_idle_data(self):
+        ml = GLib.MainLoop()
+
+        def cb(data):
+            data['called'] = True
+            ml.quit()
+        data = {}
+        id = GLib.idle_add(cb, data)
+        self.assertEqual(ml.get_context().find_source_by_id(id).priority,
+                         GLib.PRIORITY_DEFAULT_IDLE)
+        ml.run()
+        self.assertTrue(data['called'])
+
+    def test_idle_multidata(self):
+        ml = GLib.MainLoop()
+
+        def cb(data, data2):
+            data['called'] = True
+            data['data2'] = data2
+            ml.quit()
+        data = {}
+        id = GLib.idle_add(cb, data, 'hello')
+        self.assertEqual(ml.get_context().find_source_by_id(id).priority,
+                         GLib.PRIORITY_DEFAULT_IDLE)
+        ml.run()
+        self.assertTrue(data['called'])
+        self.assertEqual(data['data2'], 'hello')
+
+    def test_timeout_data(self):
+        ml = GLib.MainLoop()
+
+        def cb(data):
+            data['called'] = True
+            ml.quit()
+        data = {}
+        id = GLib.timeout_add(50, cb, data)
+        self.assertEqual(ml.get_context().find_source_by_id(id).priority,
+                         GLib.PRIORITY_DEFAULT)
+        ml.run()
+        self.assertTrue(data['called'])
+
+    def test_timeout_multidata(self):
+        ml = GLib.MainLoop()
+
+        def cb(data, data2):
+            data['called'] = True
+            data['data2'] = data2
+            ml.quit()
+        data = {}
+        id = GLib.timeout_add(50, cb, data, 'hello')
+        self.assertEqual(ml.get_context().find_source_by_id(id).priority,
+                         GLib.PRIORITY_DEFAULT)
+        ml.run()
+        self.assertTrue(data['called'])
+        self.assertEqual(data['data2'], 'hello')
+
+    def test_idle_no_data_priority(self):
+        ml = GLib.MainLoop()
+
+        def cb():
+            ml.quit()
+        id = GLib.idle_add(cb, priority=GLib.PRIORITY_HIGH)
+        self.assertEqual(ml.get_context().find_source_by_id(id).priority,
+                         GLib.PRIORITY_HIGH)
+        ml.run()
+
+    def test_timeout_no_data_priority(self):
+        ml = GLib.MainLoop()
+
+        def cb():
+            ml.quit()
+        id = GLib.timeout_add(50, cb, priority=GLib.PRIORITY_HIGH)
+        self.assertEqual(ml.get_context().find_source_by_id(id).priority,
+                         GLib.PRIORITY_HIGH)
+        ml.run()
+
+    def test_idle_data_priority(self):
+        ml = GLib.MainLoop()
+
+        def cb(data):
+            data['called'] = True
+            ml.quit()
+        data = {}
+        id = GLib.idle_add(cb, data, priority=GLib.PRIORITY_HIGH)
+        self.assertEqual(ml.get_context().find_source_by_id(id).priority,
+                         GLib.PRIORITY_HIGH)
+        ml.run()
+        self.assertTrue(data['called'])
+
+    def test_timeout_data_priority(self):
+        ml = GLib.MainLoop()
+
+        def cb(data):
+            data['called'] = True
+            ml.quit()
+        data = {}
+        id = GLib.timeout_add(50, cb, data, priority=GLib.PRIORITY_HIGH)
+        self.assertEqual(ml.get_context().find_source_by_id(id).priority,
+                         GLib.PRIORITY_HIGH)
+        ml.run()
+        self.assertTrue(data['called'])
+
+    def cb_no_data(self):
+        self.loop.quit()
+
+    def test_idle_method_callback_no_data(self):
+        self.loop = GLib.MainLoop()
+        GLib.idle_add(self.cb_no_data)
+        self.loop.run()
+
+    def cb_with_data(self, data):
+        data['called'] = True
+        self.loop.quit()
+
+    def test_idle_method_callback_with_data(self):
+        self.loop = GLib.MainLoop()
+        data = {}
+        GLib.idle_add(self.cb_with_data, data)
+        self.loop.run()
+        self.assertTrue(data['called'])
+
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/test_subprocess.py b/tests/test_subprocess.py
index 69f5f4c..26308e8 100644
--- a/tests/test_subprocess.py
+++ b/tests/test_subprocess.py
@@ -1,24 +1,145 @@
 # -*- Mode: Python -*-
 
 import sys
+import os
 import unittest
+import warnings
 
 from gi.repository import GLib
+from gi import PyGIDeprecationWarning
 
 
 class TestProcess(unittest.TestCase):
 
-    def _child_watch_cb(self, pid, condition, data):
-        self.data = data
-        self.loop.quit()
+    def test_deprecated_child_watch_no_data(self):
+        def cb(pid, status):
+            self.status = status
+            self.loop.quit()
 
-    def testChildWatch(self):
+        self.status = None
+        self.loop = GLib.MainLoop()
+        argv = [sys.executable, '-c', 'import sys']
+        pid, stdin, stdout, stderr = GLib.spawn_async(
+            argv, flags=GLib.SpawnFlags.DO_NOT_REAP_CHILD)
+        pid.close()
+        with warnings.catch_warnings(record=True) as w:
+            warnings.simplefilter('always')
+            GLib.child_watch_add(pid, cb)
+            self.assertTrue(issubclass(w[0].category, PyGIDeprecationWarning))
+        self.loop.run()
+        self.assertEqual(self.status, 0)
+
+    def test_deprecated_child_watch_data_priority(self):
+        def cb(pid, status, data):
+            self.data = data
+            self.status = status
+            self.loop.quit()
+
+        self.status = None
+        self.data = None
+        self.loop = GLib.MainLoop()
+        argv = [sys.executable, '-c', 'import sys']
+        pid, stdin, stdout, stderr = GLib.spawn_async(
+            argv, flags=GLib.SpawnFlags.DO_NOT_REAP_CHILD)
+        pid.close()
+        with warnings.catch_warnings(record=True) as w:
+            warnings.simplefilter('always')
+            id = GLib.child_watch_add(pid, cb, 12345, GLib.PRIORITY_HIGH)
+            self.assertTrue(issubclass(w[0].category, PyGIDeprecationWarning))
+        self.assertEqual(self.loop.get_context().find_source_by_id(id).priority,
+                         GLib.PRIORITY_HIGH)
+        self.loop.run()
+        self.assertEqual(self.data, 12345)
+        self.assertEqual(self.status, 0)
+
+    def test_deprecated_child_watch_data_priority_kwargs(self):
+        def cb(pid, status, data):
+            self.data = data
+            self.status = status
+            self.loop.quit()
+
+        self.status = None
         self.data = None
         self.loop = GLib.MainLoop()
         argv = [sys.executable, '-c', 'import sys']
         pid, stdin, stdout, stderr = GLib.spawn_async(
-            argv, flags=GLib.SPAWN_DO_NOT_REAP_CHILD)
+            argv, flags=GLib.SpawnFlags.DO_NOT_REAP_CHILD)
         pid.close()
-        GLib.child_watch_add(pid, self._child_watch_cb, 12345)
+        with warnings.catch_warnings(record=True) as w:
+            warnings.simplefilter('always')
+            id = GLib.child_watch_add(pid, cb, priority=GLib.PRIORITY_HIGH, data=12345)
+            self.assertTrue(issubclass(w[0].category, PyGIDeprecationWarning))
+        self.assertEqual(self.loop.get_context().find_source_by_id(id).priority,
+                         GLib.PRIORITY_HIGH)
         self.loop.run()
         self.assertEqual(self.data, 12345)
+        self.assertEqual(self.status, 0)
+
+    def test_child_watch_no_data(self):
+        def cb(pid, status):
+            self.status = status
+            self.loop.quit()
+
+        self.status = None
+        self.loop = GLib.MainLoop()
+        argv = [sys.executable, '-c', 'import sys']
+        pid, stdin, stdout, stderr = GLib.spawn_async(
+            argv, flags=GLib.SpawnFlags.DO_NOT_REAP_CHILD)
+        pid.close()
+        id = GLib.child_watch_add(GLib.PRIORITY_HIGH, pid, cb)
+        self.assertEqual(self.loop.get_context().find_source_by_id(id).priority,
+                         GLib.PRIORITY_HIGH)
+        self.loop.run()
+        self.assertEqual(self.status, 0)
+
+    def test_child_watch_with_data(self):
+        def cb(pid, status, data):
+            self.status = status
+            self.data = data
+            self.loop.quit()
+
+        self.data = None
+        self.status = None
+        self.loop = GLib.MainLoop()
+        argv = [sys.executable, '-c', 'import sys']
+        pid, stdin, stdout, stderr = GLib.spawn_async(
+            argv, flags=GLib.SpawnFlags.DO_NOT_REAP_CHILD)
+        self.assertEqual(stdin, None)
+        self.assertEqual(stdout, None)
+        self.assertEqual(stderr, None)
+        pid.close()
+        id = GLib.child_watch_add(GLib.PRIORITY_HIGH, pid, cb, 12345)
+        self.assertEqual(self.loop.get_context().find_source_by_id(id).priority,
+                         GLib.PRIORITY_HIGH)
+        self.loop.run()
+        self.assertEqual(self.data, 12345)
+        self.assertEqual(self.status, 0)
+
+    def test_spawn_async_fds(self):
+        pid, stdin, stdout, stderr = GLib.spawn_async(
+            ['cat'], flags=GLib.SpawnFlags.SEARCH_PATH, standard_input=True,
+            standard_output=True, standard_error=True)
+        os.write(stdin, b'hello world!\n')
+        os.close(stdin)
+        out = os.read(stdout, 50)
+        os.close(stdout)
+        err = os.read(stderr, 50)
+        os.close(stderr)
+        pid.close()
+        self.assertEqual(out, b'hello world!\n')
+        self.assertEqual(err, b'')
+
+    def test_spawn_async_envp(self):
+        pid, stdin, stdout, stderr = GLib.spawn_async(
+            ['sh', '-c', 'echo $TEST_VAR'], ['TEST_VAR=moo!'],
+            flags=GLib.SpawnFlags.SEARCH_PATH, standard_output=True)
+        self.assertEqual(stdin, None)
+        self.assertEqual(stderr, None)
+        out = os.read(stdout, 50)
+        os.close(stdout)
+        pid.close()
+        self.assertEqual(out, b'moo!\n')
+
+    def test_backwards_compat_flags(self):
+        self.assertEqual(GLib.SpawnFlags.DO_NOT_REAP_CHILD,
+                         GLib.SPAWN_DO_NOT_REAP_CHILD)
diff --git a/tests/test_thread.py b/tests/test_thread.py
index b707bc4..3d0557e 100644
--- a/tests/test_thread.py
+++ b/tests/test_thread.py
@@ -20,7 +20,7 @@ class TestThread(unittest.TestCase):
         self.obj.connect('from-thread', self.from_thread_cb)
         self.obj.emit('emit-signal')
 
-    def testExtensionModule(self):
+    def test_extension_module(self):
         GLib.idle_add(self.idle_cb)
         GLib.timeout_add(50, self.timeout_cb)
         self.main.run()
diff --git a/tests/test_uris.py b/tests/test_uris.py
deleted file mode 100644
index 143cc7b..0000000
--- a/tests/test_uris.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import unittest
-
-from gi.repository import GLib
-
-
-class TestUris(unittest.TestCase):
-    def testExtractUris(self):
-        uri_list_text = """# urn:isbn:0-201-08372-8
-http://www.huh.org/books/foo.html
-http://www.huh.org/books/foo.pdf
-ftp://ftp.foo.org/books/foo.txt
-"""
-        uri_list = GLib.uri_list_extract_uris(uri_list_text)
-        assert uri_list[0] == "http://www.huh.org/books/foo.html"
-        assert uri_list[1] == "http://www.huh.org/books/foo.pdf"
-        assert uri_list[2] == "ftp://ftp.foo.org/books/foo.txt"
diff --git a/tests/testhelpermodule.c b/tests/testhelpermodule.c
index bc83e9d..16bb39e 100644
--- a/tests/testhelpermodule.c
+++ b/tests/testhelpermodule.c
@@ -602,12 +602,11 @@ PYGLIB_MODULE_START(testhelper, "testhelper")
 {
   PyObject *m, *d;
   
-  g_thread_init(NULL);
   pygobject_init(-1, -1, -1);
 
   d = PyModule_GetDict(module);
 
-  if ((m = PyImport_ImportModule("gi._gobject")) != NULL) {
+  if ((m = PyImport_ImportModule("gi._gobject._gobject")) != NULL) {
     PyObject *moddict = PyModule_GetDict(m);
     
     _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
author	DongHun Kwak <dh0128.kwak@samsung.com>	2017-07-12 08:48:07 +0900
committer	DongHun Kwak <dh0128.kwak@samsung.com>	2017-07-12 08:48:11 +0900
commit	3b5dc6176476d5ed2313cd7185d985f47e225165 (patch)
tree	aee8e1d1c516bf7528eceae708baecfe484baddc
parent	d80fc1d31f28c6bcf9ea34b253e8765321616c3c (diff)
download	pygobject2-3b5dc6176476d5ed2313cd7185d985f47e225165.tar.gz pygobject2-3b5dc6176476d5ed2313cd7185d985f47e225165.tar.bz2 pygobject2-3b5dc6176476d5ed2313cd7185d985f47e225165.zip